[hibernate-commits] Hibernate SVN: r17091 - in core/trunk/documentation/manual/src/main/docbook: es-ES and 13 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Tue Jul 14 16:58:05 EDT 2009


Author: steve.ebersole at jboss.com
Date: 2009-07-14 16:58:00 -0400 (Tue, 14 Jul 2009)
New Revision: 17091

Modified:
   core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
   core/trunk/documentation/manual/src/main/docbook/es-ES/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/events.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/events.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/events.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/events.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot
   core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot
   core/trunk/documentation/manual/src/main/docbook/pt-BR/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/events.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/Hibernate_Reference.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/basic_mapping.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/batch.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/best_practices.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/configuration.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/events.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_mappings.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_parentchild.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_weblog.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/inheritance_mapping.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/persistent_classes.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/preface.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_criteria.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/session_api.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/toolset_guide.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/xml.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po
Log:
HHH-4037 - applied changes out to pot/po files

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml	2009-07-14 20:58:00 UTC (rev 17091)
@@ -846,7 +846,7 @@
                 Here, we are using a Hibernate Query Language (HQL) query to load all existing
                 <literal>Event</literal> objects from the database. Hibernate will generate the
                 appropriate SQL, send it to the database and populate <literal>Event</literal> objects
-                with the data. You can create more complex queries with HQL. See <xref linkend="query-hql"/>
+                with the data. You can create more complex queries with HQL. See <xref linkend="queryhql"/>
                 for more information.
             </para>
 

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - Persistencia Relacional para Java Idiom&#x00e1;tico"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "Documentaci&#x00f3;n de Referencia de Hibernate"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,38 +1,66 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:21
+#. Tag: title
+#: architecture.xml:30
+#, no-c-format
 msgid "Architecture"
 msgstr "Arquitectura"
 
-#: index.docbook:24
+#. Tag: title
+#: architecture.xml:33
+#, no-c-format
 msgid "Overview"
 msgstr "Visi&#x00f3;n General"
 
-#: index.docbook:26
-msgid "A (very) high-level view of the Hibernate architecture:"
+#. Tag: para
+#: architecture.xml:35
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Una visi&#x00f3;n a (muy) alto nivel de la arquitectura de Hibernate:"
 
-#: index.docbook:39
+#. Tag: para
+#: architecture.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"Nos gustar&#x00ed;a mostrar una vista m&#x00e1;s detallada de la "
+"arquitectura de tiempo de ejecuci&#x00f3;n. Desafortunadamente, Hibernate es "
+"flexible y soporta diferentes enfoques. Mostraremos los dos extremos. En la "
+"arquitectura \"sencilla\", es la aplicaci&#x00f3;n la que provee su propias "
+"conexiones JDBC y gestiona sus propias transacciones. Este enfoque usa un "
+"m&#x00ed;nimo subconjunto de la API de Hibernate:"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "Este diagrama muestra a Hibernate usando la base de datos y los datos de "
 "configuraci&#x00f3;n para proveer servicios de persistencia (y objetos "
 "persistentes) a la aplicaci&#x00f3;n."
 
-#: index.docbook:44
+#. Tag: para
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "Nos gustar&#x00ed;a mostrar una vista m&#x00e1;s detallada de la "
 "arquitectura de tiempo de ejecuci&#x00f3;n. Desafortunadamente, Hibernate es "
@@ -41,29 +69,37 @@
 "conexiones JDBC y gestiona sus propias transacciones. Este enfoque usa un "
 "m&#x00ed;nimo subconjunto de la API de Hibernate:"
 
-#: index.docbook:61
+#. Tag: para
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "La arquitectura \"full cream\" abstrae a la aplicaci&#x00f3;n de las APIs de "
 "JDBC/JTA y deja que Hibernate se encargue de los detalles."
 
-#: index.docbook:75
-msgid "Heres some definitions of the objects in the diagrams:"
+#. Tag: para
+#: architecture.xml:88
+#, fuzzy, no-c-format
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr "He aqu&#x00ed; algunas definiciones de los objetos en los diagramas:"
 
-#: index.docbook:80
+#. Tag: term
+#: architecture.xml:93
+#, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
-#: index.docbook:82
+#. Tag: para
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "Cach&#x00e9; threadsafe (inmutable) de mapeos compilados para una sola base "
 "de datos. Es una f&#x00e1;brica de <literal>Session</literal> y un cliente "
@@ -71,17 +107,21 @@
 "cach&#x00e9; (de segundo nivel) de datos reusables entre transacciones, a un "
 "nivel de proceso o de cluster."
 
-#: index.docbook:92
+#. Tag: term
+#: architecture.xml:105
+#, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
-#: index.docbook:94
+#. Tag: para
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "Objeto mono-hebra, de corta vida que representa una conversaci&#x00f3;n "
 "entre la aplicaci&#x00f3;n y el almacenamiento persistente. Envuelve una "
@@ -90,18 +130,22 @@
 "persistentes, usada mientras se navega el grafo de objetos o se recuperen "
 "objetos por identificador."
 
-#: index.docbook:104
+#. Tag: term
+#: architecture.xml:117
+#, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objetos y colecciones persistentes"
 
-#: index.docbook:106
+#. Tag: para
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "Objetos de corta vida, mono-hebra conteniendo estado persistente y "
 "funci&#x00f3;nalidad de negocio. Estos pueden ser JavaBeans/POJOs (Plain Old "
@@ -113,15 +157,19 @@
 "objetos de transferencia de datos hacia y desde la capa de presentaci&#x00f3;"
 "n)."
 
-#: index.docbook:117
+#. Tag: term
+#: architecture.xml:129
+#, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos y colecciones transitorios y separados"
 
-#: index.docbook:119
+#. Tag: para
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "Instancias de clases persistentes que no estan acutualmente asociadas con "
@@ -129,18 +177,22 @@
 "aplicaci&#x00f3;n y (a&#x00fa;n) no haber sido hechas persistentes, o pueden "
 "haber sido instanciadas por una <literal>Session</literal> cerrada."
 
-#: index.docbook:128
+#. Tag: term
+#: architecture.xml:140
+#, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
-#: index.docbook:130
+#. Tag: para
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(Opcional) Un objeto de corta vida, mono-hebra, usado por la aplicaci&#x00f3;"
 "n para especificar unidades at&#x00f3;micas de trabajo. Abstrae a la "
@@ -150,7 +202,9 @@
 "transacci&#x00f3;n, ya sea usando la API subyacente o <literal>Transaction</"
 "literal>, nunca es opcional!"
 
-#: index.docbook:141
+#. Tag: term
+#: architecture.xml:153
+#, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
@@ -158,12 +212,14 @@
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
-#: index.docbook:143
+#. Tag: para
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(Opcional) Una f&#x00e1;brica (y pool) de conexiones JDBC. Abstrae a la "
 "aplicaci&#x00f3;n del <literal>Datasource</literal> o "
@@ -171,86 +227,110 @@
 "aplicaci&#x00f3;n, pero puede ser extendido/implementado por el "
 "desarrollador."
 
-#: index.docbook:151
+#. Tag: term
+#: architecture.xml:163
+#, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 msgstr ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
-#: index.docbook:153
+#. Tag: para
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(Opcional) Una f&#x00e1;brica de instancias de <literal>Transaction</"
 "literal>. No se expone a la aplicaci&#x00f3;n, pero puede ser extendido/"
 "implementado por el desarrollador."
 
-#: index.docbook:160
+#. Tag: emphasis
+#: architecture.xml:172
+#, no-c-format
 msgid "Extension Interfaces"
 msgstr "Interfaces de Extensi&#x00f3;n"
 
-#: index.docbook:162
+#. Tag: para
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "Hibernate ofrece muchas interfaces de extensi&#x00f3;n opcional que puedes "
 "implementar para modificar a medida el comportamiento de tu capa de "
 "persistencia. Para m&#x00e1;s detalles, mira la documentaci&#x00f3;n de la "
 "API."
 
-#: index.docbook:171
+#. Tag: para
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "Dada una arquitectura \"sencilla\", la aplicaci&#x00f3;n pasa por alto las "
 "APIs de <literal>Transaction</literal>/<literal>TransactionFactory</literal> "
 "y/o <literal>ConnectionProvider</literal>, para hablar directamente a JTA o "
 "JDBC."
 
-#: index.docbook:179
+#. Tag: title
+#: architecture.xml:191
+#, no-c-format
 msgid "Instance states"
 msgstr "Estados de instancia"
 
-#: index.docbook:180
+#. Tag: para
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "Una instancia de una clase persistente puede estar en uno de tres estados "
 "diferentes, definidos respecto de su <emphasis>contexto de persistencia</"
 "emphasis>. El objeto <literal>Session</literal> de Hibernate es el contexto "
 "de persistencia:"
 
-#: index.docbook:188
+#. Tag: term
+#: architecture.xml:200
+#, no-c-format
 msgid "transient"
 msgstr "transitorio"
 
-#: index.docbook:190
+#. Tag: para
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr ""
 "La instancia no est&#x00e1; y nunca estuvo asociada con un contexto de "
 "persistencia. No tiene identidad persistente (valor de clave primaria)."
 
-#: index.docbook:198
+#. Tag: term
+#: architecture.xml:210
+#, no-c-format
 msgid "persistent"
 msgstr "persistente"
 
-#: index.docbook:200
+#. Tag: para
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "La instancia est&#x00e1; actualmente asociada con un contexto de "
 "persistencia. Tiene una identidad persistente (valor de clave primaria) y, "
@@ -259,16 +339,20 @@
 "emphasis> que la identidad persistente es equivalente a la identidad Java "
 "(localizaci&#x00f3;n en memoria del objeto)."
 
-#: index.docbook:212
+#. Tag: term
+#: architecture.xml:224
+#, no-c-format
 msgid "detached"
 msgstr "separado"
 
-#: index.docbook:214
+#. Tag: para
+#: architecture.xml:226
+#, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corrsponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "La instancia estuvo una vez asociada con un contexto de persistencia, pero "
@@ -278,42 +362,51 @@
 "ninguna garant&#x00ed;a sobre la relaci&#x00f3;n entre identidad persistente "
 "e identidad Java."
 
-#: index.docbook:229
+#. Tag: title
+#: architecture.xml:241
+#, no-c-format
 msgid "JMX Integration"
 msgstr "Integraci&#x00f3;n JMX"
 
-#: index.docbook:231
+#. Tag: para
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMX es el est&#x00e1;ndar J2EE para la gesti&#x00f3;n de componentes Java. "
 "Hibernate puede ser gestionado por medio de un servicio est&#x00e1;ndar JMX. "
 "Proveemos una implementaci&#x00f3;n de MBean en la distribuci&#x00f3;n, "
 "<literal>org.hibernate.jmx.HibernateService</literal>."
 
-#: index.docbook:237
+#. Tag: para
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "Para ejemplo de c&#x00f3;mo desplegar Hibernate como un servicio JMX en un "
 "Servidor de Aplicaciones JBoss, por favor, mira la Gu&#x00ed;a del Usuario "
 "de JBoss. En JBoss AS, tienes adem&#x00e1;s estos beneficios si despliegas "
 "usando JMX:"
 
-#: index.docbook:245
+#. Tag: para
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>Gesti&#x00f3;n de Sesi&#x00f3;n:</emphasis> El ciclo de vida de la "
@@ -327,15 +420,17 @@
 "Hibernate para esto). Para acceder a una <literal>Session</literal> llama al "
 "<literal>HibernateContext</literal>."
 
-#: index.docbook:257
+#. Tag: para
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>Despliegue de HAR:</emphasis> Usualmente despliegas el servicio "
 "JMX de Hibernate usando un descriptor de despliegue de servicio de JBoss (en "
@@ -346,50 +441,63 @@
 "opcional, JBoss detectar&#x00e1; autom&#x00e1;ticamente todos los ficheros "
 "de mapeo en tu fichero HAR."
 
-#: index.docbook:268
+#. Tag: para
+#: architecture.xml:280
+#, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
 msgstr ""
 "Para m&#x00e1;s informaci&#x00f3;n sobre estas opciones, consulta la "
 "Gu&#x00ed;a de Usuario del JBoss AS."
 
-#: index.docbook:272
+#. Tag: para
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "Otra funcionalidad disponible como un servicio JMX son las estad&#x00ed;"
 "sticas en tiempo de ejecuci&#x00f3;n de Hibernate. Mira <xref linkend="
 "\"configuration-optional-statistics\"/>."
 
-#: index.docbook:279
+#. Tag: title
+#: architecture.xml:291
+#, no-c-format
 msgid "JCA Support"
 msgstr "Soporte JCA:"
 
-#: index.docbook:280
+#. Tag: para
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hiberate puede adem&#x00e1;s ser configurado como un conector JCA. Por favor "
 "mira el sitio web para m&#x00e1;s detalles. Por favor ten en cuenta que el "
 "soporte de JCA de Hibernate est&#x00e1; a&#x00fa;n considerado experimental."
 
-#: index.docbook:287
-msgid "Contextual Sessions"
+#. Tag: title
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "UNTRANSLATED! Contextual Sessions"
 
-#: index.docbook:288
+#. Tag: para
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "Most applications using Hibernate need some form of \"contextual\" sessions, "
@@ -402,18 +510,19 @@
 "utilized third-party frameworks (such as Spring or Pico) which provided "
 "proxy/interception-based contextual sessions."
 
-#: index.docbook:297
+#. Tag: para
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
@@ -426,13 +535,15 @@
 "<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
 "based contextual sessions is all you should ever need to use."
 
-#: index.docbook:307
+#. Tag: para
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -442,14 +553,16 @@
 "current_session_context_class</literal>) have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 
-#: index.docbook:314
+#. Tag: para
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
@@ -458,10 +571,12 @@
 "contextual session. Out-of-the-box, Hibernate comes with three "
 "implementations of this interface."
 
-#: index.docbook:324
+#. Tag: para
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -470,41 +585,47 @@
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 
-#: index.docbook:332
+#. Tag: para
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
 "sessions are tracked by thread of execution. Again, see the Javadocs for "
 "details."
 
-#: index.docbook:338
+#. Tag: para
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
 "this class, it does never open, flush, or close a <literal>Session</literal>."
 
-#: index.docbook:347
+#. Tag: para
+#: architecture.xml:359
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programatic "
-"transaction demarcation in plain JSE without JTA, you are adviced to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "The first two implementations provide a \"one session - one database "
 "transaction\" programming model, also known and used as <emphasis>session-"
@@ -518,17 +639,19 @@
 "transaction or session demarcation operations in your code. Refer to <xref "
 "linkend=\"transactions\"/> for more information and code examples."
 
-#: index.docbook:359
+#. Tag: para
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -542,8 +665,8 @@
 "however, there are three corresponding short names, \"jta\", \"thread\", and "
 "\"managed\"."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,23 +1,31 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:6
+#. Tag: title
+#: association_mapping.xml:30
+#, no-c-format
 msgid "Association Mappings"
 msgstr "Mapeos de Asociaci&#x00f3;n"
 
-#: index.docbook:9
+#. Tag: title
+#: association_mapping.xml:33
+#, no-c-format
 msgid "Introduction"
 msgstr "Introducci&#x00f3;n"
 
-#: index.docbook:11
+#. Tag: para
+#: association_mapping.xml:35
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -27,19 +35,23 @@
 "unidireccionales, y considerando luego los casos bidireccionales. Usaremos "
 "<literal>Person</literal> y <literal>Address</literal> en todos los ejemplos."
 
-#: index.docbook:19
+#. Tag: para
+#: association_mapping.xml:43
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr ""
 "Clasificaremos las asociaciones por cuanto mapeen o no a una tabla de "
 "uni&#x00f3;n interviniente, y por su multiplicidad."
 
-#: index.docbook:24
+#. Tag: para
+#: association_mapping.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "Las claves for&#x00e1;neas que aceptan valores nulos (en adelante, "
@@ -49,15 +61,21 @@
 "todos los mapeos funcionar&#x00e1;n si quitas las restricciones de "
 "nulabilidad."
 
-#: index.docbook:34
+#. Tag: title
+#: association_mapping.xml:58
+#, no-c-format
 msgid "Unidirectional associations"
 msgstr "Asociaciones Unidireccionales"
 
-#: index.docbook:37, index.docbook:108
-msgid "many to one"
+#. Tag: title
+#: association_mapping.xml:61 association_mapping.xml:132
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "muchos a uno"
 
-#: index.docbook:39
+#. Tag: para
+#: association_mapping.xml:63
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association</emphasis> is the most "
 "common kind of unidirectional association."
@@ -65,7 +83,9 @@
 "Una <emphasis>asociaci&#x00f3;n unidireccional muchos-a-uno</emphasis> es el "
 "tipo m&#x00e1;s com&#x00fa;n de asociaciones unidireccionales."
 
-#: index.docbook:44
+#. Tag: programlisting
+#: association_mapping.xml:68
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -97,7 +117,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:45, index.docbook:161
+#. Tag: programlisting
+#: association_mapping.xml:69 association_mapping.xml:185
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
@@ -111,11 +133,16 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:50, index.docbook:121, index.docbook:185, index.docbook:225
-msgid "one to one"
+#. Tag: title
+#: association_mapping.xml:74 association_mapping.xml:145
+#: association_mapping.xml:210
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "uno a uno"
 
-#: index.docbook:52
+#. Tag: para
+#: association_mapping.xml:76
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a foreign key</"
 "emphasis> is almost identical. The only difference is the column unique "
@@ -125,7 +152,9 @@
 "primaria</emphasis> es casi id&#x00e9;ntica. La &#x00fa;nica diferencia es "
 "la restricci&#x00f3;n de unicidad de la columna."
 
-#: index.docbook:57
+#. Tag: programlisting
+#: association_mapping.xml:81
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -159,7 +188,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:58, index.docbook:193
+#. Tag: programlisting
+#: association_mapping.xml:82 association_mapping.xml:218
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
@@ -173,17 +204,21 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:60
+#. Tag: para
+#: association_mapping.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"emphasis> usually uses a special id generator In this example, however, we "
+"have reversed the direction of the association:"
 msgstr ""
 "Usualmente, una <emphasis>asociaci&#x00f3;n unidireccional uno-a-uno en una "
 "clave primaria</emphasis> usa un generador de id especial. (Observa que "
 "hemos invertido el sentido de la asociaci&#x00f3;n en este ejemplo)."
 
-#: index.docbook:66
+#. Tag: programlisting
+#: association_mapping.xml:90
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -215,7 +250,9 @@
 "    <one-to-one name=\"person\" constrained=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:67, index.docbook:201
+#. Tag: programlisting
+#: association_mapping.xml:91 association_mapping.xml:226
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -227,20 +264,26 @@
 "create table Address ( personId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:72, index.docbook:94
-msgid "one to many"
+#. Tag: title
+#: association_mapping.xml:96 association_mapping.xml:118
+#, fuzzy, no-c-format
+msgid "One-to-many"
 msgstr "uno a muchos"
 
-#: index.docbook:74
+#. Tag: para
+#: association_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n unidireccional uno-a-muchos en una clave "
 "for&#x00e1;nea</emphasis> es un caso muy inusual, y realmente no est&#x00e1; "
 "recomendada."
 
-#: index.docbook:79
+#. Tag: programlisting
+#: association_mapping.xml:103
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -276,7 +319,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:80
+#. Tag: programlisting
+#: association_mapping.xml:104
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -290,29 +335,36 @@
 "bigint not null )\n"
 "        ]]>"
 
-#: index.docbook:82
-msgid "We think it's better to use a join table for this kind of association."
+#. Tag: para
+#: association_mapping.xml:106
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr ""
 "Creemos que es mejor usar una tabla de uni&#x00f3;n para este tipo de "
 "asociaci&#x00f3;n."
 
-#: index.docbook:91
+#. Tag: title
+#: association_mapping.xml:115
+#, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "Asociaciones unidireccionales con tablas de uni&#x00f3;n"
 
-#: index.docbook:96
+#. Tag: para
+#: association_mapping.xml:120
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"emphasis> is the preferred option. Specifying <literal>unique=\"true\"</"
+"literal>, changes the multiplicity from many-to-many to one-to-many."
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n unidireccional uno-a-muchos en una tabla de "
 "uni&#x00f3;n</emphasis> es m&#x00e1;s preferible. Observa que especificando "
 "<literal>unique=\"true\"</literal>, hemos cambiado la multiplicidad de "
 "muchos-a-muchos a uno-a-muchos."
 
-#: index.docbook:102
+#. Tag: programlisting
+#: association_mapping.xml:126
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -350,7 +402,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:103
+#. Tag: programlisting
+#: association_mapping.xml:127
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -366,16 +420,20 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:110
+#. Tag: para
+#: association_mapping.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n unidireccional muchos-a-uno en una tabla de "
 "uni&#x00f3;n</emphasis> es bastante com&#x00fa;n cuando la asociaci&#x00f3;n "
 "es opcional."
 
-#: index.docbook:115
+#. Tag: programlisting
+#: association_mapping.xml:139
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -415,7 +473,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:116
+#. Tag: programlisting
+#: association_mapping.xml:140
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -431,15 +491,19 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:123
+#. Tag: para
+#: association_mapping.xml:147
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n unidireccional uno-a-uno en una tabla de "
 "uni&#x00f3;n</emphasis> es inusual en extremo, pero posible."
 
-#: index.docbook:128
+#. Tag: programlisting
+#: association_mapping.xml:152
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -483,7 +547,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:129, index.docbook:233
+#. Tag: programlisting
+#: association_mapping.xml:153 association_mapping.xml:258
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -499,19 +565,25 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:134, index.docbook:238
-msgid "many to many"
+#. Tag: title
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "muchos a muchos"
 
-#: index.docbook:136
+#. Tag: para
+#: association_mapping.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr ""
 "Finalmente, tenemos una <emphasis>asociaci&#x00f3;n unidireccional muchos-a-"
 "muchos</emphasis>"
 
-#: index.docbook:140
+#. Tag: programlisting
+#: association_mapping.xml:164
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -547,7 +619,9 @@
 "    </id>\n"
 "</class>]]>"
 
-#: index.docbook:141, index.docbook:246
+#. Tag: programlisting
+#: association_mapping.xml:165 association_mapping.xml:271
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -563,24 +637,33 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:148
+#. Tag: title
+#: association_mapping.xml:172
+#, no-c-format
 msgid "Bidirectional associations"
 msgstr "Asociaciones Bidireccionales"
 
-#: index.docbook:151, index.docbook:211
-msgid "one to many / many to one"
+#. Tag: title
+#: association_mapping.xml:175 association_mapping.xml:236
+#, fuzzy, no-c-format
+msgid "one-to-many / many-to-one"
 msgstr "uno a muchos / muchos a uno"
 
-#: index.docbook:153
+#. Tag: para
+#: association_mapping.xml:177
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n bidireccional muchos-a-uno</emphasis> es el "
 "tipo m&#x00e1;s com&#x00fa;n de asociaci&#x00f3;n. (Esta es la relaci&#x00f3;"
 "n est&#x00e1;ndar padre/hijo.)"
 
-#: index.docbook:159
+#. Tag: programlisting
+#: association_mapping.xml:183
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -620,14 +703,16 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:163
+#. Tag: para
+#: association_mapping.xml:187
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "UNTRANSLATED! If you use a <literal>List</literal> (or other indexed "
 "collection) you need to set the <literal>key</literal> column of the foreign "
@@ -636,7 +721,9 @@
 "other side virtually inverse by setting <literal>update=\"false\"</literal> "
 "and <literal>insert=\"false\"</literal>):"
 
-#: index.docbook:171
+#. Tag: programlisting
+#: association_mapping.xml:195
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "   <id name=\"id\"/>\n"
@@ -679,12 +766,14 @@
 "                        </list>\n"
 "                </class>]]>"
 
-#: index.docbook:173
+#. Tag: para
+#: association_mapping.xml:197
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -695,15 +784,19 @@
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 
-#: index.docbook:187
+#. Tag: para
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n bidireccional uno-a-uno en una clave "
 "for&#x00e1;nea</emphasis> es bastante com&#x00fa;n."
 
-#: index.docbook:192
+#. Tag: programlisting
+#: association_mapping.xml:217
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -741,15 +834,19 @@
 "        property-ref=\"address\"/>\n"
 "</class>]]>"
 
-#: index.docbook:195
+#. Tag: para
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n bidireccional uno-a-uno en una clave "
 "primaria</emphasis> usa el generador de id especial."
 
-#: index.docbook:200
+#. Tag: programlisting
+#: association_mapping.xml:225
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -785,22 +882,29 @@
 "        constrained=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:208
+#. Tag: title
+#: association_mapping.xml:233
+#, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "Asociaciones bidireccionales con tablas de uni&#x00f3;n"
 
-#: index.docbook:213
+#. Tag: para
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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 ""
 "Una <emphasis>asociaci&#x00f3;n bidireccional uno-a-muchos en una tabla de "
 "uni&#x00f3;n</emphasis>. Observa que el <literal>inverse=\"true\"</literal> "
 "puede ir a cualquier lado de la asociaci&#x00f3;n, en la colecci&#x00f3;n, o "
 "en la uni&#x00f3;n."
 
-#: index.docbook:219
+#. Tag: programlisting
+#: association_mapping.xml:244
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -856,7 +960,9 @@
 "    </join>\n"
 "</class>]]>"
 
-#: index.docbook:220
+#. Tag: programlisting
+#: association_mapping.xml:245
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -872,15 +978,25 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 
-#: index.docbook:227
+#. Tag: title
+#: association_mapping.xml:250
+#, no-c-format
+msgid "one to one"
+msgstr "uno a uno"
+
+#. Tag: para
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n bidireccional uno-a-uno en una tabla de "
 "uni&#x00f3;n</emphasis> es inusual en extremo, pero posible."
 
-#: index.docbook:232
+#. Tag: programlisting
+#: association_mapping.xml:257
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -944,15 +1060,19 @@
 "    </join>\n"
 "</class>]]>"
 
-#: index.docbook:240
+#. Tag: para
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr ""
 "Finalmente, tenemos una <emphasis>asociaci&#x00f3;n bidireccional muchos-a-"
 "muchos</emphasis>."
 
-#: index.docbook:244
+#. Tag: programlisting
+#: association_mapping.xml:269
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -998,18 +1118,22 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:253
+#. Tag: title
+#: association_mapping.xml:278
+#, no-c-format
 msgid "More complex association mappings"
 msgstr "UNTRANSLATED! More complex association mappings"
 
-#: index.docbook:255
+#. Tag: para
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
 "Hibernate makes it possible to handle more complex situations using SQL "
@@ -1018,7 +1142,9 @@
 "literal>, <literal>effectiveEndDate</literal> and "
 "<literal>effectiveStartDate</literal>columns, mapped as follows:"
 
-#: index.docbook:264
+#. Tag: programlisting
+#: association_mapping.xml:289
+#, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
 "    <property name=\"accountNumber\" type=\"string\" not-null=\"true\"/>\n"
@@ -1043,15 +1169,19 @@
 "                    <property name=\"effectiveStateDate\" type=\"date\" not-"
 "null=\"true\"/>]]>"
 
-#: index.docbook:266
+#. Tag: para
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"You can then map an association to the <emphasis>current</emphasis> "
+"instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "Then we can map an association to the <emphasis>current</emphasis> instance "
 "(the one with null <literal>effectiveEndDate</literal>) using:"
 
-#: index.docbook:271
+#. Tag: programlisting
+#: association_mapping.xml:296
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
 "        property-ref=\"currentAccountKey\"\n"
@@ -1068,14 +1198,16 @@
 "                            <formula>'1'</formula>\n"
 "                    </many-to-one>]]>"
 
-#: index.docbook:273
+#. Tag: para
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"emphasis> employer, the one with the most recent <literal>startDate</"
+"literal>, could be mapped in the following way:"
 msgstr ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
@@ -1084,7 +1216,9 @@
 "recent</emphasis> employer (the one with the most recent <literal>startDate</"
 "literal>) might be mapped this way:"
 
-#: index.docbook:281
+#. Tag: programlisting
+#: association_mapping.xml:306
+#, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
 "    <key column=\"employeeId\"/>\n"
@@ -1112,16 +1246,18 @@
 "                                         column=\"orgId\"/>\n"
 "                    </join>]]>"
 
-#: index.docbook:283
+#. Tag: para
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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 ""
 "You can get quite creative with this functionality, but it is usually more "
 "practical to handle these kinds of cases using HQL or a criteria query."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: basic_mapping.xml:29
+#, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "Mapeo O/R B&#x00e1;sico"
 
-#: index.docbook:8
+#. Tag: title
+#: basic_mapping.xml:32
+#, no-c-format
 msgid "Mapping declaration"
 msgstr "Declaraci&#x00f3;n de mapeo"
 
-#: index.docbook:10
+#. Tag: para
+#: basic_mapping.xml:34
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "Los mapeos objeto/relacional se definen usualmente en un documento XML. El "
 "documento de mapeo est&#x00e1; dise&#x00f1;ado para ser le&#x00ed;ble y "
@@ -26,21 +34,27 @@
 "mapeos se construyen alrededor de declaraciones de clases persistentes, no "
 "declaraciones de tablas."
 
-#: index.docbook:17
+#. Tag: para
+#: basic_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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 ""
 "Observa que, incluso aunque muchos usuarios de Hibernate eligen escribir el "
 "XML a mano, existe una cantidad de herramientas para generar el documento de "
 "mapeo, incluyendo XDoclet, Middlegen y AndroMDA."
 
-#: index.docbook:23
-msgid "Lets kick off with an example mapping:"
+#. Tag: para
+#: basic_mapping.xml:47
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "Comencemos por un mapeo de ejemplo:"
 
-#: index.docbook:27
+#. Tag: programlisting
+#: basic_mapping.xml:51
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -172,13 +186,15 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:29
+#. Tag: para
+#: basic_mapping.xml:53
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "Discutiremos ahora el contenido del documento de mapeo. Describiremos "
 "s&#x00f3;lo los elementos y atributos que son usados por Hibernate en tiempo "
@@ -187,18 +203,22 @@
 "datos exportados por la herramienta de exportaci&#x00f3;n de esquemas. (Por "
 "ejemplo, el atributo <literal>not-null</literal>.)"
 
-#: index.docbook:40
+#. Tag: title
+#: basic_mapping.xml:64
+#, no-c-format
 msgid "Doctype"
 msgstr "Doctype"
 
-#: index.docbook:42
+#. Tag: para
+#: basic_mapping.xml:66
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "Todos los mapeos XML deben declarar el doctype mostrado. El DTD actual puede "
 "ser encontrado en el URL mencionado arriba, en el directorio "
@@ -208,18 +228,21 @@
 "conexi&#x00f3;n de Internet, chequea tu declaraci&#x00f3;n de DTD contra la "
 "contenida en el classpath."
 
-#: index.docbook:52
+#. Tag: title
+#: basic_mapping.xml:76
+#, no-c-format
 msgid "EntityResolver"
 msgstr "UNTRANSLATED! EntityResolver"
 
-#: index.docbook:53
+#. Tag: para
+#: basic_mapping.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
 "classpath. The manner in which it does this is by registering a custom "
@@ -228,23 +251,27 @@
 "<literal>EntityResolver</literal> recognizes two different systemId "
 "namespaces."
 
-#: index.docbook:61
+#. Tag: para
+#: basic_mapping.xml:85
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
 "encounteres a systemId starting with <literal>http://hibernate.sourceforge."
 "net/</literal>; the resolver attempts to resolve these entities via the "
 "classlaoder which loaded the Hibernate classes."
 
-#: index.docbook:70
+#. Tag: para
+#: basic_mapping.xml:94
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -254,11 +281,15 @@
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 
-#: index.docbook:79
-msgid "An example of utilizing user namespacing:"
+#. Tag: para
+#: basic_mapping.xml:103
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "An example of utilizing user namespacing:"
 
-#: index.docbook:82
+#. Tag: programlisting
+#: basic_mapping.xml:106
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -297,7 +328,9 @@
 "                                                              &types;\n"
 "                                                      </hibernate-mapping>]]>"
 
-#: index.docbook:83
+#. Tag: para
+#: basic_mapping.xml:107
+#, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
 "domain</literal> package and contains a custom <link linkend=\"mapping-types-"
@@ -307,21 +340,26 @@
 "domain</literal> package and contains a custom <link linkend=\"mapping-types-"
 "custom\">typedef</link>."
 
-#: index.docbook:91
-msgid "hibernate-mapping"
+#. Tag: title
+#: basic_mapping.xml:115
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
-#: index.docbook:93
+#. Tag: para
+#: basic_mapping.xml:117
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "Este elemento tiene muchos atributos opcionales. Los atributos "
 "<literal>schema</literal> y <literal>catalog</literal> especifican que las "
@@ -335,7 +373,9 @@
 "literal> nos permite usar nombres de clase sin cualificar en el lenguaje de "
 "consulta, por defecto."
 
-#: index.docbook:114
+#. Tag: programlisting
+#: basic_mapping.xml:138
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
 "         schema=\"schemaName\"\n"
@@ -357,83 +397,101 @@
 "         package=\"package.name\"\n"
 " />]]>"
 
-#: index.docbook:117
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#. Tag: para
+#: basic_mapping.xml:141
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr ""
 "<literal>schema</literal> (opcional): El nombre de un esquema de la base de "
 "datos."
 
-#: index.docbook:122
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#. Tag: para
+#: basic_mapping.xml:146
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr ""
 "<literal>catalog</literal> (opcional): El nombre de un cat&#x00e1;logo de la "
 "base de datos."
 
-#: index.docbook:127
+#. Tag: para
+#: basic_mapping.xml:151
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (opcional - por defecto a <literal>none</"
 "literal>): Un estilo de cascada por defecto."
 
-#: index.docbook:133
+#. Tag: para
+#: basic_mapping.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (opcional - por defecto a "
 "<literal>property</literal>): La estrategia que Hibernate debe usar para "
 "acceder a todas las propiedades. Puede ser una implementaci&#x00f3;n "
 "personalizada de <literal>PropertyAccessor</literal>."
 
-#: index.docbook:140
+#. Tag: para
+#: basic_mapping.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (opcional - por defecto a <literal>true</"
 "literal>): El valor por defecto para los atributos <literal>lazy</literal> "
 "de mapeos de clase y colleci&#x00f3;n no especificados."
 
-#: index.docbook:147
+#. Tag: para
+#: basic_mapping.xml:171
+#, fuzzy, 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."
+"literal>): specifies whether we can use unqualified class names of classes "
+"in this mapping in the query language."
 msgstr ""
 "<literal>auto-import</literal> (opcional - por defecto a <literal>true</"
 "literal>): Especifica si podemos usar nombres de clases no cualificados (de "
 "clases en este mapeo) en el lenguaje de consulta."
 
-#: index.docbook:154
+#. Tag: para
+#: basic_mapping.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<literal>package</literal> (optional): specifies a package prefix to use for "
+"unqualified class names in the mapping document."
 msgstr ""
 "<literal>package</literal> (opcional): Especifica un prefijo de paquete a "
 "asumir para los nombres no cualificados de clase en el documento de mapeo."
 
-#: index.docbook:162
+#. Tag: para
+#: basic_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "Si tienes dos clases persistentes con el mismo nombre (sin cualificar), "
 "debes establecer <literal>auto-import=\"false\"</literal>. Hibernate "
 "lanzar&#x00e1; una excepci&#x00f3;n si intentas asignar dos clases al mismo "
 "nombre \"importado\"."
 
-#: index.docbook:168
+#. Tag: para
+#: basic_mapping.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -446,19 +504,25 @@
 "xml</literal>, <literal>Dog.hbm.xml</literal>, o, si se usa herencia, "
 "<literal>Animal.hbm.xml</literal>."
 
-#: index.docbook:181
-msgid "<title>class</title>"
-msgstr "<title>class</title>"
+#. Tag: title
+#: basic_mapping.xml:205
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "subclass"
 
-#: index.docbook:183
+#. Tag: para
+#: basic_mapping.xml:207
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr ""
 "Puedes declarar una clase persistente usando el elemento <literal>class</"
 "literal>:"
 
-#: index.docbook:211
+#. Tag: programlisting
+#: basic_mapping.xml:235
+#, no-c-format
 msgid ""
 "<![CDATA[<class\n"
 "        name=\"ClassName\"\n"
@@ -510,29 +574,35 @@
 "        node=\"element-name\"\n"
 "/>]]>"
 
-#: index.docbook:214
+#. Tag: para
+#: basic_mapping.xml:238
+#, fuzzy, 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 "
+"<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> (opcional): El nombre completamente cualificado de "
 "la clase Java persistente (o interface). Si este atributo es omitido, se "
 "asume que el mapeo es para una entidad non-POJO."
 
-#: index.docbook:221
+#. Tag: para
+#: basic_mapping.xml:245
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (opcional - por defecto al nombre no cualificado de "
 "la clase): El nombre de su tabla en base de datos."
 
-#: index.docbook:227
+#. Tag: para
+#: basic_mapping.xml:251
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (opcional - por defecto al nombre de "
@@ -540,56 +610,68 @@
 "comportamiento polim&#x00f3;rfico. Los valores aceptables incluyen "
 "<literal>null</literal> y <literal>not null</literal>."
 
-#: index.docbook:234
+#. Tag: para
+#: basic_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
+"specifies that instances of the class are (not) mutable."
 msgstr ""
 "<literal>mutable</literal> (opcional, por defecto a <literal>true</"
 "literal>): Especifica que las instancias de la clase (no) son mutables."
 
-#: index.docbook:240, index.docbook:2204
+#. Tag: para
+#: basic_mapping.xml:264 basic_mapping.xml:2231
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "<literal>schema</literal> (opcional): Sobreescribe el nombre de esquema "
 "especificado por el elemento ra&#x00ed;z <literal>&lt;hibernate-mapping&gt;</"
 "literal>."
 
-#: index.docbook:246, index.docbook:2210
+#. Tag: para
+#: basic_mapping.xml:270 basic_mapping.xml:2237
+#, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "<literal>catalog</literal> (opcional): Sobreescribe el nombre de cat&#x00e1;"
 "logo especificado por el elemento ra&#x00ed;z <literal>&lt;hibernate-"
 "mapping&gt;</literal>."
 
-#: index.docbook:252
+#. Tag: para
+#: basic_mapping.xml:276
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (opcional): Especifica una interface a usar para "
 "proxies de inicializaci&#x00f3;n perezosa. Puedes especificar el nombre "
 "mismo de la clase."
 
-#: index.docbook:258
+#. Tag: para
+#: basic_mapping.xml:282
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (opcional, por defecto a <literal>false</"
 "literal>): Especifica que el SQL <literal>UPDATE</literal> debe ser generado "
 "en tiempo de ejecuci&#x00f3;n y contener solamente aquellas columnas cuyo "
 "valor haya cambiado."
 
-#: index.docbook:265
+#. Tag: para
+#: basic_mapping.xml:289
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (opcional, por defecto a <literal>false</"
@@ -597,16 +679,17 @@
 "en tiempo de ejecuci&#x00f3;n y contener solamente aquellas columnas cuyo "
 "valores no son nulos."
 
-#: index.docbook:272
+#. Tag: para
+#: basic_mapping.xml:296
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (opcional, por defecto a "
 "<literal>false</literal>): Especifica que Hibernate <emphasis>nunca</"
@@ -617,67 +700,83 @@
 "significa que Hibernate realizar&#x00e1; una SQL <literal>SELECT</literal> "
 "extra para determinar si un <literal>UPDATE</literal> es realmente requerido."
 
-#: index.docbook:282
+#. Tag: para
+#: basic_mapping.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "<literal>polymorphism</literal> (opcional, por defecto a <literal>implicit</"
 "literal>): Determina si se usa polimorfismo de consulta impl&#x00ed;cito o "
 "expl&#x00ed;cito."
 
-#: index.docbook:288
+#. Tag: para
+#: basic_mapping.xml:312
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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> (opcional) especifica una condici&#x00f3;n SQL "
 "<literal>WHERE</literal> arbitraria paraa ser usada al recuperar objetos de "
 "esta clase."
 
-#: index.docbook:294
+#. Tag: para
+#: basic_mapping.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (opcional): Especifica un "
 "<literal>ClassPersister</literal> personalizado."
 
-#: index.docbook:299
+#. Tag: para
+#: basic_mapping.xml:323
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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> (opcional, por defecto a <literal>1</literal>) "
 "especifica un \"tama&#x00f1;o de lote\" para traer instancias de esta clase "
 "por identificador."
 
-#: index.docbook:305
+#. Tag: para
+#: basic_mapping.xml:329
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional, por defecto a "
 "<literal>version</literal>): Determina la estrategia optimista de bloqueo."
 
-#: index.docbook:311
+#. Tag: para
+#: basic_mapping.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<literal>lazy</literal> (optional): lazy fetching can be disabled by setting "
+"<literal>lazy=\"false\"</literal>."
 msgstr ""
 "<literal>lazy</literal> (opcional): La recuperaci&#x00f3;n perezosa puede "
 "ser deshabilitada por completo estableciendo <literal>lazy=\"false\"</"
 "literal>."
 
-#: index.docbook:317
+#. Tag: para
+#: basic_mapping.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal> (opcional): Hibernate3 permite que una clase "
 "sea mapeada varias veces (potencialmente a tablas diferentes), y permite que "
@@ -686,9 +785,11 @@
 "entidad. Para m&#x00e1;s informaci&#x00f3;n, mira <xref linkend=\"persistent-"
 "classes-dynamicmodels\"/> y <xref linkend=\"xml\"/>."
 
-#: index.docbook:327
+#. Tag: para
+#: basic_mapping.xml:351
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -696,13 +797,15 @@
 "generar una restricci&#x00f3;n <emphasis>check</emphasis> multi-fila para la "
 "generaci&#x00f3;n autom&#x00e1;tica de esquema."
 
-#: index.docbook:333
+#. Tag: para
+#: basic_mapping.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (opcional): Hibernate puede usar los llamados "
 "ROWIDs en las bases de datos que los soporten. Por ejemplo, en Oracle, "
@@ -711,32 +814,38 @@
 "<literal>rowid</literal>. Un ROWID es un detalle de implementaci&#x00f3;n y "
 "representa la posici&#x00f3;n f&#x00ed;sica de la tupla almacenada."
 
-#: index.docbook:341
+#. Tag: para
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (opcional): Mapea una entidad inmutable y de "
 "s&#x00f3;lo lectura a una subselect de base de datos. Es &#x00fa;til si "
 "quieres tener una vista en vez de una tabla base, pero no tienes vistas. "
 "Mira debajo para m&#x00e1;s informaci&#x00f3;n."
 
-#: index.docbook:348
+#. Tag: para
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (opcional): Usado para marcar superclases "
 "abstractas en jerarqu&#x00ed;as <literal>&lt;union-subclass&gt;</literal>."
 
-#: index.docbook:356
+#. Tag: para
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "Es perfectamente aceptable que la clase persistente mencionada sea una "
 "interface. Entonces declarar&#x00ed;as clases que implementan esa interface "
@@ -745,9 +854,11 @@
 "especificar el nombre de la clase usando la forma est&#x00e1;ndar. Por "
 "ejemplo, <literal>eg.Foo$Bar</literal>."
 
-#: index.docbook:363
+#. Tag: para
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -755,13 +866,15 @@
 "actualizadas o borradas por la aplicaci&#x00f3;n. Esto permite a Hibernate "
 "hacer ciertas optimizaciones menores de rendimiento."
 
-#: index.docbook:368
+#. Tag: para
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "El atributo opcional <literal>proxy</literal> habilita la "
 "inicializaci&#x00f3;n postergada de instancias persistentes de la clase. "
@@ -770,21 +883,23 @@
 "se invoque un m&#x00e9;todo del proxy. Mira \"Proxies para "
 "Inicializaci&#x00f3;n Postergada\" debajo."
 
-#: index.docbook:375
+#. Tag: para
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "Por polimorfismo <emphasis>impl&#x00ed;cito</emphasis> se entiende que las "
 "instancias de la clase ser&#x00e1;n devueltas por una consulta que mencione "
@@ -803,16 +918,18 @@
 "est&#x00e1;n mapeadas a la misma tabla (esto permite tener una clase "
 "\"liviana\" que contenga un subconjunto de columnas de la tabla)."
 
-#: index.docbook:387
+#. Tag: para
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "El atributo <literal>persister</literal> te permite personalizar la "
 "estrategia de persistencia para la clase. Puedes, por ejemplo, especificar "
@@ -824,14 +941,15 @@
 "Para un ejemplo simple (de persistencia a una <literal>Hashtable</literal>) "
 "mira <literal>org.hibernate.test.CustomPersister</literal>."
 
-#: index.docbook:398
+#. Tag: para
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "Observa que los valores de <literal>dynamic-update</literal> y "
 "<literal>dynamic-insert</literal> no son heredados por las subclases y por "
@@ -840,11 +958,13 @@
 "incrementar el rendimiento en algunos casos, pero podr&#x00ed;an mermarlo en "
 "otros. Ten juicio en su uso."
 
-#: index.docbook:406
+#. Tag: para
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "Generalmente el uso de <literal>select-before-update</literal> "
@@ -853,7 +973,9 @@
 "volver a unir un grafo de instancias separadas a una <literal>Session</"
 "literal>."
 
-#: index.docbook:412
+#. Tag: para
+#: basic_mapping.xml:435
+#, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
 "optimistic locking strategies:"
@@ -861,34 +983,43 @@
 "Si habilitas <literal>dynamic-update</literal>, tendr&#x00e1;s opci&#x00f3;n "
 "de estrategias de bloqueo optimistas:"
 
-#: index.docbook:418
-msgid "<literal>version</literal> check the version/timestamp columns"
+#. Tag: para
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr ""
 "<literal>version</literal> chequea las columnas de versi&#x00f3;n/timestamp"
 
-#: index.docbook:423
-msgid "<literal>all</literal> check all columns"
+#. Tag: para
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all</literal> chequea todas las columnas"
 
-#: index.docbook:428
+#. Tag: para
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr ""
 "<literal>dirty</literal> chequea las columnas modificadas, permitiendo "
 "algunas actualizaciones concurrentes"
 
-#: index.docbook:433
-msgid "<literal>none</literal> do not use optimistic locking"
+#. Tag: para
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none</literal> no usa bloqueo optimista"
 
-#: index.docbook:438
+#. Tag: para
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "Recomendamos <emphasis>muy</emphasis> fuertemente que uses columnas de "
 "versi&#x00f3;n/timestamp para bloqueo optimista con Hibernate. Esta es la "
@@ -897,14 +1028,16 @@
 "instancias separadas. (por ejemplo, cuando se usa <literal>Session.merge()</"
 "literal>)."
 
-#: index.docbook:445
+#. Tag: para
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "Para un mapeo de Hibernate, no hay diferencia entre una vista y una tabla "
 "base. Como se supone esto es transparente a nivel de base de datos (observa "
@@ -914,7 +1047,9 @@
 "puedes mapear una entidad inmutable de s&#x00f3;lo lectura a una "
 "expresi&#x00f3;n de subconsulta SQL dada."
 
-#: index.docbook:453
+#. Tag: programlisting
+#: basic_mapping.xml:476
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
 "    <subselect>\n"
@@ -942,12 +1077,14 @@
 "    ...\n"
 "</class>]]>"
 
-#: index.docbook:455
+#. Tag: para
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "Declara las tablas con las que sincronizar esta entidad, asegurando que el "
 "auto-flush ocurre correctamente, y que las consultas contra la entidad "
@@ -955,11 +1092,15 @@
 "literal> est&#x00e1; disponible tanto como un atributo o como un elemento "
 "anidado de mapeo."
 
-#: index.docbook:465
+#. Tag: title
+#: basic_mapping.xml:488
+#, no-c-format
 msgid "<title>id</title>"
 msgstr "<title>id</title>"
 
-#: index.docbook:467
+#. Tag: para
+#: basic_mapping.xml:490
+#, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
 "the database table. Most classes will also have a JavaBeans-style property "
@@ -973,7 +1114,9 @@
 "identificador &#x00fa;nico de una instancia. El elemento <literal>&lt;id&gt;"
 "</literal> define el mapeo de esa propiedad a la columna de clave primaria."
 
-#: index.docbook:482
+#. Tag: programlisting
+#: basic_mapping.xml:505
+#, no-c-format
 msgid ""
 "<![CDATA[<id\n"
 "        name=\"propertyName\"\n"
@@ -997,33 +1140,41 @@
 "        <generator class=\"generatorClass\"/>\n"
 "</id>]]>"
 
-#: index.docbook:485
+#. Tag: para
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr ""
 "<literal>name</literal> (opcional): El nombre de la propiedad del "
 "indentificador."
 
-#: index.docbook:490
+#. Tag: para
+#: basic_mapping.xml:513 basic_mapping.xml:1351
+#, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
 msgstr ""
-"<literal>type</literal> (opcional): Un nombre que indica el tipo Hibernate."
+"<literal>type</literal> (opcional): un nombre que indica el nobre Hibernate."
 
-#: index.docbook:495
+#. Tag: para
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr ""
 "<literal>column</literal> (opcional - por defecto al nombre de la "
 "propiedad): El nombre de la columna de clave primaria."
 
-#: index.docbook:501
+#. Tag: para
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional - por defecto al valor \"sensible"
 "\"): Una valor de la propiedad identificadora que indica que una instancia "
@@ -1031,19 +1182,21 @@
 "de instancias separadas que fueran salvadas o cargadas en una sesi&#x00f3;n "
 "previa."
 
-#: index.docbook:509, index.docbook:1017, index.docbook:1156,
-#: index.docbook:1238, index.docbook:1345, index.docbook:1534,
-#: index.docbook:1708, index.docbook:1878, index.docbook:2457
+#. Tag: para
+#: basic_mapping.xml:532
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "<literal>access</literal> (opcional - por defecto a <literal>property</"
 "literal>): La estrategia que Hibernate debe usar para acceder al valor de la "
 "propiedad."
 
-#: index.docbook:517
+#. Tag: para
+#: basic_mapping.xml:540
+#, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
 "class has no identifier property."
@@ -1051,7 +1204,9 @@
 "Si se omite el atributo <literal>name</literal>, se asume que la clase no "
 "tiene propiedad identificadora."
 
-#: index.docbook:522
+#. Tag: para
+#: basic_mapping.xml:545
+#, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
 "Hibernate3."
@@ -1060,21 +1215,27 @@
 "identificadora de tu clase no tiene por defecto el valor por defecto normal "
 "de Java (null o cero), entonces debes especificar el valor por defecto real."
 
-#: index.docbook:526
+#. Tag: para
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "Hay una declaraci&#x00f3;n <literal>&lt;composite-id&gt;</literal> "
 "alternativa para permitir acceso a datos heredados con claves compuestas. "
 "Desalentamos fuertemente su uso para cualquier otra cosa."
 
-#: index.docbook:532
+#. Tag: title
+#: basic_mapping.xml:555
+#, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
-#: index.docbook:534
+#. Tag: para
+#: basic_mapping.xml:557
+#, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
 "class used to generate unique identifiers for instances of the persistent "
@@ -1088,7 +1249,9 @@
 "configurar o inicializar la instancia del generador, se pasa usando el "
 "elemento <literal>&lt;param&gt;</literal>."
 
-#: index.docbook:541
+#. Tag: programlisting
+#: basic_mapping.xml:564
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
 "        <generator class=\"org.hibernate.id.TableHiLoGenerator\">\n"
@@ -1104,13 +1267,15 @@
 "        </generator>\n"
 "</id>]]>"
 
-#: index.docbook:543
+#. Tag: para
+#: basic_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "Todos los generadores implementan la interface <literal>org.hibernate.id."
 "IdentifierGenerator</literal>. Esta es una interface muy simple; algunas "
@@ -1118,11 +1283,15 @@
 "especializadas. Sin embargo, Hibernate provee un rango de implementaciones "
 "prefabricadas. Hay nombres alias de atajo para los generadores prefabricados:"
 
-#: index.docbook:551
+#. Tag: literal
+#: basic_mapping.xml:574
+#, no-c-format
 msgid "increment"
 msgstr "increment"
 
-#: index.docbook:553
+#. Tag: para
+#: basic_mapping.xml:576
+#, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
 "literal> or <literal>int</literal> that are unique only when no other "
@@ -1134,11 +1303,15 @@
 "ning&#x00fa;n otro proceso est&#x00e1; insertando datos en la misma tabla. "
 "<emphasis>No usar en un cluster.</emphasis>"
 
-#: index.docbook:562
+#. Tag: literal
+#: basic_mapping.xml:585
+#, no-c-format
 msgid "identity"
 msgstr "identity"
 
-#: index.docbook:564
+#. Tag: para
+#: basic_mapping.xml:587
+#, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
 "HypersonicSQL. The returned identifier is of type <literal>long</literal>, "
@@ -1148,11 +1321,15 @@
 "HypersonicSQL. El identificador devuelto es de tipo <literal>long</literal>, "
 "<literal>short</literal> o <literal>int</literal>."
 
-#: index.docbook:572
+#. Tag: literal
+#: basic_mapping.xml:595
+#, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
-#: index.docbook:574
+#. Tag: para
+#: basic_mapping.xml:597
+#, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
 "Interbase. The returned identifier is of type <literal>long</literal>, "
@@ -1162,11 +1339,15 @@
 "en Interbase. El identificador devuelto es de tipo <literal>long</literal>, "
 "<literal>short</literal> o <literal>int</literal>."
 
-#: index.docbook:582
+#. Tag: literal
+#: basic_mapping.xml:605
+#, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
-#: index.docbook:584
+#. Tag: para
+#: basic_mapping.xml:607
+#, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
 "<literal>long</literal>, <literal>short</literal> or <literal>int</literal>, "
@@ -1182,11 +1363,15 @@
 "respectivamente). El algoritmo alto/bajo genera identificadores que son "
 "&#x00fa;nicos s&#x00f3;lo para una base de datos particular."
 
-#: index.docbook:594
+#. Tag: literal
+#: basic_mapping.xml:617
+#, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
-#: index.docbook:596
+#. Tag: para
+#: basic_mapping.xml:619
+#, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
 "<literal>long</literal>, <literal>short</literal> or <literal>int</literal>, "
@@ -1196,36 +1381,48 @@
 "tipo <literal>long</literal>, <literal>short</literal> o <literal>int</"
 "literal>, dada una secuencia de base de datos."
 
-#: index.docbook:604
+#. Tag: literal
+#: basic_mapping.xml:627
+#, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
-#: index.docbook:606
+#. Tag: para
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "usa un algoritmo UUID de 128 bits para generar identificadore de tipo "
 "cadena, &#x00fa;nicos en una ref (se usa la direcc&#x00f3;n IP). El UUID se "
 "codifica como una cadena hexadecimal de 32 d&#x00ed;gitos de largo."
 
-#: index.docbook:614
+#. Tag: literal
+#: basic_mapping.xml:637
+#, no-c-format
 msgid "guid"
 msgstr "guid"
 
-#: index.docbook:616
+#. Tag: para
+#: basic_mapping.xml:639
+#, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr ""
 "usa una cadena GUID generada por base de datos en MS SQL Server y MySQL."
 
-#: index.docbook:622
+#. Tag: literal
+#: basic_mapping.xml:645
+#, no-c-format
 msgid "native"
 msgstr "native"
 
-#: index.docbook:624
+#. Tag: para
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1233,40 +1430,52 @@
 "<literal>hilo</literal> dependiendo de las capacidades de la base de datos "
 "subyacente."
 
-#: index.docbook:632
+#. Tag: literal
+#: basic_mapping.xml:655
+#, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
-#: index.docbook:634
+#. Tag: para
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "deja a la aplicaci&#x00f3;n asignar un identificador al objeto antes de que "
 "se llame a <literal>save()</literal>. Esta es la estrategia por defecto si "
 "no se especifica un elemento <literal>&lt;generator&gt;</literal>."
 
-#: index.docbook:642
+#. Tag: literal
+#: basic_mapping.xml:665
+#, no-c-format
 msgid "select"
 msgstr "select"
 
-#: index.docbook:644
+#. Tag: para
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr ""
 "recupera una clave primaria asignada por un disparador de base de datos "
 "seleccionando la fila por alguna clave &#x00fa;nica y recuperando el valor "
 "de la clave primaria."
 
-#: index.docbook:651
+#. Tag: literal
+#: basic_mapping.xml:674
+#, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
-#: index.docbook:653
+#. Tag: para
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1274,18 +1483,22 @@
 "conjunc&#x00f3;n a una asociac&#x00f3;n de clave primaria <literal>&lt;uno-a-"
 "uno&gt;</literal>"
 
-#: index.docbook:660
+#. Tag: literal
+#: basic_mapping.xml:683
+#, no-c-format
 msgid "sequence-identity"
 msgstr "UNTRANSLATED! sequence-identity"
 
-#: index.docbook:662
+#. Tag: para
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "a specialized sequence generation strategy which utilizes a database "
 "sequence for the actual value generation, but combines this with JDBC3 "
@@ -1294,17 +1507,21 @@
 "supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
 "these insert statements are disabled due to a bug in the Oracle drivers."
 
-#: index.docbook:679
+#. Tag: title
+#: basic_mapping.xml:702
+#, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "Algoritmo alto/bajo"
 
-#: index.docbook:680
+#. Tag: para
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "Los generadores <literal>hilo</literal> y <literal>seqhilo</literal> proveen "
 "dos implementaciones alternativas del algoritmo alto/bajo, un enfoque "
@@ -1313,7 +1530,9 @@
 "para tener el siguiente valor \"alto\" disponible. La segunda usa una "
 "secuencia del estilo de Oracle (donde se soporte)."
 
-#: index.docbook:687
+#. Tag: programlisting
+#: basic_mapping.xml:710
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
 "        <generator class=\"hilo\">\n"
@@ -1331,7 +1550,9 @@
 "        </generator>\n"
 "</id>]]>"
 
-#: index.docbook:689
+#. Tag: programlisting
+#: basic_mapping.xml:712
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
 "        <generator class=\"seqhilo\">\n"
@@ -1347,13 +1568,15 @@
 "        </generator>\n"
 "</id>]]>"
 
-#: index.docbook:691
+#. Tag: para
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "Desafortunadamente, no puedes usar <literal>hilo</literal> cuando le proveas "
 "tu propia <literal>Connection</literal> a Hibernate. Cuando Hibernate "
@@ -1361,16 +1584,20 @@
 "conexiones alistadas con JTA, debes configurar correctamente el "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 
-#: index.docbook:700
+#. Tag: title
+#: basic_mapping.xml:723
+#, no-c-format
 msgid "UUID algorithm"
 msgstr "Algoritmo UUID"
 
-#: index.docbook:701
+#. Tag: para
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "El UUID contiene: la direcci&#x00f3;n IP, el instante de arranque de la JVM "
 "(con una precisi&#x00f3;n de un cuarto de segundo), el tiempo de sistema y "
@@ -1378,17 +1605,21 @@
 "direcci&#x00f3;n MAC o una direcci&#x00f3;n de memoria desde c&#x00f3;digo "
 "Java, as&#x00ed; que esto es lo mejor que podemos hacer sin usar JNI."
 
-#: index.docbook:710
+#. Tag: title
+#: basic_mapping.xml:733
+#, no-c-format
 msgid "Identity columns and sequences"
 msgstr "Columnas de identidad y secuencias"
 
-#: index.docbook:711
+#. Tag: para
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "Para las bases de datos que soportan columnas de identidad (DB2, MySQL, "
 "Sybase, MS SQL), puedes usar generaci&#x00f3;n de claves <literal>identity</"
@@ -1397,7 +1628,9 @@
 "claves del estilo <literal>sequence</literal>. Ambas estrategias requieren "
 "dos consultas SQL para insertar un nuevo objeto."
 
-#: index.docbook:719
+#. Tag: programlisting
+#: basic_mapping.xml:742
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
 "        <generator class=\"sequence\">\n"
@@ -1411,7 +1644,9 @@
 "        </generator>\n"
 "</id>]]>"
 
-#: index.docbook:721
+#. Tag: programlisting
+#: basic_mapping.xml:744
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
 "\">\n"
@@ -1423,30 +1658,36 @@
 "        <generator class=\"identity\"/>\n"
 "</id>]]>"
 
-#: index.docbook:723
+#. Tag: para
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "Para desarrollos multiplataforma, la estrategia <literal>native</literal> "
 "eiligir&#x00e1; de entre las estrategias <literal>identity</literal>, "
 "<literal>sequence</literal> y <literal>hilo</literal>, dependiendo de las "
 "capacidades de la base de datos subyacentes."
 
-#: index.docbook:732
+#. Tag: title
+#: basic_mapping.xml:754
+#, no-c-format
 msgid "Assigned identifiers"
 msgstr "Identificadores asignados"
 
-#: index.docbook:733
+#. Tag: para
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "Si quieres que la aplicaci&#x00f3;n asigne los identificadores (en "
@@ -1457,11 +1698,13 @@
 "clave sustituta. Este es el comportamiento por defecto si no especificas un "
 "elemento <literal>&lt;generator&gt;</literal>."
 
-#: index.docbook:742
+#. Tag: para
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1471,17 +1714,23 @@
 "a menos que haya una propiedad de versi&#x00f3;n o timestamp, o que tu "
 "definas <literal>Interceptor.isUnsaved()</literal>."
 
-#: index.docbook:752
+#. Tag: title
+#: basic_mapping.xml:774
+#, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "Claves primarias asignadas por disparadores"
 
-#: index.docbook:753
+#. Tag: para
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr ""
 "Para esquemas heredados solamente (Hibernate no genera DDL con disparadores)."
 
-#: index.docbook:757
+#. Tag: programlisting
+#: basic_mapping.xml:779
+#, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
 "        <generator class=\"select\">\n"
@@ -1495,31 +1744,37 @@
 "        </generator>\n"
 "</id>]]>"
 
-#: index.docbook:759
+#. Tag: para
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "En el ejemplo de arriba, hay una propiedad &#x00e1;nica llamada "
 "<literal>socialSecurityNumber</literal> definida por la clase, como una "
 "clave natural, y una clave sustituta llamada <literal>person_id</literal> "
 "cuyo valor es generado por un disparador."
 
-#: index.docbook:771
+#. Tag: title
+#: basic_mapping.xml:793
+#, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
-#: index.docbook:773
+#. Tag: para
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1529,23 +1784,26 @@
 "described above (starting in 3.3.x); however, they are included in the "
 "current releases and can be referenced by FQN."
 
-#: index.docbook:781
+#. Tag: para
+#: basic_mapping.xml:803
+#, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1563,21 +1821,25 @@
 "sequences are exactly what Hibernate tries to emmulate with its table-based "
 "generators). This generator has a number of configuration parameters:"
 
-#: index.docbook:795
+#. Tag: para
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
-#: index.docbook:801
+#. Tag: para
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1585,57 +1847,67 @@
 "sequence creation terms, this is analogous to the clause typical named "
 "\"STARTS WITH\"."
 
-#: index.docbook:808
+#. Tag: para
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
 "differ. In sequence creation terms, this is analogous to the clause typical "
 "named \"INCREMENT BY\"."
 
-#: index.docbook:815
+#. Tag: para
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
 "literal>): Should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 
-#: index.docbook:822
+#. Tag: para
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
-#: index.docbook:829
+#. Tag: para
+#: basic_mapping.xml:851
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>optimizer</literal> (optional, defaults to <literal>none</"
 "literal>): See"
 
-#: index.docbook:836
+#. Tag: para
+#: basic_mapping.xml:858
+#, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1649,39 +1921,47 @@
 "distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 
-#: index.docbook:846
+#. Tag: para
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
-#: index.docbook:852
+#. Tag: para
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
 "<literal>next_val</literal>): The name of the column on the table which is "
 "used to hold the value."
 
-#: index.docbook:858
+#. Tag: para
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
 "is used to hold the \"segement key\". This is the value which distinctly "
 "identifies which increment value to use."
 
-#: index.docbook:865
+#. Tag: para
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1689,51 +1969,64 @@
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 
-#: index.docbook:872
+#. Tag: para
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
-#: index.docbook:878
+#. Tag: para
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
-#: index.docbook:884
+#. Tag: para
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
-#: index.docbook:890
+#. Tag: para
+#: basic_mapping.xml:912
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
 
-#: index.docbook:900
+#. Tag: title
+#: basic_mapping.xml:922
+#, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
-#: index.docbook:901
+#. Tag: para
+#: basic_mapping.xml:923
+#, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1743,22 +2036,26 @@
 "the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
 "\"/> support this notion."
 
-#: index.docbook:909
+#. Tag: para
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
 "specified): This says to not perform any optimizations, and hit the database "
 "each and every request."
 
-#: index.docbook:915
+#. Tag: para
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1769,14 +2066,16 @@
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 
-#: index.docbook:924
+#. Tag: para
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1785,11 +2084,15 @@
 "with an in-memory grouping algorithm. <literal>increment_size</literal> here "
 "refers to the values coming from the database."
 
-#: index.docbook:937
+#. Tag: title
+#: basic_mapping.xml:959
+#, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
-#: index.docbook:939
+#. Tag: programlisting
+#: basic_mapping.xml:961
+#, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
 "        name=\"propertyName\"\n"
@@ -1819,9 +2122,11 @@
 "        ......\n"
 "</composite-id>]]>"
 
-#: index.docbook:941
+#. Tag: para
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1832,7 +2137,9 @@
 "<literal>&lt;key-property&gt;</literal> y los mapeos <literal>&lt;key-many-"
 "to-one&gt;</literal> como elementos hijo."
 
-#: index.docbook:948
+#. Tag: programlisting
+#: basic_mapping.xml:970
+#, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
 "        <key-property name=\"medicareNumber\"/>\n"
@@ -1844,26 +2151,30 @@
 "        <key-property name=\"dependent\"/>\n"
 "</composite-id>]]>"
 
-#: index.docbook:950
+#. Tag: para
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "Tu clase persistente <emphasis>debe</emphasis> sobreescribir <literal>equals"
 "()</literal> y <literal>hashCode()</literal> para implementar igualdad de "
 "identificador compuesto. Debe tambi&#x00e9;n implementar "
 "<literal>Serializable</literal>."
 
-#: index.docbook:956
+#. Tag: para
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "Desafortunadamente, este enfoque de identificadores compuestos significa que "
 "un objeto persistente es su propio identificador. No existe otra \"asa\" "
@@ -1875,7 +2186,9 @@
 "<xref linkend=\"components-compositeid\"/>. Los atributos descriptos debajo "
 "solamente se aplican a este enfoque alternativo:"
 
-#: index.docbook:965
+#. Tag: para
+#: basic_mapping.xml:987
+#, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
 "identifier, where the identifier properties named inside the <literal>&lt;"
@@ -1887,7 +2200,9 @@
 "composite-id&gt;</literal> element are duplicated on both the persistent "
 "class and a separate identifier class."
 
-#: index.docbook:971
+#. Tag: programlisting
+#: basic_mapping.xml:993
+#, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
 "        <key-property name=\"medicareNumber\"/>\n"
@@ -1899,15 +2214,16 @@
 "                            <key-property name=\"dependent\"/>\n"
 "                    </composite-id>]]>"
 
-#: index.docbook:973
+#. Tag: para
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
@@ -1917,15 +2233,19 @@
 "literal>. The disadvantage of this approach is quite obvious&mdash;code "
 "duplication."
 
-#: index.docbook:982
+#. Tag: para
+#: basic_mapping.xml:1004
+#, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
 msgstr ""
 "The following attributes are used to specify a mapped composite identifier:"
 
-#: index.docbook:988
+#. Tag: para
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -1935,17 +2255,21 @@
 "property mappings refer to both the entity class and the composite "
 "identifier class."
 
-#: index.docbook:996
+#. Tag: para
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (optional, but required for a mapped composite "
 "identifier): The class used as a composite identifier."
 
-#: index.docbook:1003
+#. Tag: para
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -1955,43 +2279,67 @@
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
 
-#: index.docbook:1011
+#. Tag: para
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (opcional): Una propiedad de tipo componente que "
 "tiene el identificador compuesto (ver siguiente secci&#x00f3;n)."
 
-#: index.docbook:1023
+#. Tag: para
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"<literal>access</literal> (opcional - por defecto a <literal>property</"
+"literal>): La estrategia que Hibernate debe usar para acceder al valor de la "
+"propiedad."
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (opcional - por defecto al tipo de la propiedad "
 "determinado por reflecci&#x00f3;n): La clase del componente usado como "
 "identificador compuesto (ver siguiente secci&#x00f3;n)."
 
-#: index.docbook:1030
+#. Tag: para
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "This third approach, an <emphasis>identifier component</emphasis> is the one "
 "we recommend for almost all applications."
 
-#: index.docbook:1038
-msgid "discriminator"
+#. Tag: title
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "discriminator"
 
-#: index.docbook:1040
+#. Tag: para
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2007,7 +2355,9 @@
 "literal>, <literal>short</literal>, <literal>boolean</literal>, "
 "<literal>yes_no</literal>, <literal>true_false</literal>."
 
-#: index.docbook:1058
+#. Tag: programlisting
+#: basic_mapping.xml:1080
+#, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
 "        column=\"discriminator_column\"\n"
@@ -2025,55 +2375,67 @@
 "        formula=\"arbitrary sql expression\"\n"
 "/>]]>"
 
-#: index.docbook:1061
+#. Tag: para
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal> (opcional - por defecto a <literal>class</"
 "literal>) el nombre de la columna discriminadora."
 
-#: index.docbook:1067
+#. Tag: para
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (opcional - por defecto a <literal>string</literal>) "
 "un nombre que indique el tipo Hibernate"
 
-#: index.docbook:1073
+#. Tag: para
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force</literal> (optconal - por defecto a <literal>false</literal>) "
 "\"fuerza\" a Hibernate a especificar valores discriminadores permitidos "
 "incluso cuando se recuperan todas las instancias de la clase ra&#x00ed;z."
 
-#: index.docbook:1080
+#. Tag: para
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (opcional - por defecto a <literal>true</literal>) "
 "establezca este a <literal>false</literal> si tu columna discriminadora es "
 "tambi&#x00e9;n parte de un identificador mapeado compuesto. (Le dice a "
 "Hibernate que no incluya la columna en los SQL <literal>INSERT</literal>s.)"
 
-#: index.docbook:1088
+#. Tag: para
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (opcional) una expresi&#x00f3;n SQL arbitraria "
 "que es ejecutada cuando un tipo tenga que ser evaluado. Permite "
 "dicriminaci&#x00f3;n basada en el contenido."
 
-#: index.docbook:1096
+#. Tag: para
+#: basic_mapping.xml:1118
+#, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
 "<literal>discriminator-value</literal> attribute of the <literal>&lt;"
@@ -2083,26 +2445,32 @@
 "por el atributo <literal>discriminator-value</literal> de los elementos "
 "<literal>&lt;class&gt;</literal> y <literal>&lt;subclass&gt;</literal>."
 
-#: index.docbook:1102
+#. Tag: para
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "El atributo <literal>force</literal> es (s&#x00f3;lo) &#x00fa;til si la "
 "tabla contiene filas con valores discriminadores \"extra\" que no est&#x00e1;"
 "n mapeados a la clase persistente. Generalmente este no es el caso."
 
-#: index.docbook:1108
+#. Tag: para
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "Usando el atributo <literal>formula</literal> puedes declarar una "
 "expresi&#x00f3;n SQL arbitraria que ser&#x00e1; usada para evaluar el tipo "
 "de una fila:"
 
-#: index.docbook:1113
+#. Tag: programlisting
+#: basic_mapping.xml:1135
+#, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
 "    formula=\"case when CLASS_TYPE in ('a', 'b', 'c') then 0 else 1 end\"\n"
@@ -2112,21 +2480,28 @@
 "    formula=\"case when CLASS_TYPE in ('a', 'b', 'c') then 0 else 1 end\"\n"
 "    type=\"integer\"/>]]>"
 
-#: index.docbook:1118
-msgid "version (optional)"
+#. Tag: title
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "version (opcional)"
 
-#: index.docbook:1120
+#. Tag: para
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "El elemento <literal>&lt;version&gt;</literal> es opcional e indica que la "
 "tabla contiene datos versionados. Esto es particularmente &#x00fa;til si "
 "planeas usar <emphasis>transacciones largas</emphasis> (ver debajo)."
 
-#: index.docbook:1136
+#. Tag: programlisting
+#: basic_mapping.xml:1158
+#, no-c-format
 msgid ""
 "<![CDATA[<version\n"
 "        column=\"version_column\"\n"
@@ -2148,36 +2523,55 @@
 "        node=\"element-name|@attribute-name|element/@attribute|.\"\n"
 "/>]]>"
 
-#: index.docbook:1139
+#. Tag: para
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal> (opcional - por defecto al nombre de la "
 "propiedad): El nombre de la columna que tiene el n&#x00fa;mero de "
 "versi&#x00f3;n."
 
-#: index.docbook:1145
+#. Tag: para
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr ""
 "<literal>name</literal>: El nombre de una propiedad de la clase persistente."
 
-#: index.docbook:1150
+#. Tag: para
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (opcional - por defecto a <literal>integer</"
 "literal>): El tipo del n&#x00fa;.mero de vesi&#x00f3;n."
 
-#: index.docbook:1162
+#. Tag: para
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"<literal>access</literal> (opcional - por defecto a <literal>property</"
+"literal>): La estrategia que Hibernate debe usar para acceder al valor de la "
+"propiedad."
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional - por defecto a "
 "<literal>undefined</literal>): Un valor de la propiedad de versi&#x00f3;n "
@@ -2186,24 +2580,28 @@
 "guardadas o cargadas en una sesi&#x00f3;n previa. (<literal>undefined</"
 "literal> especifica que debe usarse el valor de la propiedad identificadora.)"
 
-#: index.docbook:1171
+#. Tag: para
+#: basic_mapping.xml:1193
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "UNTRANSLATED! <literal>generated</literal> (optional - defaults to "
 "<literal>never</literal>): Specifies that this version property value is "
 "actually generated by the database. See the discussion of <link linkend="
 "\"mapping-generated\">generated properties</link>."
 
-#: index.docbook:1178
+#. Tag: para
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "UNTRANSLATED! <literal>insert</literal> (optional - defaults to "
 "<literal>true</literal>): Specifies whether the version column should be "
@@ -2211,9 +2609,11 @@
 "and only if the database column is defined with a default value of "
 "<literal>0</literal>."
 
-#: index.docbook:1188
+#. Tag: para
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2221,15 +2621,17 @@
 "literal>, <literal>integer</literal>, <literal>short</literal>, "
 "<literal>timestamp</literal> o <literal>calendar</literal> de Hibernate."
 
-#: index.docbook:1193
+#. Tag: para
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "Una propiedad de versi&#x00f3;n o timestamp nunca debe ser nula para una "
 "instancia separada, de modo que Hibernate detectar&#x00e1; cualquier "
@@ -2240,17 +2642,20 @@
 "la re-uni&#x00f3;n transitiva en Hibernate, especialmente &#x00fa;til para "
 "que usa identificadores asignados o claves compuestas!</emphasis>"
 
-#: index.docbook:1204
-msgid "timestamp (optional)"
+#. Tag: title
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp (opcional)"
 
-#: index.docbook:1206
+#. Tag: para
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "El elemento opcional <literal>&lt;timestamp&gt;</literal> indica que la "
 "tabla contiene datos con sellos de tiempo. Esto esta concebido como una "
@@ -2259,7 +2664,9 @@
 "embrago, a veces la aplicaci&#x00f3;n puede usar los timestamps en otras "
 "formas."
 
-#: index.docbook:1222
+#. Tag: programlisting
+#: basic_mapping.xml:1244
+#, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
 "        column=\"timestamp_column\"\n"
@@ -2279,17 +2686,21 @@
 "        node=\"element-name|@attribute-name|element/@attribute|.\"\n"
 "/>]]>"
 
-#: index.docbook:1225
+#. Tag: para
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr ""
 "<literal>column</literal> (opcional - por defecto al nombre de la "
 "propiedad): El nombre de una columna que tiene el timestamp."
 
-#: index.docbook:1231
+#. Tag: para
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2297,13 +2708,15 @@
 "tipo Java <literal>Date</literal> o <literal>Timestamp</literal> de la clase "
 "persistente."
 
-#: index.docbook:1244
+#. Tag: para
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional - por defecto a <literal>null</"
 "literal>): Un valor de propiedad de versi&#x00f3;n que indica que una "
@@ -2312,16 +2725,18 @@
 "cargadas en una sesi&#x00f3;n previa. (<literal>undefined</literal> "
 "especifica que debe usarse el valor de la propiedad identificadora.)"
 
-#: index.docbook:1253
+#. Tag: para
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "UNTRANSLATED! <literal>source</literal> (optional - defaults to <literal>vm</"
 "literal>): From where should Hibernate retrieve the timestamp value? From "
@@ -2332,41 +2747,57 @@
 "retrieving of the database's current timestamp, while others might be unsafe "
 "for usage in locking due to lack of precision (Oracle 8 for example)."
 
-#: index.docbook:1265
+#. Tag: para
+#: basic_mapping.xml:1287
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "UNTRANSLATED! <literal>generated</literal> (optional - defaults to "
 "<literal>never</literal>): Specifies that this timestamp property value is "
 "actually generated by the database. See the discussion of <link linkend="
 "\"mapping-generated\">generated properties</link>."
 
-#: index.docbook:1274
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
 "version type=\"timestamp\"&gt;</literal>."
 
-#: index.docbook:1284
-msgid "property"
+#. Tag: title
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "property"
 
-#: index.docbook:1286
+#. Tag: para
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "El elemento <literal>&lt;property&gt;</literal> declara una propiedad "
 "persistente estilo JavaBean de la clase."
 
-#: index.docbook:1308
+#. Tag: programlisting
+#: basic_mapping.xml:1335
+#, no-c-format
 msgid ""
 "<![CDATA[<property\n"
 "        name=\"propertyName\"\n"
@@ -2409,7 +2840,9 @@
 "        scale=\"S\"\n"
 "/>]]>"
 
-#: index.docbook:1311
+#. Tag: para
+#: basic_mapping.xml:1338
+#, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
 "letter."
@@ -2417,10 +2850,12 @@
 "<literal>name</literal>: el nombre de la propiedad, con la letra inicial en "
 "min&#x00fa;sculas."
 
-#: index.docbook:1317
+#. Tag: para
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal> (opcional - por defecto al nombre de la "
@@ -2428,20 +2863,16 @@
 "puede tambi&#x00e9;n ser especificado con elemento(s) <literal>&lt;column&gt;"
 "</literal> anidado(s)."
 
-#: index.docbook:1324
+#. Tag: para
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr ""
-"<literal>type</literal> (opcional): un nombre que indica el nobre Hibernate."
-
-#: index.docbook:1329
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (opcional - por defecto a <literal>true</"
 "literal>) : especifica que las columnas mapeadas deben ser inclu&#x00ed;das "
@@ -2451,7 +2882,9 @@
 "propiedad que mapee a la misma columna (o columnas) o por un disparador u "
 "otra aplicaci&#x00f3;n."
 
-#: index.docbook:1338
+#. Tag: para
+#: basic_mapping.xml:1365
+#, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
 "value for a <emphasis>computed</emphasis> property. Computed properties do "
@@ -2461,20 +2894,24 @@
 "el valor para una propiedad <emphasis>computada</emphasis>. Las propiedades "
 "computadas no tienen una columna mapeada propia."
 
-#: index.docbook:1351
+#. Tag: para
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (opcional - por defecto a <literal>false</literal>): "
 "Especifica que esta propiedad debe ser tra&#x00ed;da perezosamente cuando la "
 "variable de instancia sea accedida por primera vez (requiere "
 "instrumentaci&#x00f3;n en tiempo de compilaci&#x00f3;n)."
 
-#: index.docbook:1358
+#. Tag: para
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2483,20 +2920,24 @@
 "que &#x00e9;sta sea un blanco objetivo de una <literal>property-ref</"
 "literal>."
 
-#: index.docbook:1365
+#. Tag: para
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (opcional): Habilita la generaci&#x00f3; DDL de "
 "una restricci&#x00f3;n de nulabilidad para las columnas."
 
-#: index.docbook:1371
+#. Tag: para
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
 "literal>): Especifica que las actualizaciones a esta propiedad requieran o "
@@ -2504,62 +2945,76 @@
 "determina si debe ocurrir un incremento de versi&#x00f3;n cuando la "
 "propiedad este sucia (desactualizada)."
 
-#: index.docbook:1379
+#. Tag: para
+#: basic_mapping.xml:1406
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "UNTRANSLATED! <literal>generated</literal> (optional - defaults to "
 "<literal>never</literal>): Specifies that this property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
 "generated\">generated properties</link>."
 
-#: index.docbook:1388
+#. Tag: para
+#: basic_mapping.xml:1415
+#, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis> puede ser:"
 
-#: index.docbook:1394
+#. Tag: para
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "El nombre de un tipo b&#x00e1;sico Hibernate (por ejemplo, <literal>integer, "
 "string, character, date, timestamp, float, binary, serializable, object, "
 "blob</literal>)."
 
-#: index.docbook:1400
+#. Tag: para
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "El nombre de una clase Java de tipo b&#x00e1;sico (por ejemplo, "
 "<literal>int, float, char, java.lang.String, java.util.Date, java.lang."
 "Integer, java.sql.Clob</literal>)."
 
-#: index.docbook:1406
+#. Tag: para
+#: basic_mapping.xml:1433
+#, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "El nombre de una clase Java serializable."
 
-#: index.docbook:1411
+#. Tag: para
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "El nombre de un tipo personalizado (por ejemplo, <literal>com.illflow.type."
 "MyCustomType</literal>)."
 
-#: index.docbook:1417
+#. Tag: para
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "Si no especificas un tipo, Hibernate usar&#x00e1; reflecci&#x00f3;n sobre la "
 "propiedad mencionada para deducir el tipo Hibernate correcto. Hibernate "
@@ -2570,13 +3025,15 @@
 "<literal>Hibernate.DATE</literal> y <literal>Hibernate.TIMESTAMP</literal>, "
 "o especificar un tipo personalizado.)"
 
-#: index.docbook:1427
+#. Tag: para
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2589,13 +3046,14 @@
 "propiedad mencionando una clase que implemente la interface <literal>org."
 "hibernate.property.PropertyAccessor</literal>."
 
-#: index.docbook:1436
+#. Tag: para
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "Una aspecto especialmente poderoso son las propiedades derivadas. Estas "
 "propiedades son por definici&#x00f3;n de s&#x00f3;lo lectura, el valor de la "
@@ -2604,7 +3062,9 @@
 "subconsulta <literal>SELECT</literal> en la consulta SQL que cargue una "
 "instancia:"
 
-#: index.docbook:1443
+#. Tag: programlisting
+#: basic_mapping.xml:1470
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "<property name=\"totalPrice\"\n"
@@ -2622,27 +3082,33 @@
 "                AND li.customerId = customerId\n"
 "                AND li.orderNumber = orderNumber )\"/>]]>"
 
-#: index.docbook:1445
+#. Tag: para
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "Observa que puedes referenciar la propia tabla de las entidades sin declarar "
 "un alias o una columna particular (<literal>customerId</literal> en el "
 "ejemplo dado). Observa adem&#x00e1;s que puedes usar el elemento anidado de "
 "mapeo <literal>&lt;formula&gt;</literal> si no te gusta usar el atributo."
 
-#: index.docbook:1455
-msgid "many-to-one"
+#. Tag: title
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many-to-one"
 
-#: index.docbook:1457
+#. Tag: para
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "Una asociaci&#x00f3;n ordinaria a otra clase persistente se declara usando "
@@ -2651,7 +3117,9 @@
 "est&#x00e1; referenciando la columna (o columnas) de la clave primaria de la "
 "tabla objetivo."
 
-#: index.docbook:1485
+#. Tag: programlisting
+#: basic_mapping.xml:1512
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
 "        name=\"propertyName\"\n"
@@ -2701,53 +3169,65 @@
 "        foreign-key=\"foreign_key_name\"\n"
 "/>]]>"
 
-#: index.docbook:1488, index.docbook:1669, index.docbook:1855
-msgid "<literal>name</literal>: The name of the property."
+#. Tag: para
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the name of the property."
 msgstr "<literal>name</literal>: El nombre de la propiedad."
 
-#: index.docbook:1493, index.docbook:2284
+#. Tag: para
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "<literal>column</literal> (opcional): El nombre de la columna clave "
 "for&#x00e1;nea. Tambi&#x00e9;n puede ser especificado por uno o varios "
 "elementos anidados <literal>&lt;column&gt;</literal>."
 
-#: index.docbook:1500, index.docbook:1674
+#. Tag: para
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "<literal>class</literal> (opcional - por defecto al tipo de la propiedad "
 "determinado por reflecci&#x00f3;n): El nombre de la clase asociada."
 
-#: index.docbook:1506
+#. Tag: para
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade</literal> (opcional): Especifica qu&#x00e9; operaciones "
-"deben ir en cascada desde el objeto padre al objeto asociado"
+"<literal>cascade</literal> (opcional) especifica qu&#x00e9; operaciones "
+"deben ir en cascada desde el objeto padre al objeto asociado."
 
-#: index.docbook:1512, index.docbook:1695
+#. Tag: para
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "<literal>fetch</literal> (opcional - por defecto a 1<literal>select</"
 "literal>): Escoge entre recuperaci&#x00f3;n outer-join o por selecci&#x00f3;"
 "n secuencial."
 
-#: index.docbook:1518
+#. Tag: para
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (opcional - por defecto a <literal>true</"
 "literal>) especifica que las columnas mapeadas deben ser inclu&#x00ed;das en "
@@ -2757,9 +3237,11 @@
 "propiedad que mapea a las misma columna (o columnas), o por un disparador, o "
 "por otra aplicaci&#x00f3;n."
 
-#: index.docbook:1527
+#. Tag: para
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -2767,12 +3249,14 @@
 "clase asociada que est&#x00e1; unida a la clave for&#x00e1;nea. Si no se "
 "especifica, se usa la clave primaria de la clase asociada."
 
-#: index.docbook:1540
+#. Tag: para
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal> (opcional): Habilita la generaci&#x00f3;n DDL de "
 "una restricci&#x00f3;n de unicidad para la columna de clave for&#x00e1;nea. "
@@ -2780,35 +3264,26 @@
 "<literal>property-ref</literal>. Esto hace efectivamente la multiplicidad de "
 "la asociaci&#x00f3;n uno a uno."
 
-#: index.docbook:1548
+#. Tag: para
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (opcional): Habilita la generaci&#x00f3;n DDL de "
 "una restricci&#x00f3;n de nulabilidad para las columnas de clave for&#x00e1;"
 "nea."
 
-#: index.docbook:1554
+#. Tag: para
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
-"literal>): Especifica que las actualizaciones a esta propiedad requieran o "
-"no la obtenci&#x00f3;n del bloqueo optimista. En otras palabras, determina "
-"si debe darse un incremento de versi&#x00f3;n cuando esta propiedad "
-"est&#x00e9; desactualizada."
-
-#: index.docbook:1562
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal> (opcional - por defecto a <literal>proxy</literal>): "
@@ -2819,11 +3294,13 @@
 "compilaci&#x00f3;n). <literal>lazy=\"false\"</literal> especifica que la "
 "asociaci&#x00f3;n siempre ser&#x00e1; recuperada tempranamente."
 
-#: index.docbook:1572
+#. Tag: para
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (opcional - por defecto a <literal>exception</"
@@ -2831,15 +3308,19 @@
 "que referencien filas inexistentes: <literal>ignore</literal> tratar&#x00e1; "
 "una fila perdida como una asociaci&#x00f3;n nula."
 
-#: index.docbook:1579, index.docbook:1733
+#. Tag: para
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr ""
 "<literal>entity-name</literal> (opcional): El nombre de entidad de la clase "
 "asociada."
 
-#: index.docbook:1585
+#. Tag: para
+#: basic_mapping.xml:1611
+#, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
 "value for a <emphasis>computed</emphasis> foreign key."
@@ -2847,19 +3328,21 @@
 "<literal>formula</literal> (opcional): una expresi&#x00f3;n SQL que define "
 "el valor para una clave for&#x00e1;nea <emphasis>computada</emphasis>."
 
-#: index.docbook:1592
+#. Tag: para
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "Establecer el valor del atributo <literal>cascade</literal> a cualquier "
 "valor significativo distinto de <literal>none</literal> propagar&#x00e1; "
@@ -2872,14 +3355,18 @@
 "<literal>cascade=\"all,delete-orphan\"</literal>. Para una explicaci&#x00f3;"
 "n completa, ver <xref linkend=\"objectstate-transitive\"/>."
 
-#: index.docbook:1605
+#. Tag: para
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 "Una declaraci&#x00f3;n t&#x00ed;pica <literal>muchos-a-uno</literal> se "
 "parece a esto:"
 
-#: index.docbook:1609
+#. Tag: programlisting
+#: basic_mapping.xml:1636
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
 "\"/>]]>"
@@ -2887,15 +3374,17 @@
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
 "\"/>]]>"
 
-#: index.docbook:1611
+#. Tag: para
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "El atributo <literal>property-ref</literal> debe ser usado solamente para el "
 "mapeo de datos heredados donde una clave for&#x00e1;nea referencia una clave "
@@ -2905,7 +3394,9 @@
 "no es la clave primaria. (El atributo <literal>unique</literal> controla la "
 "generaci&#x00f3;n de DDL con la herramienta SchemaExport.)"
 
-#: index.docbook:1620
+#. Tag: programlisting
+#: basic_mapping.xml:1647
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
 "column=\"SERIAL_NUMBER\"/>]]>"
@@ -2913,12 +3404,16 @@
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
 "column=\"SERIAL_NUMBER\"/>]]>"
 
-#: index.docbook:1622
+#. Tag: para
+#: basic_mapping.xml:1649
+#, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr ""
 "Entonces el mapeo para <literal>OrderItem</literal> deber&#x00ed;a usar:"
 
-#: index.docbook:1626
+#. Tag: programlisting
+#: basic_mapping.xml:1653
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
 "\"PRODUCT_SERIAL_NUMBER\"/>]]>"
@@ -2926,11 +3421,15 @@
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
 "\"PRODUCT_SERIAL_NUMBER\"/>]]>"
 
-#: index.docbook:1628
-msgid "This is certainly not encouraged, however."
+#. Tag: para
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "Sin embargo, esto no esta ciertamente alentado."
 
-#: index.docbook:1632
+#. Tag: para
+#: basic_mapping.xml:1659
+#, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
 "entity, you should map the referenced properties inside a named <literal>&lt;"
@@ -2940,13 +3439,17 @@
 "la entidad asociada, debes mapear las propiedades dentro de un elemento "
 "<literal>&lt;properties&gt;</literal>."
 
-#: index.docbook:1637
+#. Tag: para
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr "UNTRANSLATED!"
 
-#: index.docbook:1641
+#. Tag: programlisting
+#: basic_mapping.xml:1668
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
 "\"OWNER_SSN\"/>]]>"
@@ -2954,11 +3457,15 @@
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
 "\"OWNER_SSN\"/>]]>"
 
-#: index.docbook:1646
-msgid "one-to-one"
+#. Tag: title
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "one-to-one"
 
-#: index.docbook:1648
+#. Tag: para
+#: basic_mapping.xml:1675
+#, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
 "<literal>one-to-one</literal> element."
@@ -2966,7 +3473,9 @@
 "Una asociaci&#x00f3;n uno-a-uno a otra clase persistente se declara usando "
 "un elemento <literal>one-to-one</literal>."
 
-#: index.docbook:1666
+#. Tag: programlisting
+#: basic_mapping.xml:1693
+#, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
 "        name=\"propertyName\"\n"
@@ -3000,23 +3509,17 @@
 "        foreign-key=\"foreign_key_name\"\n"
 "/>]]>"
 
-#: index.docbook:1680
+#. Tag: para
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>cascade</literal> (opcional) especifica qu&#x00e9; operaciones "
-"deben ir en cascada desde el objeto padre al objeto asociado."
-
-#: index.docbook:1686
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>constrained</literal> (opcional) especifica que una "
 "restricci&#x00f3;n de clave for&#x00e1;nea de la tabla mapeada referencia a "
 "la tabla de la clase asociada. Esta opci&#x00f3;n afecta el orden en que van "
@@ -3025,9 +3528,11 @@
 "proxies (es tambi&#x00e9;n usado por la herramienta de exportaci&#x00f3;n de "
 "esquemas)."
 
-#: index.docbook:1701
+#. Tag: para
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3035,13 +3540,15 @@
 "clase asociada que est&#x00e9; unida a la clave primaria de esta clase. Si "
 "no se especifica, se usa la clave primaria de la clase asociada."
 
-#: index.docbook:1714
+#. Tag: para
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>formula</literal> (opcional): Casi todas las asociaciones uno-a-uno "
 "mapean a la clave primaria de la entidad propietaria. En el raro caso en que "
@@ -3049,16 +3556,18 @@
 "expresi&#x00f3;n para unir usando una f&#x00f3;rmula SQL. (Para un ejemplo "
 "ver <literal>org.hibernate.test.onetooneformula</literal>)."
 
-#: index.docbook:1722
+#. Tag: para
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>lazy</literal> (opcional - por defecto a <literal>proxy</literal>): "
 "Por defecto, las asociaciones de punto &#x00fa;nico van con proxies. "
@@ -3071,25 +3580,32 @@
 "aplicaci&#x00f3;n de proxies es imposible e Hibernate traer&#x00e1; temprano "
 "la asociaci&#x00f3;n!</emphasis>"
 
-#: index.docbook:1740
-msgid "There are two varieties of one-to-one association:"
+#. Tag: para
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "Hay dos variedades de asociaciones uno-a-uno:"
 
-#: index.docbook:1744
+#. Tag: para
+#: basic_mapping.xml:1771
+#, no-c-format
 msgid "primary key associations"
 msgstr "asociaciones de clave primaria"
 
-#: index.docbook:1747
+#. Tag: para
+#: basic_mapping.xml:1774
+#, no-c-format
 msgid "unique foreign key associations"
 msgstr "asociaciones de clave for&#x00e1;neas &#x00fa;nica"
 
-#: index.docbook:1752
+#. Tag: para
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "Las asociaciones de clave primaria no necesitan una columna de tabla extra; "
 "si dos filas est&#x00e1;n relacionadas por la asociaci&#x00f3;n entonces las "
@@ -3098,20 +3614,26 @@
 "asociaci&#x00f3;n de clave primaria, debes asegurarte que se les asigne el "
 "mismo valor de identificador!"
 
-#: index.docbook:1759
+#. Tag: para
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "Para una asociaci&#x00f3;n de clave primaria, a&#x00f1;ade los siguientes "
 "mapeos a <literal>Employee</literal> y <literal>Person</literal>, "
 "respectivamente."
 
-#: index.docbook:1764
+#. Tag: programlisting
+#: basic_mapping.xml:1791
+#, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 
-#: index.docbook:1765
+#. Tag: programlisting
+#: basic_mapping.xml:1792
+#, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
 "\"/>]]>"
@@ -3119,18 +3641,22 @@
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
 "\"/>]]>"
 
-#: index.docbook:1767
+#. Tag: para
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "Ahora debemos asegurarnos que las claves primarias de las filas relacionadas "
 "en las tablas PERSON y EMPLOYEE sean iguales. Usamos una estrategia especial "
 "de generaci&#x00f3;n de identificador de Hibernate llamada <literal>foreign</"
 "literal>:"
 
-#: index.docbook:1773
+#. Tag: programlisting
+#: basic_mapping.xml:1800
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
@@ -3156,29 +3682,34 @@
 "        constrained=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:1775
+#. Tag: para
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "A una instancia reci&#x00e9;n salvada de <literal>Person</literal> se le "
 "asigna entonces el mismo valor de clave primaria con que la instancia "
 "<literal>Employee</literal> referida por la propiedad <literal>employee</"
 "literal> de esta <literal>Person</literal>."
 
-#: index.docbook:1781
+#. Tag: para
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "Alternativamente, una clave for&#x00e1;nea con una restricci&#x00f3;n de "
 "unicidad, desde <literal>Employee</literal> a <literal>Person</literal>, "
 "puede ser expresada como:"
 
-#: index.docbook:1786
+#. Tag: programlisting
+#: basic_mapping.xml:1813
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
 "unique=\"true\"/>]]>"
@@ -3186,15 +3717,19 @@
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
 "unique=\"true\"/>]]>"
 
-#: index.docbook:1788
+#. Tag: para
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr ""
 "Y esta asociaci&#x00f3;n puede hacerse bidireccional agregando lo siguiente "
 "al mapeo de <literal>Person</literal> :"
 
-#: index.docbook:1793
+#. Tag: programlisting
+#: basic_mapping.xml:1820
+#, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
 "\"person\"/>]]>"
@@ -3202,11 +3737,15 @@
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
 "\"person\"/>]]>"
 
-#: index.docbook:1798
-msgid "natural-id"
+#. Tag: title
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr "natural-id"
 
-#: index.docbook:1800
+#. Tag: programlisting
+#: basic_mapping.xml:1827
+#, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
 "        <property ... />\n"
@@ -3220,14 +3759,16 @@
 "        ......\n"
 "</natural-id>]]>"
 
-#: index.docbook:1802
+#. Tag: para
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "Aunque recomendamos el uso de claves delegadas como claves primarias, "
@@ -3239,9 +3780,11 @@
 "las restricciones de clave &#x00fa;nica y nulabilidad necesarias, y tu mapeo "
 "ser&#x00e1; m&#x00e1;s auto-documentado."
 
-#: index.docbook:1811
+#. Tag: para
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3249,40 +3792,51 @@
 "<literal>hashCode()</literal> para comparar las propiedades de clave natural "
 "de la entidad."
 
-#: index.docbook:1816
+#. Tag: para
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr ""
 "Este mapeo no est&#x00e1; concebido para usar con entidades con claves "
 "primarias naturales."
 
-#: index.docbook:1822
+#. Tag: para
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr ""
 "<literal>mutable</literal> (opcional, por defecto a <literal>false</"
 "literal>): Por defecto, se asume que las propiedades de identificadores "
 "naturales son inmutables (constantes)."
 
-#: index.docbook:1832
-msgid "component, dynamic-component"
+#. Tag: title
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr "component, dynamic-component"
 
-#: index.docbook:1834
+#. Tag: para
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr ""
 "El elemento <literal>&lt;component&gt;</literal> mapea propiedades de un "
 "objeto hijo a columnas de la tabla de la clase padre. Los componentes pueden "
 "a su vez declarar sus propias propiedades, componentes o colecciones. Ver "
 "debajo \"Componentes\"."
 
-#: index.docbook:1852
+#. Tag: programlisting
+#: basic_mapping.xml:1879
+#, no-c-format
 msgid ""
 "<![CDATA[<component\n"
 "        name=\"propertyName\"\n"
@@ -3318,47 +3872,57 @@
 "        ........\n"
 "</component>]]>"
 
-#: index.docbook:1860
+#. Tag: para
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>class</literal> (opcional - por defecto al tipo de la propiedad "
 "determinado por reflecci&#x00f3;n): El nombre de la clase del componente "
 "(hijo)."
 
-#: index.docbook:1866, index.docbook:1955
+#. Tag: para
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "<literal>insert</literal>: Aparecen las columnas mapeadas en "
 "<literal>INSERT</literal>s SQL?"
 
-#: index.docbook:1872, index.docbook:1961
+#. Tag: para
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "<literal>update</literal>: Aparecen las columnas mapeadas en "
 "<literal>UPDATE</literal>s SQL?"
 
-#: index.docbook:1884
+#. Tag: para
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (opcional - por defecto a <literal>false</literal>): "
 "Especifica que este componente debe ser recuperado perezosamente cuando la "
 "variable de instancia sea accedida por primera vez (requiere "
 "instrumentaci&#x00f3;n de bytecode en tiempo de compilaci&#x00f3;n)."
 
-#: index.docbook:1891
+#. Tag: para
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
@@ -3367,17 +3931,21 @@
 "determina si debe ocurrir un incremento de versi&#x00f3;n cuando esta "
 "propiedad est&#x00e1; desactualizada."
 
-#: index.docbook:1899, index.docbook:1975
+#. Tag: para
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "<literal>unique</literal> (opcional - por defecto a <literal>false</"
 "literal>): Especifica que existe una restricci&#x00f3;n de unicidad sobre "
 "todas las columnas mapeadas del componente."
 
-#: index.docbook:1908
+#. Tag: para
+#: basic_mapping.xml:1935
+#, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
 "child class to table columns."
@@ -3385,7 +3953,9 @@
 "Las etiquetas hijas <literal>&lt;property&gt;</literal> mapean propiedades "
 "de la clase hija columnas de la tabla."
 
-#: index.docbook:1913
+#. Tag: para
+#: basic_mapping.xml:1940
+#, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
 "parent&gt;</literal> subelement that maps a property of the component class "
@@ -3395,28 +3965,35 @@
 "<literal>&lt;parent&gt;</literal> que mapea una propiedad de la clase del "
 "componente como una referencia de regreso a la entidad contenedora."
 
-#: index.docbook:1919
+#. Tag: para
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr ""
 "El elemento <literal>&lt;dynamic-component&gt;</literal> permite que un "
 "<literal>Map</literal> sea mapeado como un componente, donde los nombres de "
 "las propiedades se corresponden a las claves del mapa, ver <xref linkend="
 "\"components-dynamic\"/>."
 
-#: index.docbook:1928
-msgid "properties"
+#. Tag: title
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr "properties"
 
-#: index.docbook:1930
+#. Tag: para
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "El elemento <literal>&lt;properties&gt;</literal> permite la definici&#x00f3;"
 "n de un grupo de propiedades l&#x00f3;gico con nombre de una clase. El uso "
@@ -3425,7 +4002,9 @@
 "literal>. Es tambi&#x00e9;n una forma conveniente de definir una "
 "restricci&#x00f3;n de unicidad multicolumna."
 
-#: index.docbook:1946
+#. Tag: programlisting
+#: basic_mapping.xml:1973
+#, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
 "        name=\"logicalName\"\n"
@@ -3453,19 +4032,23 @@
 "        ........\n"
 "</properties>]]>"
 
-#: index.docbook:1949
+#. Tag: para
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>name</literal>: El nombre l&#x00f3;gico del agrupamiento - "
 "<emphasis>no</emphasis> un nombre de propiedad real."
 
-#: index.docbook:1967
+#. Tag: para
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
@@ -3474,7 +4057,9 @@
 "determina si debe ocurrir un incremento de versi&#x00f3;n cuando estas "
 "propiedades est&#x00e1;n desactualizadas."
 
-#: index.docbook:1984
+#. Tag: para
+#: basic_mapping.xml:2011
+#, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
 "mapping:"
@@ -3482,10 +4067,13 @@
 "Por ejemplo, si tenemos el siguiente mapeo de <literal>&lt;properties&gt;</"
 "literal>:"
 
-#: index.docbook:1988
+#. Tag: programlisting
+#: basic_mapping.xml:2015
+#, fuzzy, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3506,16 +4094,20 @@
 "    </properties>\n"
 "</class>]]>"
 
-#: index.docbook:1990
+#. Tag: para
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "Entonces puede que tengamos alguna asociaci&#x00f3;n de datos heredados que "
 "se refiera a esta clave &#x00fa;nica de la tabla de <literal>Person</"
 "literal>, en vez de la clave primaria:"
 
-#: index.docbook:1995
+#. Tag: programlisting
+#: basic_mapping.xml:2022
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
 "         class=\"Person\" property-ref=\"name\">\n"
@@ -3531,30 +4123,38 @@
 "    <column name=\"lastName\"/>\n"
 "</many-to-one>]]>"
 
-#: index.docbook:1997
+#. Tag: para
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr ""
 "No recomendamos el uso de este tipo de cosas fuera del contexto del mapeo de "
 "datos heredados."
 
-#: index.docbook:2005
-msgid "subclass"
+#. Tag: title
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr "subclass"
 
-#: index.docbook:2007
+#. Tag: para
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 "Finalmente, la persistencia polim&#x00f3;rfica requiere la declaraci&#x00f3;"
 "n de la clase persistente ra&#x00ed;z. Para la estrategia de mapeo tabla-por-"
 "jerarqu&#x00ed;a-de-clases, se usa la declaraci&#x00f3;n de <literal>&lt;"
 "subclass&gt;</literal>."
 
-#: index.docbook:2020
+#. Tag: programlisting
+#: basic_mapping.xml:2047
+#, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
 "        name=\"ClassName\"\n"
@@ -3585,45 +4185,55 @@
 "        .....\n"
 "</subclass>]]>"
 
-#: index.docbook:2023, index.docbook:2081, index.docbook:2144
+#. Tag: para
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr ""
 "<literal>name</literal>: El nombre de clase cualificado completamente de la "
 "subclase."
 
-#: index.docbook:2028
+#. Tag: para
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>discriminator-value</literal> (opcional - por defecto al nombre de "
 "la clase): Un valor que distingue a subclases individuales."
 
-#: index.docbook:2034, index.docbook:2091, index.docbook:2154
+#. Tag: para
+#: basic_mapping.xml:2061
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "<literal>proxy</literal> (opcional): Especifica una clase o interface a usar "
 "para proxies de inicializaci&#x00f3;n perezosa."
 
-#: index.docbook:2040, index.docbook:2097, index.docbook:2160
+#. Tag: para
+#: basic_mapping.xml:2067
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "<literal>lazy</literal> (opcional, por defecto a <literal>true</literal>): "
 "Establecer <literal>lazy=\"false\"</literal> deshabilita el uso de "
 "recuperaci&#x00f3;n perezosa."
 
-#: index.docbook:2048
+#. Tag: para
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "UNTRANSLATED! Each subclass should declare its own persistent properties and "
 "subclasses. <literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</"
@@ -3631,31 +4241,39 @@
 "subclass in a heirarchy must define a unique <literal>discriminator-value</"
 "literal>. If none is specified, the fully qualified Java class name is used."
 
-#: index.docbook:2056, index.docbook:2114, index.docbook:2172
+#. Tag: para
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
+#, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr ""
 "Para informaci&#x00f3;n acerca de mapeos de herencia, ver <xref linkend="
 "\"inheritance\"/>."
 
-#: index.docbook:2063
-msgid "joined-subclass"
+#. Tag: title
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "joined-subclass"
 
-#: index.docbook:2065
+#. Tag: para
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "Alternativamente, cada subclase puede ser mapeada a su propia tabla "
 "(estrategia de mapeo tabla-por-subclase). El estado heredado se recupera "
 "uniendo con la tabla de la superclase. Usamos el elemento <literal>&lt;"
 "joined-subclass&gt;</literal>."
 
-#: index.docbook:2078
+#. Tag: programlisting
+#: basic_mapping.xml:2105
+#, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
 "        name=\"ClassName\"\n"
@@ -3699,23 +4317,50 @@
 "        .....\n"
 "</joined-subclass>]]>"
 
-#: index.docbook:2086, index.docbook:2149
-msgid "<literal>table</literal>: The name of the subclass table."
+#. Tag: para
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr "<literal>table</literal>: El nombre de tabla de la subclase."
 
-#: index.docbook:2105
+#. Tag: para
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"<literal>proxy</literal> (opcional): Especifica una clase o interface a usar "
+"para proxies de inicializaci&#x00f3;n perezosa."
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"<literal>lazy</literal> (opcional, por defecto a <literal>true</literal>): "
+"Establecer <literal>lazy=\"false\"</literal> deshabilita el uso de "
+"recuperaci&#x00f3;n perezosa."
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "No se requiere de una columna discriminadora para esta estrategia de mapeo. "
 "Cada subclase debe, sin embargo, declarar una columna de tabla que tenga el "
 "identificador del objeto usando el elemento <literal>&lt;key&gt;</literal>. "
 "El mapeo del comienzo del cap&#x00ed;tulo deber&#x00ed;a ser reescrito como:"
 
-#: index.docbook:2112
+#. Tag: programlisting
+#: basic_mapping.xml:2139
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -3783,21 +4428,25 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:2121
-msgid "union-subclass"
+#. Tag: title
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "union-subclass"
 
-#: index.docbook:2123
+#. Tag: para
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "Una tercera opci&#x00f3;n es mapear s&#x00f3;lo las clases concretas de una "
 "jerarqu&#x00ed;a de clases a tablas, (la estrategia tabla-por-clase-"
@@ -3809,7 +4458,9 @@
 "una asociaci&#x00f3;n a la superclase de tu jerarqu&#x00ed;a), debes usar el "
 "mapeo <literal>&lt;union-subclass&gt;</literal>."
 
-#: index.docbook:2141
+#. Tag: programlisting
+#: basic_mapping.xml:2168
+#, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
 "        name=\"ClassName\"\n"
@@ -3851,27 +4502,35 @@
 "        .....\n"
 "</union-subclass>]]>"
 
-#: index.docbook:2168
+#. Tag: para
+#: basic_mapping.xml:2195
+#, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
 msgstr ""
 "No se requiere columna o columna clave discriminadora para esta estrategia "
 "de mapeo."
 
-#: index.docbook:2179
-msgid "join"
+#. Tag: title
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "join"
 
-#: index.docbook:2181
+#. Tag: para
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "Usando el elemento <literal>&lt;join&gt;</literal>, es posible mapear "
 "propiedades de una clase a varias tablas."
 
-#: index.docbook:2195
+#. Tag: programlisting
+#: basic_mapping.xml:2222
+#, no-c-format
 msgid ""
 "<![CDATA[<join\n"
 "        table=\"tablename\"\n"
@@ -3901,19 +4560,23 @@
 "        ...\n"
 "</join>]]>"
 
-#: index.docbook:2199
-msgid "<literal>table</literal>: The name of the joined table."
+#. Tag: para
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal>: El nombre de la clase unida."
 
-#: index.docbook:2216
+#. Tag: para
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -3930,21 +4593,25 @@
 "recuperar un <literal>&lt;join&gt;</literal> definido por la clase y sus "
 "superclases."
 
-#: index.docbook:2229
+#. Tag: para
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (opcional - por defecto a <literal>false</"
 "literal>): De habilitarse, Hibernate no intentar&#x00e1; insertar o "
 "actualizar las propiedades definidas por esta uni&#x00f3;n."
 
-#: index.docbook:2236
+#. Tag: para
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optional</literal> (opcional - por defecto a <literal>false</"
@@ -3952,16 +4619,20 @@
 "si las propiedades definidas por esta uni&#x00f3;n son no nulas y siempre "
 "usar&#x00e1; una uni&#x00f3;n externa para recuperar las propiedades."
 
-#: index.docbook:2245
+#. Tag: para
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "Por ejemplo, la informaci&#x00f3;n domiciliaria de una persona puede ser "
 "mapeada a una tabla separada (preservando a la vez la sem&#x00e1;ntica de "
 "tipo de valor para todas las propiedades):"
 
-#: index.docbook:2250
+#. Tag: programlisting
+#: basic_mapping.xml:2277
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
 "    table=\"PERSON\">\n"
@@ -3989,9 +4660,11 @@
 "    </join>\n"
 "    ...]]>"
 
-#: index.docbook:2252
+#. Tag: para
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4002,23 +4675,29 @@
 "estrategias de mapeo de herencias en una misma jerarqu&#x00ed;a, como se "
 "explica luego."
 
-#: index.docbook:2262
-msgid "<title>key</title>"
+#. Tag: title
+#: basic_mapping.xml:2289
+#, fuzzy, no-c-format
+msgid "<title>Key</title>"
 msgstr "<title>key</title>"
 
-#: index.docbook:2264
+#. Tag: para
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "Hasta ahora hemos visto el elemento <literal>&lt;key&gt;</literal> pocas "
 "veces. Aparece en cualquier sitio en que el elemento padre de mapeo defina "
 "una uni&#x00f3;n a una nueva tabla, y define la clave for&#x00e1;nea en la "
 "tabla unida, que referencia la clave primaria de la tabla original."
 
-#: index.docbook:2280
+#. Tag: programlisting
+#: basic_mapping.xml:2307
+#, no-c-format
 msgid ""
 "<![CDATA[<key\n"
 "        column=\"columnname\"\n"
@@ -4038,64 +4717,76 @@
 "        unique=\"true|false\"\n"
 "/>]]>"
 
-#: index.docbook:2291
+#. Tag: para
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (opcional, por defecto a <literal>noaction</"
 "literal>): Especifica si la restricci&#x00f3;n de clave for&#x00e1;nea tiene "
 "el borrado en cascada habilitado a nivel de base de datos."
 
-#: index.docbook:2298
+#. Tag: para
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (opcional): Especifica que la clave "
 "for&#x00e1;nea referencia columnas que no son del la clave primaria de la "
 "tabla original. (Provisto para datos heredados.)"
 
-#: index.docbook:2305
+#. Tag: para
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (opcional): Especifica que las columnas de la "
 "clave for&#x00e1;nea son no nulables (esto est&#x00e1; implicado si la clave "
 "for&#x00e1;nea es tambi&#x00e9;n parte de la clave primaria)."
 
-#: index.docbook:2312
+#. Tag: para
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (opcional): Especifica que la clave for&#x00e1;nea "
 "nunca debe ser actualizada (esto est&#x00e1; implicado si la clave "
 "for&#x00e1;nea es tambi&#x00e9;n parte de la clave primaria)."
 
-#: index.docbook:2319
+#. Tag: para
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (opcional): Especifica que la clave for&#x00e1;nea "
 "debe tener una restricci&#x00f3;n de unicidad (esto est&#x00e1; implicado si "
 "la clave for&#x00e1;nea es tambi&#x00e9;n la clave primaria)."
 
-#: index.docbook:2327
+#. Tag: para
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "Recomendamos que, para los sistemas en donde el rendimiento sea importante, "
 "todas las claves deben ser definidas <literal>on-delete=\"cascade\"</"
@@ -4105,11 +4796,13 @@
 "funcionalidad se salta la habitual estrategia de bloqueo optimista de "
 "Hibernate para datos versionados."
 
-#: index.docbook:2335
+#. Tag: para
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4119,23 +4812,29 @@
 "nulable, <emphasis>debes</emphasis> declarar la columna clave usando "
 "<literal>&lt;key not-null=\"true\"&gt;</literal>."
 
-#: index.docbook:2345
-msgid "column and formula elements"
+#. Tag: title
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "los elementos column y formula"
 
-#: index.docbook:2346
+#. Tag: para
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "Cualquier elemento de mapeo que acepte un atributo <literal>column</literal> "
 "aceptar&#x00e1; alternativamente un subelemento <literal>&lt;column&gt;</"
 "literal>. De forma similar, <literal>&lt;formula&gt;</literal> es una "
 "alternativa al atributo <literal>formula</literal>."
 
-#: index.docbook:2352
+#. Tag: programlisting
+#: basic_mapping.xml:2379
+#, no-c-format
 msgid ""
 "<![CDATA[<column\n"
 "        name=\"column_name\"\n"
@@ -4162,13 +4861,17 @@
 "        sql-type=\"sql_type_name\"\n"
 "        check=\"SQL expression\"/>]]>"
 
-#: index.docbook:2354
+#. Tag: programlisting
+#: basic_mapping.xml:2381
+#, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr "<![CDATA[<formula>expresi&#x00f3;n SQL</formula>]]>"
 
-#: index.docbook:2356
+#. Tag: para
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4176,7 +4879,9 @@
 "incluso ser combinados dentro del mismo mapeo de propiedad o asociaci&#x00f3;"
 "n para expresar, por ejemplo, condiciones de uni&#x00f3;n ex&#x00f3;ticas."
 
-#: index.docbook:2362
+#. Tag: programlisting
+#: basic_mapping.xml:2389
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
 "        insert=\"false\" update=\"false\">\n"
@@ -4190,17 +4895,21 @@
 "    <formula>'MAILING'</formula>\n"
 "</many-to-one>]]>"
 
-#: index.docbook:2367
-msgid "import"
+#. Tag: title
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "import"
 
-#: index.docbook:2369
+#. Tag: para
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "Sup&#x00f3;n que tu aplicaci&#x00f3;n tiene dos clases persistentes con el "
 "mismo nombre, y no quieres especificar el nombre completamenta cualificado "
@@ -4209,11 +4918,15 @@
 "literal>. Puedes incluso importar clases e interfaces que no est&#x00e9;n "
 "mapeadas expl&#x00ed;citamente."
 
-#: index.docbook:2376
+#. Tag: programlisting
+#: basic_mapping.xml:2403
+#, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 
-#: index.docbook:2383
+#. Tag: programlisting
+#: basic_mapping.xml:2410
+#, no-c-format
 msgid ""
 "<![CDATA[<import\n"
 "        class=\"ClassName\"\n"
@@ -4225,36 +4938,43 @@
 "        rename=\"ShortName\"\n"
 "/>]]>"
 
-#: index.docbook:2386
+#. Tag: para
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr ""
 "<literal>class</literal>: El nombre de clase completamente cualificado de "
 "cualquier clase Java."
 
-#: index.docbook:2391
+#. Tag: para
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal> (opcional - por defecto al nombre de clase sin "
 "cualificar): Un nombre que ser&#x00e1; usado en el leguaje de consulta."
 
-#: index.docbook:2402
-msgid "<title>any</title>"
+#. Tag: title
+#: basic_mapping.xml:2429
+#, fuzzy, no-c-format
+msgid "<title>Any</title>"
 msgstr "<title>any</title>"
 
-#: index.docbook:2404
+#. Tag: para
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "Hay un tipo m&#x00e1;s de mapeo de propiedad. El elemento de mapeo "
 "<literal>&lt;any&gt;</literal> define una asociaci&#x00e1;n polim&#x00f3;"
@@ -4267,10 +4987,12 @@
 "rficas). S&#x00f3;lo debes usar esto en casos muy especiales (por ejemplo, "
 "trazas de auditor&#x00e9;a, datos de sesi&#x00f3;n de usuario, etc)."
 
-#: index.docbook:2414
+#. Tag: para
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4281,7 +5003,9 @@
 "especificado por <literal>id-type</literal>. Debes especificar el mapeo de "
 "valores del meta-type a nombres de clase."
 
-#: index.docbook:2421
+#. Tag: programlisting
+#: basic_mapping.xml:2448
+#, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
 "    <meta-value value=\"TBL_ANIMAL\" class=\"Animal\"/>\n"
@@ -4299,7 +5023,9 @@
 "    <column name=\"id\"/>\n"
 "</any>]]>"
 
-#: index.docbook:2432
+#. Tag: programlisting
+#: basic_mapping.xml:2459
+#, no-c-format
 msgid ""
 "<![CDATA[<any\n"
 "        name=\"propertyName\"\n"
@@ -4333,23 +5059,31 @@
 "        .....\n"
 "</any>]]>"
 
-#: index.docbook:2435
+#. Tag: para
+#: basic_mapping.xml:2462
+#, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>: el nombre de la propiedad."
 
-#: index.docbook:2440
+#. Tag: para
+#: basic_mapping.xml:2467
+#, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>: el tipo del identificador."
 
-#: index.docbook:2445
+#. Tag: para
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal> (opcional - por defecto a <literal>string</"
 "literal>): Cualquier tipo que sea permitido para un mapeo de discriminador."
 
-#: index.docbook:2451
+#. Tag: para
+#: basic_mapping.xml:2478
+#, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
 "the cascade style."
@@ -4357,11 +5091,13 @@
 "<literal>cascade</literal> (opcional- por defecto a <literal>none</"
 "literal>): el estilo de cascada."
 
-#: index.docbook:2463
+#. Tag: para
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
@@ -4370,33 +5106,38 @@
 "determina si debe ocurrir un incremento de versi&#x00f3;n cuando esta "
 "propiedad est&#x00e1; desactualizada."
 
-#: index.docbook:2478
-msgid "Hibernate Types"
+#. Tag: title
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Tipos de Hibernate"
 
-#: index.docbook:2481
+#. Tag: title
+#: basic_mapping.xml:2508
+#, no-c-format
 msgid "Entities and values"
 msgstr "Entidades y Valores"
 
-#: index.docbook:2483
+#. Tag: para
+#: basic_mapping.xml:2510
+#, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"Para entender el comportamiento de varios objetos a nivel de lenguaje Java "
-"con respecto al servicio de persistencia, necesitamos clasificarlos en dos "
-"grupos:"
 
-#: index.docbook:2488
+#. Tag: para
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "Una <emphasis>entidad</emphasis> existe independientemente de cualquier "
@@ -4410,15 +5151,17 @@
 "habitualmente en grandes sistemas. Las entidades soportan referencias "
 "circulares y compartidas, que tambi&#x00e9; pueden ser versionadas."
 
-#: index.docbook:2499
+#. Tag: para
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4433,19 +5176,21 @@
 "tienen identidad independiente, por los que no pueden ser compartidos por "
 "dos entidades o colleciones."
 
-#: index.docbook:2510
+#. Tag: para
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "Hasta ahora, hemos estado usando el t&#x00e9;rmino \"clase persistente\" "
 "para referirnos a entidades. Continuaremos haci&#x00e9;ndolo. Hablando "
@@ -4463,24 +5208,27 @@
 "composici&#x00f3;n o agregaci&#x00f3;n usualmente se traducen a un tipo de "
 "valor."
 
-#: index.docbook:2524
-msgid "We'll revisit both concepts throughout the documentation."
+#. Tag: para
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr ""
 "Volveremos a visitar ambos conceptos a lo largo de la documentaci&#x00f3;n."
 
-#: index.docbook:2528
+#. Tag: para
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "EL desaf&#x00ed;o es mapear el sistema de tipos de Java (y la "
 "definici&#x00f3;n de entidades y tipos de valor de los desarrolladores) al "
@@ -4495,25 +5243,35 @@
 "tipo, as&#x00ed; como implementar tus estrategias de conversi&#x00f3;n "
 "personalizadas, como veremos luego."
 
-#: index.docbook:2541
-msgid "All built-in Hibernate types except collections support null semantics."
+#. Tag: para
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr ""
 "Todos los tipos prefabricados de Hibernate soportan sem&#x00e1;ntica de "
 "nulos excepto las colecciones."
 
-#: index.docbook:2548
+#. Tag: title
+#: basic_mapping.xml:2575
+#, no-c-format
 msgid "Basic value types"
 msgstr "Tipos de valores b&#x00e1;sicos"
 
-#: index.docbook:2550
+#. Tag: para
+#: basic_mapping.xml:2577
+#, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr ""
 "Los <emphasis>tipos de mapeo b&#x00e1;sicos</emphasis> prefabricados pueden "
 "ser categorizado a grandes rasgos en:"
 
-#: index.docbook:2555
+#. Tag: literal
+#: basic_mapping.xml:2582
+#, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
 "true_false"
@@ -4521,7 +5279,9 @@
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
 "true_false"
 
-#: index.docbook:2558
+#. Tag: para
+#: basic_mapping.xml:2585
+#, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
 "specific) SQL column types. <literal>boolean, yes_no</literal> and "
@@ -4533,11 +5293,15 @@
 "literal> y <literal>true_false</literal> son codificaciones alternativas a "
 "<literal>boolean</literal> de Java o <literal>java.lang.Boolean</literal>."
 
-#: index.docbook:2567
+#. Tag: literal
+#: basic_mapping.xml:2594
+#, no-c-format
 msgid "string"
 msgstr "string"
 
-#: index.docbook:2569
+#. Tag: para
+#: basic_mapping.xml:2596
+#, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
 "literal> (or Oracle <literal>VARCHAR2</literal>)."
@@ -4545,11 +5309,15 @@
 "Un mapeo del tipo <literal>java.lang.String</literal> a <literal>VARCHAR</"
 "literal> (u Oracle <literal>VAARCHAR2</literal>)."
 
-#: index.docbook:2576
+#. Tag: literal
+#: basic_mapping.xml:2603
+#, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
-#: index.docbook:2578
+#. Tag: para
+#: basic_mapping.xml:2605
+#, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
 "SQL types <literal>DATE</literal>, <literal>TIME</literal> and "
@@ -4559,11 +5327,15 @@
 "tipos SQL <literal>DATE</literal>, <literal>TIME</literal> y "
 "<literal>TIMESTAMP</literal> (o equivalente)."
 
-#: index.docbook:2586
+#. Tag: literal
+#: basic_mapping.xml:2613
+#, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
-#: index.docbook:2588
+#. Tag: para
+#: basic_mapping.xml:2615
+#, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
 "<literal>TIMESTAMP</literal> and <literal>DATE</literal> (or equivalent)."
@@ -4572,11 +5344,15 @@
 "tipos SQL <literal>TIMESTAMP</literal> y <literal>DATE</literal> (o "
 "equivalente)."
 
-#: index.docbook:2596
+#. Tag: literal
+#: basic_mapping.xml:2623
+#, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
-#: index.docbook:2598
+#. Tag: para
+#: basic_mapping.xml:2625
+#, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
 "math.BigInteger</literal> to <literal>NUMERIC</literal> (or Oracle "
@@ -4586,11 +5362,15 @@
 "math.BigInteger</literal> a <literal>NUMERIC</literal> (o <literal>NUMBER</"
 "literal> de Oracle)."
 
-#: index.docbook:2606
+#. Tag: literal
+#: basic_mapping.xml:2633
+#, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
-#: index.docbook:2608
+#. Tag: para
+#: basic_mapping.xml:2635
+#, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
 "TimeZone</literal> and <literal>java.util.Currency</literal> to "
@@ -4606,11 +5386,15 @@
 "mapeadas a sus c&#x00f3;digos ISO. Las instancias de <literal>TimeZone</"
 "literal> son mapeadas a sus <literal>ID</literal>."
 
-#: index.docbook:2620
-msgid "<literal>class</literal>"
-msgstr "<literal>class</literal>"
+#. Tag: literal
+#: basic_mapping.xml:2647
+#, fuzzy, no-c-format
+msgid "class"
+msgstr "subclass"
 
-#: index.docbook:2622
+#. Tag: para
+#: basic_mapping.xml:2649
+#, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
 "literal> (or Oracle <literal>VARCHAR2</literal>). A <literal>Class</literal> "
@@ -4620,19 +5404,27 @@
 "literal> (o <literal>VARCHAR2</literal> de Oracle). Una <literal>Class</"
 "literal> es mapeara a su nombre completamente cualificado."
 
-#: index.docbook:2630
+#. Tag: literal
+#: basic_mapping.xml:2657
+#, no-c-format
 msgid "binary"
 msgstr "binary"
 
-#: index.docbook:2632
+#. Tag: para
+#: basic_mapping.xml:2659
+#, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "Mapea arreglos de bytes a un tipo binario SQL apropiado."
 
-#: index.docbook:2638
+#. Tag: literal
+#: basic_mapping.xml:2665
+#, no-c-format
 msgid "text"
 msgstr "text"
 
-#: index.docbook:2640
+#. Tag: para
+#: basic_mapping.xml:2667
+#, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
 "literal> type."
@@ -4640,13 +5432,17 @@
 "Mapea cadenas largas Java al tipo SQL <literal>CLOB</literal> o "
 "<literal>TEXT</literal>."
 
-#: index.docbook:2647
+#. Tag: literal
+#: basic_mapping.xml:2674
+#, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
-#: index.docbook:2649
+#. Tag: para
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4655,16 +5451,20 @@
 "con el nombre de una clase o interface serializable Java que no sea por "
 "defecto un tipo b&#x00e1;sico."
 
-#: index.docbook:2658
+#. Tag: literal
+#: basic_mapping.xml:2685
+#, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
-#: index.docbook:2660
+#. Tag: para
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "Mapeos de tipo para las clases JDBC <literal>java.sql.Clob</literal> y "
 "<literal>java.sql.Blob</literal>. Estos tipos pueden ser inconvenientes para "
@@ -4672,7 +5472,9 @@
 "de una transacci&#x00f3;n (Adem&#x00e1;s, el soporte del driver suele ser "
 "malo e inconsistente)."
 
-#: index.docbook:2670
+#. Tag: literal
+#: basic_mapping.xml:2697
+#, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
 "imm_serializable, imm_binary"
@@ -4680,15 +5482,17 @@
 "UNTRANSLATED! imm_date, imm_time, imm_timestamp, imm_calendar, "
 "imm_calendar_date, imm_serializable, imm_binary"
 
-#: index.docbook:2674
+#. Tag: para
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "Type mappings for what are usually considered mutable Java types, where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
@@ -4698,18 +5502,23 @@
 "have that change made persistent, the application must assign a new "
 "(nonidentical) object to the property."
 
-#: index.docbook:2689
+#. Tag: para
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "Los identificadores &#x00fa;nicos de entidades y collecciones pueden ser de "
 "cualquier tipo b&#x00e1;sico excepto <literal>binary</literal>, "
 "<literal>blob</literal> y <literal>clob</literal>. (Los identificadores "
 "compuestos est&#x00e1;n tambi&#x00e9;n permitidos, ver debajo.)"
 
-#: index.docbook:2695
+#. Tag: para
+#: basic_mapping.xml:2722
+#, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
 "defined on <literal>org.hibernate.Hibernate</literal>. For example, "
@@ -4721,17 +5530,21 @@
 "literal>. Por ejemplo, <literal>Hibernate.STRING</literal> representa el "
 "tipo <literal>string</literal>."
 
-#: index.docbook:2704
+#. Tag: title
+#: basic_mapping.xml:2731
+#, no-c-format
 msgid "Custom value types"
 msgstr "Tipos de valor personalizados"
 
-#: index.docbook:2706
+#. Tag: para
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -4748,13 +5561,15 @@
 "literal> que fuera persistida a las columnas <literal>FIRST_NAME</literal>, "
 "<literal>INITIAL</literal>, <literal>SURNAME</literal>."
 
-#: index.docbook:2717
+#. Tag: para
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "Para implementar un tipo personalizado, implementa bien <literal>org."
 "hibernate.UserType</literal> o <literal>org.hibernate.CompositeUserType</"
@@ -4762,7 +5577,9 @@
 "cualificado del tipo. Revisa <literal>org.hibernate.test.DoubleStringType</"
 "literal> para ver qu&#x00e9; tipo de cosas son posibles."
 
-#: index.docbook:2725
+#. Tag: programlisting
+#: basic_mapping.xml:2752
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
 "DoubleStringType\">\n"
@@ -4776,7 +5593,9 @@
 "    <column name=\"second_string\"/>\n"
 "</property>]]>"
 
-#: index.docbook:2727
+#. Tag: para
+#: basic_mapping.xml:2754
+#, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
 "to multiple columns."
@@ -4784,7 +5603,9 @@
 "Observa el uso de etiquetas <literal>&lt;column&gt;</literal> para mapear "
 "una propiedad a m&#x00fa;ltiples columnas."
 
-#: index.docbook:2732
+#. Tag: para
+#: basic_mapping.xml:2759
+#, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
 "literal>, <literal>UserCollectionType</literal>, and "
@@ -4796,9 +5617,11 @@
 "y <literal>UserVersionType</literal> proveen soporte a usos m&#x00e1;s "
 "especializados."
 
-#: index.docbook:2738
+#. Tag: para
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -4810,7 +5633,9 @@
 "literal>. Para proveer de par&#x00e1;metros a tu tipo personalizado, puedes "
 "usar el elemento <literal>&lt;type&gt;</literal> en tus ficheros de mapeo."
 
-#: index.docbook:2746
+#. Tag: programlisting
+#: basic_mapping.xml:2773
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
 "    <type name=\"com.mycompany.usertypes.DefaultValueIntegerType\">\n"
@@ -4824,7 +5649,9 @@
 "    </type>\n"
 "</property>]]>"
 
-#: index.docbook:2748
+#. Tag: para
+#: basic_mapping.xml:2775
+#, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
 "named <literal>default</literal> from the <literal>Properties</literal> "
@@ -4834,13 +5661,15 @@
 "metro llamado <literal>default</literal> del objeto <literal>Properties</"
 "literal> que se le pasa."
 
-#: index.docbook:2753
+#. Tag: para
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "Si usas cierto <literal>UserType</literal> muy frecuentemente, puede ser "
 "&#x00fa;til definir un nombre corto para &#x00e9;. Puedes hacer esto usando "
@@ -4848,7 +5677,9 @@
 "nombre a un tipo personalizado, y pueden tambi&#x00e9;n contener una lista "
 "de valores por defecto de par&#x00e1;metros si el tipo fuese parametrizado."
 
-#: index.docbook:2760
+#. Tag: programlisting
+#: basic_mapping.xml:2787
+#, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
 "name=\"default_zero\">\n"
@@ -4860,11 +5691,15 @@
 "    <param name=\"default\">0</param>\n"
 "</typedef>]]>"
 
-#: index.docbook:2762
+#. Tag: programlisting
+#: basic_mapping.xml:2789
+#, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 
-#: index.docbook:2764
+#. Tag: para
+#: basic_mapping.xml:2791
+#, no-c-format
 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."
@@ -4873,17 +5708,18 @@
 "typedef sobre una base caso por caso usando par&#x00e1;metros de tipo en el "
 "mapeo de la propiedad."
 
-#: index.docbook:2769
+#. Tag: para
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "Aunque el rico espectro de tipos prefabricados y soporte de componentes de "
 "Hibernate significa que raramente <emphasis>necesites</emphasis> usar un "
@@ -4896,16 +5732,20 @@
 "estar&#x00e1; impermeabilizados contra posibles cambios futuros en la forma "
 "de representar valores monetarios."
 
-#: index.docbook:2785
+#. Tag: title
+#: basic_mapping.xml:2812
+#, no-c-format
 msgid "Mapping a class more than once"
 msgstr "Mapeando una clase m&#x00e1;s de una vez"
 
-#: index.docbook:2786
+#. Tag: para
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -4917,7 +5757,9 @@
 "con objetos persistentes, al escribir consultas, o al mapear asociaciones a "
 "la entidad mencionada."
 
-#: index.docbook:2794
+#. Tag: programlisting
+#: basic_mapping.xml:2821
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
 "        entity-name=\"CurrentContract\">\n"
@@ -4955,25 +5797,31 @@
 "            entity-name=\"CurrentContract\"/>\n"
 "</class>]]>"
 
-#: index.docbook:2796
+#. Tag: para
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "Observa c&#x00f3;mo las asociaciones ahora se especifican usando "
 "<literal>entity-name</literal> en vez de <literal>class</literal>."
 
-#: index.docbook:2804
+#. Tag: title
+#: basic_mapping.xml:2831
+#, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "identificadores SQL encomillados"
 
-#: index.docbook:2805
+#. Tag: para
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "Puedes forzar a Hibernate a encomillar un identificador en el SQL generado "
 "encerrando el nombre de tabla o columna entre backticks en el documento de "
@@ -4981,7 +5829,9 @@
 "<literal>Dialect</literal> SQL (usualmente comillas dobles, excepto "
 "corchetes para SQL Server y backsticks para MySQL)."
 
-#: index.docbook:2812
+#. Tag: programlisting
+#: basic_mapping.xml:2839
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
 "    <id name=\"id\" column=\"`Item Id`\"/><generator class=\"assigned\"/></"
@@ -4997,29 +5847,37 @@
 "    ...\n"
 "</class>]]>"
 
-#: index.docbook:2818
+#. Tag: title
+#: basic_mapping.xml:2845
+#, no-c-format
 msgid "Metadata alternatives"
 msgstr "Alternativas de metadatos"
 
-#: index.docbook:2820
+#. Tag: para
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XML no es para todos, as&#x00e1; que hay algunas formas alternativas de "
 "definir metadatos de mapeo O/R en Hibernate."
 
-#: index.docbook:2825
+#. Tag: title
+#: basic_mapping.xml:2852
+#, no-c-format
 msgid "Using XDoclet markup"
 msgstr "Usando marcado de XDoclet"
 
-#: index.docbook:2827
+#. Tag: para
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "Muchos usuarios de Hibernate prefieren embeber la informaci&#x00f3;n de "
 "mapeo directamente en el c&#x00f3;digo fuente usando las <literal>@hibernate."
@@ -5028,7 +5886,9 @@
 "inclu&#x00ed;mos el siguiente ejemplo de la clase <literal>Cat</literal> con "
 "mapeos XDoclet."
 
-#: index.docbook:2834
+#. Tag: programlisting
+#: basic_mapping.xml:2861
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "import java.util.Set;\n"
@@ -5240,27 +6100,33 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:2836
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#. Tag: para
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr ""
 "Para m&#x00e1;s ejemplos de XDoclet e Hibernate ver en el sitio web de "
 "Hibernate."
 
-#: index.docbook:2843
+#. Tag: title
+#: basic_mapping.xml:2870
+#, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "Usando anotaciones JDK 5.0"
 
-#: index.docbook:2845
+#. Tag: para
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "El JDK 5.0 introdujo anotaciones del estilo XDoclet a nivel del lenguaje, "
@@ -5276,12 +6142,16 @@
 "como una descarga por separado. Tanto metadatos de EJB3 (JSR-220) como de "
 "Hibernate3 est&#x00e1;n soportados."
 
-#: index.docbook:2856
+#. Tag: para
+#: basic_mapping.xml:2883
+#, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr ""
 "Este es un ejemplo de una clase POJO anotada como un bean de entidad EJB:"
 
-#: index.docbook:2860
+#. Tag: programlisting
+#: basic_mapping.xml:2887
+#, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
 "public class Customer implements Serializable {\n"
@@ -5330,30 +6200,35 @@
 "    // Getter/setter and business methods\n"
 "}]]>"
 
-#: index.docbook:2862
+#. Tag: para
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "Ten en cuenta que el soporte a anotaciones JDK 5.0 (y JSR-220) es "
 "todav&#x00ed;a un trabajo en progreso y no completado. Por favor, para "
 "m&#x00e1;s detalles refi&#x00e9;rete al modulo de Anotaciones de Hibernate."
 
-#: index.docbook:2871
-msgid "Generated Properties"
+#. Tag: title
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "UNTRANSLATED! Generated Properties"
 
-#: index.docbook:2872
+#. Tag: para
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "Generated properties are properties which have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
@@ -5364,12 +6239,14 @@
 "generated properties, it immediately issues a select afterwards to retrieve "
 "the generated values."
 
-#: index.docbook:2881
+#. Tag: para
+#: basic_mapping.xml:2911
+#, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "Properties marked as generated must additionally be non-insertable and non-"
@@ -5378,22 +6255,26 @@
 "and <link linkend=\"mapping-declaration-property\">simple properties</link> "
 "can be marked as generated."
 
-#: index.docbook:2888
+#. Tag: para
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr ""
 "<literal>never</literal> (the default) - means that the given property value "
 "is not generated within the database."
 
-#: index.docbook:2892
+#. Tag: para
+#: basic_mapping.xml:2922
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - states that the given property value is "
 "generated on insert, but is not regenerated on subsequent updates. Things "
@@ -5402,27 +6283,34 @@
 "linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
 "marked as generated, this option is not available there..."
 
-#: index.docbook:2900
+#. Tag: para
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr ""
 "<literal>always</literal> - states that the property value is generated both "
 "on insert and on update."
 
-#: index.docbook:2907
-msgid "Auxiliary Database Objects"
+#. Tag: title
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "UNTRANSLATED! Auxiliary Database Objects"
 
-#: index.docbook:2908
+#. Tag: para
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Allows CREATE and DROP of arbitrary database objects, in conjunction with "
 "Hibernate's schema evolution tools, to provide the ability to fully define a "
@@ -5432,15 +6320,19 @@
 "Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
 "There are essentially two modes for defining auxiliary database objects..."
 
-#: index.docbook:2917
+#. Tag: para
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr ""
 "The first mode is to explicitly list the CREATE and DROP commands out in the "
 "mapping file:"
 
-#: index.docbook:2921
+#. Tag: programlisting
+#: basic_mapping.xml:2951
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
@@ -5459,17 +6351,21 @@
 "                            </database-object>\n"
 "                    </hibernate-mapping>]]>"
 
-#: index.docbook:2922
+#. Tag: para
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "The second mode is to supply a custom class which knows how to construct the "
 "CREATE and DROP commands. This custom class must implement the <literal>org."
 "hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
 
-#: index.docbook:2927
+#. Tag: programlisting
+#: basic_mapping.xml:2957
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
@@ -5486,22 +6382,26 @@
 "                            </database-object>\n"
 "                    </hibernate-mapping>]]>"
 
-#: index.docbook:2928
+#. Tag: para
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr ""
 "Additionally, these database objects can be optionally scoped such that they "
 "only apply when certain dialects are used."
 
-#: index.docbook:2932
+#. Tag: programlisting
+#: basic_mapping.xml:2962
+#, fuzzy, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
@@ -5517,8 +6417,49 @@
 "                            </database-object>\n"
 "                    </hibernate-mapping>]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "<title>class</title>"
+#~ msgstr "<title>class</title>"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr ""
+#~ "<literal>type</literal> (opcional): Un nombre que indica el tipo "
+#~ "Hibernate."
+
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade</literal> (opcional): Especifica qu&#x00e9; operaciones "
+#~ "deben ir en cascada desde el objeto padre al objeto asociado"
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (opcional - por defecto a "
+#~ "<literal>true</literal>): Especifica que las actualizaciones a esta "
+#~ "propiedad requieran o no la obtenci&#x00f3;n del bloqueo optimista. En "
+#~ "otras palabras, determina si debe darse un incremento de versi&#x00f3;n "
+#~ "cuando esta propiedad est&#x00e9; desactualizada."
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "Para entender el comportamiento de varios objetos a nivel de lenguaje "
+#~ "Java con respecto al servicio de persistencia, necesitamos clasificarlos "
+#~ "en dos grupos:"
+
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>class</literal>"
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,23 +1,31 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: batch.xml:29
+#, no-c-format
 msgid "Batch processing"
 msgstr "Procesamiento por lotes"
 
-#: index.docbook:7
+#. Tag: para
+#: batch.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "Un enfoque ingenuo para insertar 100.000 filas en la base de datos usando "
 "Hibernate podría verse así:"
 
-#: index.docbook:12
+#. Tag: programlisting
+#: batch.xml:36
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -37,24 +45,28 @@
 "tx.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:14
+#. Tag: para
+#: batch.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "Esto podría caer sobre una <literal>OutOfMemoryException</literal> en algún "
 "sitio cerca de la fila 50.000. Esto es porque Hibernate tiene en caché todas "
 "las instancias de <literal>Customer</literal> recién instanciadas en el "
 "caché de nivel de sesión."
 
-#: index.docbook:20
+#. Tag: para
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "En este capítulo te mostraremos cómo evitar este problema. Primero, sin "
 "embargo, si estás haciendo procesamiento por lotes (batch processing), es "
@@ -62,31 +74,41 @@
 "lograr un rendimiento razonable. Establece el tamaño de lote JDBC a un "
 "número razonable (digamos 10-50):"
 
-#: index.docbook:27
+#. Tag: programlisting
+#: batch.xml:52
+#, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 
-#: index.docbook:29
+#. Tag: para
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "UNTRANSLATED! Note that Hibernate disables insert batching at the JDBC level "
 "transparently if you use an <literal>identiy</literal> identifier generator."
 
-#: index.docbook:34
+#. Tag: para
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr ""
 "Podrías además querer hacer este tipo de trabajo en un proceso donde la "
 "interacción con el caché de segundo nivel esté completamente deshabilitado:"
 
-#: index.docbook:39
+#. Tag: programlisting
+#: batch.xml:64
+#, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 
-#: index.docbook:41
+#. Tag: para
+#: batch.xml:66
+#, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
 "<literal>CacheMode</literal> to disable interaction with the second-level "
@@ -96,21 +118,27 @@
 "explicitly set the <literal>CacheMode</literal> to disable interaction with "
 "the second-level cache."
 
-#: index.docbook:47
+#. Tag: title
+#: batch.xml:72
+#, no-c-format
 msgid "Batch inserts"
 msgstr "Inserciones en lote"
 
-#: index.docbook:49
+#. Tag: para
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "Al hacer persistentes objetos nuevos, debes limpiar con <literal>flush()</"
 "literal> y llamar a <literal>clear()</literal> en la sesión regularmente, "
 "para controlar el tamaño del caché de primer nivel."
 
-#: index.docbook:55
+#. Tag: programlisting
+#: batch.xml:80
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -144,22 +172,28 @@
 "tx.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:60
+#. Tag: title
+#: batch.xml:85
+#, no-c-format
 msgid "Batch updates"
 msgstr "Actualizaciones en lote"
 
-#: index.docbook:62
+#. Tag: para
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "Para recuperar y actualizar datos se aplican las mismas ideas. "
 "Adicionalmente, necesitas usar <literal>scroll()</literal> para sacar "
 "ventaja de los cursores del lado del servidor en consultas que devuelvan "
 "muchas filas de datos."
 
-#: index.docbook:68
+#. Tag: programlisting
+#: batch.xml:93
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -201,25 +235,29 @@
 "tx.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:73
+#. Tag: title
+#: batch.xml:98
+#, no-c-format
 msgid "The StatelessSession interface"
 msgstr "UNTRANSLATED! The StatelessSession interface"
 
-#: index.docbook:74
+#. Tag: para
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "Alternatively, Hibernate provides a command-oriented API that may be used "
 "for streaming data to and from the database in the form of detached objects. "
@@ -235,7 +273,9 @@
 "level cache. A stateless session is a lower-level abstraction, much closer "
 "to the underlying JDBC."
 
-#: index.docbook:89
+#. Tag: programlisting
+#: batch.xml:114
+#, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -272,26 +312,29 @@
 "                                                      tx.commit();\n"
 "                                                      session.close();]]>"
 
-#: index.docbook:91
+#. Tag: para
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr ""
 "Note that in this code example, the <literal>Customer</literal> instances "
 "returned by the query are immediately detached. They are never associated "
 "with any persistence context."
 
-#: index.docbook:97
+#. Tag: para
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
@@ -302,21 +345,25 @@
 "<literal>delete()</literal> operations defined by the <literal>Session</"
 "literal> interface."
 
-#: index.docbook:110
+#. Tag: title
+#: batch.xml:135
+#, no-c-format
 msgid "DML-style operations"
 msgstr "update/delete en masa"
 
-#: index.docbook:112
+#. Tag: para
+#: batch.xml:137
+#, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr ""
 "Como ya se ha discutido, el mapeo objeto/relacional automático y "
 "transparente se refiere al manejo de estado de objetos. Esto implica que el "
@@ -328,59 +375,79 @@
 "realizan a través del Lenguaje de Consulta de Hibernate (Hibernate Query "
 "Language o <xref linkend=\"queryhql\"/>HQL)."
 
-#: index.docbook:122
+#. Tag: para
+#: batch.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "La pseudo-sintáxis para sentencias <literal>UPDATE</literal> y "
 "<literal>DELETE</literal> es: <literal>( UPDATE | DELETE ) FROM? ClassName "
 "(WHERE WHERE_CONDITIONS)?</literal>. Algunos puntos a tener en cuenta:"
 
-#: index.docbook:130
+#. Tag: para
+#: batch.xml:151
+#, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "En la cláusula-from, la palabra clave FROM es opcional"
 
-#: index.docbook:135
+#. Tag: para
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr ""
 "There can only be a single entity named in the from-clause; it can "
 "optionally be aliased. If the entity name is aliased, then any property "
 "references must be qualified using that alias; if the entity name is not "
 "aliased, then it is illegal for any property references to be qualified."
 
-#: index.docbook:143
+#. Tag: para
+#: batch.xml:170
+#, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
 "explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
 "the where-clause; the subqueries, themselves, may contain joins."
 
-#: index.docbook:150
+#. Tag: para
+#: batch.xml:177
+#, no-c-format
 msgid "The where-clause is also optional."
 msgstr "La cláusula-where es también opcional."
 
-#: index.docbook:156
+#. Tag: para
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "Como un ejemplo, para ejecutar un <literal>UPDATE</literal> HQL, usa el "
 "método <literal>Query.executeUpdate()</literal>(the method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
 "literal>):"
 
-#: index.docbook:162
+#. Tag: programlisting
+#: batch.xml:189
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -412,15 +479,17 @@
 "                                         tx.commit();\n"
 "                                         session.close();]]>"
 
-#: index.docbook:164
+#. Tag: para
+#: batch.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -434,7 +503,9 @@
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 
-#: index.docbook:174
+#. Tag: programlisting
+#: batch.xml:201
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -460,17 +531,21 @@
 "                                         tx.commit();\n"
 "                                         session.close();]]>"
 
-#: index.docbook:176
+#. Tag: para
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "Note that custom version types (<literal>org.hibernate.usertype."
 "UserVersionType</literal>) are not allowed in conjunction with a "
 "<literal>update versioned</literal> statement."
 
-#: index.docbook:181
+#. Tag: para
+#: batch.xml:208
+#, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
 "executeUpdate()</literal> method:"
@@ -478,7 +553,9 @@
 "Para ejecutar un <literal>DELETE</literal> HQL, usa el mismo método "
 "<literal>Query.executeUpdate()</literal>:"
 
-#: index.docbook:186
+#. Tag: programlisting
+#: batch.xml:213
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -501,18 +578,20 @@
 "        tx.commit();\n"
 "        session.close();]]>"
 
-#: index.docbook:188
+#. Tag: para
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "El valor <literal>int</literal> devuelto por el método <literal>Query."
 "executeUpdate()</literal> indica el número de entidades afectadas por la "
@@ -526,7 +605,9 @@
 "tabla \"raíz\" y potencialmente tablas de joined-subclass más debajo en la "
 "jerarquía de herencia."
 
-#: index.docbook:199
+#. Tag: para
+#: batch.xml:226
+#, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
 "<literal>INSERT INTO EntityName properties_list select_statement</literal>. "
@@ -536,68 +617,84 @@
 "operaciones HQL masivas, que serán atendidas en lanzamientos futuros; "
 "consulta la hoja de ruta de JIRA para más detalles."
 
-#: index.docbook:207
+#. Tag: para
+#: batch.xml:234
+#, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
 "INTO ... VALUES ... form."
 msgstr ""
 
-#: index.docbook:210
+#. Tag: para
+#: batch.xml:237
+#, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 
-#: index.docbook:220
+#. Tag: para
+#: batch.xml:247
+#, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
 "distinction or might be able to handle the conversion."
 msgstr ""
 
-#: index.docbook:232
+#. Tag: para
+#: batch.xml:259
+#, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 
-#: index.docbook:247
+#. Tag: para
+#: batch.xml:274
+#, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 
-#: index.docbook:257
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+#. Tag: para
+#: batch.xml:284
+#, no-c-format
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr ""
 
-#: index.docbook:261
+#. Tag: programlisting
+#: batch.xml:288
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
 "Transaction tx = session.beginTransaction();\n"
@@ -610,8 +707,8 @@
 "session.close();]]>"
 msgstr ""
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,23 +1,31 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: best_practices.xml:29
+#, no-c-format
 msgid "Best Practices"
 msgstr "Mejores Pr&#x00e1;cticas"
 
-#: index.docbook:9
+#. Tag: term
+#: best_practices.xml:33
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "Escribe clase finamente granularizadas y mapealas usando <literal>&lt;"
 "component&gt;</literal>."
 
-#: index.docbook:11
+#. Tag: para
+#: best_practices.xml:35
+#, no-c-format
 msgid ""
 "Use an <literal>Address</literal> class to encapsulate <literal>street</"
 "literal>, <literal>suburb</literal>, <literal>state</literal>, "
@@ -29,26 +37,34 @@
 "literal>, <literal>c&#x00f3;digo postal</literal>. Esto alienta la "
 "reutilizaci&#x00f3;n de c&#x00f3;digo y simplifica el refactoring."
 
-#: index.docbook:19
-msgid "Declare identifier properties on persistent classes."
+#. Tag: term
+#: best_practices.xml:43
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "Declara las propiedades identificadoras en clases persistentes."
 
-#: index.docbook:21
+#. Tag: para
+#: best_practices.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "Hibernate hace opcionales las propiedades identificadoras. Existen todo tipo "
 "de razones por las que debes usarlas. Recomendamos que los identificadores "
 "sean 'sint&#x00e9;ticos' (generados, sin ning&#x00fa;n significado de "
 "negocio)."
 
-#: index.docbook:29
-msgid "Identify natural keys."
+#. Tag: term
+#: best_practices.xml:53
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "Identifica las claves naturales."
 
-#: index.docbook:31
+#. Tag: para
+#: best_practices.xml:55
+#, no-c-format
 msgid ""
 "Identify natural keys for all entities, and map them using <literal>&lt;"
 "natural-id&gt;</literal>. Implement <literal>equals()</literal> and "
@@ -60,67 +76,87 @@
 "literal> y <literal>hashCode()</literal> para comparar las propiedades que "
 "componen la clave natural."
 
-#: index.docbook:39
-msgid "Place each class mapping in its own file."
+#. Tag: term
+#: best_practices.xml:63
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "Coloca cada mapeo de clase en su propio fichero."
 
-#: index.docbook:41
+#. Tag: para
+#: best_practices.xml:65
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "No uses un solo documento monol&#x00ed;tico de mapeo. Mapea <literal>com.eg."
 "Foo</literal> en el fichero <literal>com/eg/Foo.hbm.xml</literal>. Esto "
 "tiene sentido particularmente en un ambiente de equipo."
 
-#: index.docbook:49
-msgid "Load mappings as resources."
+#. Tag: term
+#: best_practices.xml:73
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "Carga los mapeos como recursos."
 
-#: index.docbook:51
+#. Tag: para
+#: best_practices.xml:75
+#, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr "Despliega los mapeos junto a las clases que mapean."
 
-#: index.docbook:57
-msgid "Consider externalising query strings."
+#. Tag: term
+#: best_practices.xml:81
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "Considera externalizar las cadenas de consulta."
 
-#: index.docbook:59
+#. Tag: para
+#: best_practices.xml:83
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "Esta es una buena pr&#x00e1;ctica si tus consultas llaman a funciones SQL "
 "que no son del est&#x00e1;ndar ANSI. Externalizar las cadenas de consulta a "
 "ficheros de mapeo har&#x00e1; la aplicaci&#x00f3;n m&#x00e1;s portable."
 
-#: index.docbook:67
+#. Tag: term
+#: best_practices.xml:91
+#, no-c-format
 msgid "Use bind variables."
 msgstr "Usa variables de ligado."
 
-#: index.docbook:69
+#. Tag: para
+#: best_practices.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "Igual que en JDBC, siempre remplaza valores no constantes con \"?\". &#x00a1;"
 "Nunca uses manipulaci&#x00f3;n de cadenas para ligar un valor no constante "
 "en una consulta! Incluso mejor, considera usar par&#x00e1;metros con nombre "
 "en las consultas."
 
-#: index.docbook:77
-msgid "Don't manage your own JDBC connections."
+#. Tag: term
+#: best_practices.xml:101
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "No manejes tus propias conexiones JDBC."
 
-#: index.docbook:79
+#. Tag: para
+#: best_practices.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "Hibernate deja a la aplicaci&#x00f3;n administre las conexiones JDBC. Este "
 "enfoque debe considerarse como &#x00fa;ltimo recurso. Si no puedes usar los "
@@ -128,17 +164,21 @@
 "implementaci&#x00f3;n de <literal>org.hibernate.connection."
 "ConnectionProvider</literal>."
 
-#: index.docbook:87
-msgid "Consider using a custom type."
+#. Tag: term
+#: best_practices.xml:111
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "Considera usar un tipo personalizado."
 
-#: index.docbook:89
+#. Tag: para
+#: best_practices.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "Sup&#x00f3;n que tienes un tipo Java, digamos de alguna biblioteca, que "
 "necesita hacerse persistente pero no provee los m&#x00e9;todos de acceso "
@@ -147,19 +187,23 @@
 "digo de aplicaci&#x00f3;n de implementar transformaciones a / desde un tipo "
 "Hibernate."
 
-#: index.docbook:98
-msgid "Use hand-coded JDBC in bottlenecks."
+#. Tag: term
+#: best_practices.xml:122
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "Usa JDBC codificado a mano en cuellos de botella."
 
-#: index.docbook:100
+#. Tag: para
+#: best_practices.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "En &#x00e1;reas del sistema de rendimiento cr&#x00ed;tico, algunos tipos de "
 "operaciones podr&#x00ed;an beneficiarse del JDBC directo. Pero por favor, "
@@ -170,16 +214,20 @@
 "JDBC. De esta forma puedes usar a&#x00fa;n la misma estrategia de "
 "transacci&#x00f3;n y el mismo proveedor de conexiones subyacente."
 
-#: index.docbook:110
-msgid "Understand <literal>Session</literal> flushing."
+#. Tag: term
+#: best_practices.xml:134
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "Comprende la limpieza (flushing) de <literal>Session</literal>."
 
-#: index.docbook:112
+#. Tag: para
+#: best_practices.xml:136
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "De vez en cuando la sesi&#x00f3;n sincroniza su estado persistente con la "
@@ -188,18 +236,22 @@
 "deshabilitando la limpieza autom&#x00e1;tica o incluso cambiando el orden de "
 "las consultas u otras operaciones en una transacci&#x00f3;n en particular."
 
-#: index.docbook:121
-msgid "In a three tiered architecture, consider using detached objects."
+#. Tag: term
+#: best_practices.xml:145
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr ""
 "En una aplicaci&#x00f3;n en tres gradas, considera usar objetos separados."
 
-#: index.docbook:123
+#. Tag: para
+#: best_practices.xml:147
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "Al usar una arquitectura de servlet / sesi&#x00f3;n, puedes pasar objetos "
 "persistentes en el bean de sesi&#x00f3;n hacia y desde la capa de servlet / "
@@ -207,25 +259,29 @@
 "petici&#x00f3;n. Usa <literal>Session.merge()</literal> o <literal>Session."
 "saveOrUpdate()</literal> para sincronizar los objetos con la base de datos."
 
-#: index.docbook:132
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#. Tag: term
+#: best_practices.xml:156
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr ""
 "En una arquitectura en dos gradas, considera usar contexto de persistencia "
 "largos."
 
-#: index.docbook:134
+#. Tag: para
+#: best_practices.xml:158
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "Las transacciones de base de datos tienen que ser tan cortas como sea "
@@ -244,17 +300,21 @@
 "transacci&#x00f3;n de aplicaci&#x00f3;n, o estar&#x00e1;s trabajando con "
 "datos añejos."
 
-#: index.docbook:148
-msgid "Don't treat exceptions as recoverable."
+#. Tag: term
+#: best_practices.xml:172
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "No trates la excepciones como recuperables."
 
-#: index.docbook:150
+#. Tag: para
+#: best_practices.xml:174
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -267,19 +327,23 @@
 "identificador dado existe en la base de datos. En cambio, usa "
 "<literal>Session.get()</literal> o una consulta."
 
-#: index.docbook:160
-msgid "Prefer lazy fetching for associations."
+#. Tag: term
+#: best_practices.xml:184
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "Prefiere la recuperaci&#x00f3;n perezosa para las asociaciones."
 
-#: index.docbook:162
+#. Tag: para
+#: best_practices.xml:186
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "Usa escasamente la recuperaci&#x00f3;n temprana. Usa proxies y colecciones "
 "perezosas para la mayor&#x00ed;a de asociaciones a clases probablemente no "
@@ -291,16 +355,20 @@
 "para un caso de uso en particular, usa una consulta con un <literal>left "
 "join fetch</literal>."
 
-#: index.docbook:172
+#. Tag: term
+#: best_practices.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "Usa el patr&#x00f3;n <emphasis>sesi&#x00f3;n abierta en vista</emphasis>, o "
 "una <emphasis>fase de ensamblado</emphasis> disciplinada para evitar "
 "problemas con datos no recuperados."
 
-#: index.docbook:177
+#. Tag: para
+#: best_practices.xml:201
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -308,12 +376,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernate liberal al desarrollador de escribir <emphasis>Objetos de "
 "Transferencia de Datos (Data Transfer Objects)</emphasis> (DTO). En una "
@@ -331,18 +399,22 @@
 "de la vista. &#x00a1;Esta no es una limitaci&#x00f3;n de Hibernate! Es un "
 "requerimiento fundamental de acceso seguro a datos transaccionales."
 
-#: index.docbook:191
-msgid "Consider abstracting your business logic from Hibernate."
+#. Tag: term
+#: best_practices.xml:215
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "Considera abstraer tu l&#x00f3;gica de negocio de Hibernate"
 
-#: index.docbook:193
+#. Tag: para
+#: best_practices.xml:217
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "Oculta el c&#x00f3;digo de acceso a datos (Hibernate) detr&#x00e1;s de una "
 "interface. Combina los patrones <emphasis>DAO</emphasis> y "
@@ -352,18 +424,22 @@
 "est&#x00e1; pensado para aplicaciones \"suficientemente grandes\"; &#x00a1;"
 "no es apropiado para una aplicaci&#x00f3;n con cinco tablas!)"
 
-#: index.docbook:203
-msgid "Don't use exotic association mappings."
+#. Tag: term
+#: best_practices.xml:227
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "No uses mapeos de asociaci&#x00f3;n ex&#x00f3;ticos."
 
-#: index.docbook:205
+#. Tag: para
+#: best_practices.xml:229
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "Son raros los casos de uso de asociaciones reales muchos-a-muchos. La mayor "
 "parte del tiempo necesitas informaci&#x00f3;n adicional almacenada en una "
@@ -373,11 +449,15 @@
 "cuidadoso al usr cualquier otro estilo de asociaci&#x00f3;n y preguntarte si "
 "es realmente necesario."
 
-#: index.docbook:215
-msgid "Prefer bidirectional associations."
+#. Tag: term
+#: best_practices.xml:239
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "Prefiere las asociaciones bidireccionales."
 
-#: index.docbook:217
+#. Tag: para
+#: best_practices.xml:241
+#, no-c-format
 msgid ""
 "Unidirectional associations are more difficult to query. In a large "
 "application, almost all associations must be navigable in both directions in "
@@ -387,8 +467,8 @@
 "consultar. En una aplicaci&#x00f3;n grande, casi todas las asociaciones "
 "deben ser navegables en ambas direcciones en consultas."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,27 +1,37 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
-msgid "Collection Mapping"
-msgstr "Mapeo de Colecciones"
+#. Tag: title
+#: collection_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Collection mapping"
+msgstr "Mapeos de colecci&#x00f3;n"
 
-#: index.docbook:8
+#. Tag: title
+#: collection_mapping.xml:32
+#, no-c-format
 msgid "Persistent collections"
 msgstr "Colecciones persistentes"
 
-#: index.docbook:10
+#. Tag: para
+#: collection_mapping.xml:34
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "Hibernate requiere que los campos valuados en colecci&#x00f3;n persistentes "
 "sean declarados como un tipo de interface, por ejemplo:"
 
-#: index.docbook:15
+#. Tag: programlisting
+#: collection_mapping.xml:39
+#, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
 "    private String serialNumber;\n"
@@ -43,14 +53,16 @@
 "    void setSerialNumber(String sn) { serialNumber = sn; }\n"
 "}]]>"
 
-#: index.docbook:17
+#. Tag: para
+#: collection_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "La interface real podr&#x00ed;a ser <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
@@ -60,15 +72,17 @@
 "implementaci&#x00f3;n de <literal>org.hibernate.usertype.UserCollectionType</"
 "literal>.)"
 
-#: index.docbook:26
+#. Tag: para
+#: collection_mapping.xml:50
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "Nota c&#x00f3;mo hemos inicializado la variable de instancia de "
 "<literal>HashSet</literal>. Esta es la mejor forma de inicializar "
@@ -79,7 +93,9 @@
 "implementaci&#x00f3;n de <literal>Set</literal> propia de Hibernate. Observa "
 "errores como este:"
 
-#: index.docbook:36
+#. Tag: programlisting
+#: collection_mapping.xml:60
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
 "Cat kitten = new DomesticCat();\n"
@@ -101,27 +117,31 @@
 "kittens = cat.getKittens(); // Okay, kittens collection is a Set\n"
 "(HashSet) cat.getKittens(); // Error!]]>"
 
-#: index.docbook:38
+#. Tag: para
+#: collection_mapping.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "Las colecciones persistentes inyectadas por Hibernate se comportan como "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> o <literal>ArrayList</literal>, "
 "dependiendo del tipo de interface."
 
-#: index.docbook:45
+#. Tag: para
+#: collection_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "Las instancias de colecciones tienen el comportamiento usual de tipos de "
@@ -134,33 +154,56 @@
 "no soportan la sem&#x00e1;ntica de valor nulo. Hibernate no distingue entre "
 "una referencia de colecci&#x00f3;n nula y una colecci&#x00f3;n vac&#x00ed;a."
 
-#: index.docbook:56
+#. Tag: para
+#: collection_mapping.xml:80
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "No debes tener que preocuparte demasiado por esto. Usa las colecciones "
 "persistentes de la misma forma en que usas colecciones de Java ordinarias. "
 "S&#x00f3;lo aseg&#x00fa;rate que entiendes la sem&#x00e1;ntica de las "
 "asociaciones bidireccionales (discutida luego)."
 
-#: index.docbook:65
+#. Tag: title
+#: collection_mapping.xml:89
+#, no-c-format
 msgid "Collection mappings"
 msgstr "Mapeos de colecci&#x00f3;n"
 
-#: index.docbook:67
+#. Tag: para
+#: collection_mapping.xml:92
+#, fuzzy, no-c-format
 msgid ""
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
+msgstr ""
+"Hay absolutamente un rango de mapeos que pueden ser generados para "
+"colecciones, cubriendo muchos modelos relacionales comunes. Te sugerimos que "
+"experimentes con la herramienta de generaci&#x00f3;n de esquemas para "
+"obtener una idea de c&#x00f3;mo varias declaraciones de mapeo se traducen a "
+"tablas de base de datos."
+
+#. Tag: para
+#: collection_mapping.xml:99
+#, fuzzy, no-c-format
+msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "El elemento de mapeo de Hibernate usado para mapear una colecci&#x00f3;n "
 "depende del tipo de la interface. Por ejemplom un elemento <literal>&lt;"
 "set&gt;</literal> se usa para mapear propiedades de tipo <literal>Set</"
 "literal>."
 
-#: index.docbook:73
+#. Tag: programlisting
+#: collection_mapping.xml:105
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Product\">\n"
 "    <id name=\"serialNumber\" column=\"productSerialNumber\"/>\n"
@@ -178,7 +221,9 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:75
+#. Tag: para
+#: collection_mapping.xml:107
+#, no-c-format
 msgid ""
 "Apart from <literal>&lt;set&gt;</literal>, there is also <literal>&lt;"
 "list&gt;</literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</"
@@ -192,7 +237,9 @@
 "<literal>&lt;primitive-array&gt;</literal>. El elemento <literal>&lt;map&gt;"
 "</literal> es representativo:"
 
-#: index.docbook:100
+#. Tag: programlisting
+#: collection_mapping.xml:132
+#, no-c-format
 msgid ""
 "<![CDATA[<map\n"
 "    name=\"propertyName\"\n"
@@ -241,91 +288,114 @@
 "    <element .... />\n"
 "</map>]]>"
 
-#: index.docbook:103
-msgid "<literal>name</literal> the collection property name"
+#. Tag: para
+#: collection_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr "<literal>name</literal> el nombre de la propiedad de colecci&#x00f3;n"
 
-#: index.docbook:108
+#. Tag: para
+#: collection_mapping.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (opcional - por defecto al nombre de la propiedad) "
 "el nombre de la tabla de colecii&#x00f3;n (no usado para asociaciones uno-a-"
 "muchos)"
 
-#: index.docbook:114
+#. Tag: para
+#: collection_mapping.xml:146
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (opcional) el nombre de un esquema de tablas para "
 "sobrescribir el esquema declarado en el elemento ra&#x00ed;z"
 
-#: index.docbook:120
+#. Tag: para
+#: collection_mapping.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (opcional - por defecto a <literal>true</literal>) "
 "puede ser usado para deshabilitar la recuperaci&#x00f3;n perezosa y "
 "especificar que la asociaci&#x00f3;n es siempre recuperada tempranamente (no "
 "disponible para arrays)"
 
-#: index.docbook:129
+#. Tag: para
+#: collection_mapping.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (opcional - por defecto a <literal>false</"
 "literal>) marca esta colecci&#x00f3;n como el extremo \"inverso\" de una "
 "asociaci&#x00f3;n bidireccional."
 
-#: index.docbook:135
+#. Tag: para
+#: collection_mapping.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (opcional - por defecto a <literal>none</"
 "literal>) habilita operaciones en cascada a entidades hijas"
 
-#: index.docbook:141
+#. Tag: para
+#: collection_mapping.xml:173
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal> (opcional) especifica una colecci&#x00f3;n con "
 "ordenamiento <literal>natural</literal>, o una clase comparadora dada"
 
-#: index.docbook:147
+#. Tag: para
+#: collection_mapping.xml:179
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (opcional, s&#x00f3;lo JDK1.4) especifica una "
 "columna de tabla (o columnas) que definen el orden de iteraci&#x00f3;n del "
 "<literal>Map</literal>, <literal>Set</literal> o bag, junto a un "
 "<literal>asc</literal> o <literal>desc</literal> opcional."
 
-#: index.docbook:154
+#. Tag: para
+#: collection_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (opcional) especifica una condici&#x00f3;n "
 "<literal>WHERE</literal> de SQL arbitrario para ser usada al recuperar o "
 "quitar la colecci&#x00f3;n (&#x00fa;til si la colecci&#x00f3;n debe contener "
 "s&#x00f3;lo un subconjunto de los datos disponibles)"
 
-#: index.docbook:161
+#. Tag: para
+#: collection_mapping.xml:193
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal> (opcional, por defecto a <literal>select</literal>) "
@@ -333,31 +403,37 @@
 "recuperar por selecci&#x00f3;n secuencial, y recuperaci&#x00f3;n por "
 "subselecci&#x00f3;n secuencial."
 
-#: index.docbook:168
+#. Tag: para
+#: collection_mapping.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (opcional, por defecto a <literal>1</literal>) "
 "especifica un \"tama&#x00f1;o de lote\" para la recuperar perezosamente "
 "instancias de esta colecci&#x00f3;n."
 
-#: index.docbook:174
+#. Tag: para
+#: collection_mapping.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal> (opcional - por defecto a <literal>property</"
 "literal>): La estrategia que debe usar Hibernate para acceder al valor de la "
 "propiedad."
 
-#: index.docbook:180
+#. Tag: para
+#: collection_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - por defecto a <literal>true</"
 "literal>): Especifica que los cambios de estado de la colecci&#x00f3;n "
@@ -365,25 +441,32 @@
 "asociaciones uno a muchos, frecuentemente es razonable deshabilitar esta "
 "opci&#x00f3;n.)"
 
-#: index.docbook:188
+#. Tag: para
+#: collection_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
 "A value of <literal>false</literal> specifies that the elements of the "
 "collection never change (a minor performance optimization in some cases)."
 
-#: index.docbook:198
+#. Tag: title
+#: collection_mapping.xml:230
+#, no-c-format
 msgid "Collection foreign keys"
 msgstr "Claves for&#x00e1;neas de collecci&#x00f3;n"
 
-#: index.docbook:200
+#. Tag: para
+#: collection_mapping.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -394,11 +477,13 @@
 "columna clave de la colecci&#x00f3;n es mapeada por el elemento <literal>&lt;"
 "key&gt;</literal>."
 
-#: index.docbook:208
+#. Tag: para
+#: collection_mapping.xml:240
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "Puede haber una restricci&#x00f3;n de nulabilidad sobre la columna de clave "
@@ -407,23 +492,31 @@
 "clave for&#x00e1;nea es nulable por defecto, de modo que podr&#x00ed;as "
 "necesitar especificar <literal>not-null=\"true\"</literal>."
 
-#: index.docbook:215
+#. Tag: programlisting
+#: collection_mapping.xml:247
+#, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" not-null=\"true\"/>]]>"
 msgstr "<![CDATA[<key column=\"productSerialNumber\" not-null=\"true\"/>]]>"
 
-#: index.docbook:217
+#. Tag: para
+#: collection_mapping.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 "La restricci&#x00f3;n de clave for&#x00e1;nea puede usar <literal>ON DELETE "
 "CASCADE</literal>."
 
-#: index.docbook:221
+#. Tag: programlisting
+#: collection_mapping.xml:253
+#, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" on-delete=\"cascade\"/>]]>"
 msgstr ""
 "<![CDATA[<key column=\"productSerialNumber\" on-delete=\"cascade\"/>]]>"
 
-#: index.docbook:223
+#. Tag: para
+#: collection_mapping.xml:255
+#, no-c-format
 msgid ""
 "See the previous chapter for a full definition of the <literal>&lt;key&gt;</"
 "literal> element."
@@ -431,19 +524,23 @@
 "Mira el cap&#x00ed;tulo anterior por una definici&#x00f3;n completa del "
 "elemento <literal>&lt;key&gt;</literal>."
 
-#: index.docbook:231
+#. Tag: title
+#: collection_mapping.xml:263
+#, no-c-format
 msgid "Collection elements"
 msgstr "Elementos de collecci&#x00f3;n"
 
-#: index.docbook:233
+#. Tag: para
+#: collection_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "Las colecciones pueden contener casi cualquier tipo de Hibernate, incluyendo "
 "todos los tipos b&#x00e1;sicos, componentes, y por supuesto, referencias a "
@@ -455,7 +552,9 @@
 "\"enlace\" entre los dos objetos se considera mantenido por la "
 "colecci&#x00f3;n."
 
-#: index.docbook:242
+#. Tag: para
+#: collection_mapping.xml:274
+#, no-c-format
 msgid ""
 "The contained type is referred to as the <emphasis>collection element type</"
 "emphasis>. Collection elements are mapped by <literal>&lt;element&gt;</"
@@ -472,23 +571,27 @@
 "literal>. Las dos primeras mapean elementos con sem&#x00e1;ntica de valor, "
 "los dos siguientes son usados para mapear asociaciones de entidades."
 
-#: index.docbook:254
+#. Tag: title
+#: collection_mapping.xml:286
+#, no-c-format
 msgid "Indexed collections"
 msgstr "Colecciones indexadas"
 
-#: index.docbook:256
+#. Tag: para
+#: collection_mapping.xml:288
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "Todos los mapeos de colecci&#x00f3;n, excepto aquellos con sem&#x00e1;ntica "
 "de set o bag, necesitan una <emphasis>columna &#x00ed;ndice</emphasis> en la "
@@ -503,17 +606,19 @@
 "usando el elemento <literal>&lt;list-index&gt;</literal>. La columna mapeada "
 "contiene enteros secuenciales (numerados desde cero, por defecto)."
 
-#: index.docbook:267
+#. Tag: sect2
+#: collection_mapping.xml:299
+#, fuzzy, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
 "\"index2\" coords=\"3 45\"/> </areaspec> <programlisting><![CDATA[<list-"
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -524,11 +629,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -538,12 +643,12 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -588,13 +693,15 @@
 "(requerido): La clase de entidad usada como clave del mapa. </para> </"
 "callout> </calloutlist> </programlistingco>"
 
-#: index.docbook:348
+#. Tag: para
+#: collection_mapping.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "Si tu tabla no tiene una columna &#x00ed;ndice, y deseas a&#x00fa;n usar "
 "<literal>List</literal> como tipo de propiedad, debes mapear la propiedad "
@@ -602,28 +709,19 @@
 "retiene su orden al ser recuperado de la base de datos, pero puede ser "
 "ordenado o clasificado opcionalmente."
 
-#: index.docbook:357
-msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
-msgstr ""
-"Hay absolutamente un rango de mapeos que pueden ser generados para "
-"colecciones, cubriendo muchos modelos relacionales comunes. Te sugerimos que "
-"experimentes con la herramienta de generaci&#x00f3;n de esquemas para "
-"obtener una idea de c&#x00f3;mo varias declaraciones de mapeo se traducen a "
-"tablas de base de datos."
-
-#: index.docbook:364
+#. Tag: title
+#: collection_mapping.xml:390
+#, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "Colecciones de valores y asociaciones muchos-a-muchos"
 
-#: index.docbook:366
+#. Tag: para
+#: collection_mapping.xml:392
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr ""
 "Cualquier colecci&#x00f3;n de valores o asociaci&#x00f3;n muchos a muchos "
@@ -632,15 +730,19 @@
 "colecci&#x00f3;n</emphasis> o columnas y posiblemente una columna o columnas "
 "&#x00ed;ndice."
 
-#: index.docbook:373
+#. Tag: para
+#: collection_mapping.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr ""
 "Para una colecci&#x00f3;n de valores, usamos la etiqueta <literal>&lt;"
 "element&gt;</literal>."
 
-#: index.docbook:375
+#. Tag: sect2
+#: collection_mapping.xml:401
+#, fuzzy, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"element1b\" coords=\"2 50\"/> <area "
 "id=\"element2b\" coords=\"3 50\"/> <area id=\"element3b\" coords=\"4 50\"/> "
@@ -655,11 +757,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -680,30 +782,30 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
@@ -777,11 +879,21 @@
 "key. If not specified, the primary key of the associated class is used. </"
 "para> </callout> </calloutlist> </programlistingco>"
 
-#: index.docbook:480
-msgid "Some examples, first, a set of strings:"
-msgstr "Algunos ejemplos, primero, un conjunto de cadenas:"
+#. Tag: para
+#: collection_mapping.xml:506
+#, no-c-format
+msgid "Here are some examples."
+msgstr ""
 
-#: index.docbook:484
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
+#. Tag: programlisting
+#: collection_mapping.xml:513
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
 "    <key column=\"person_id\"/>\n"
@@ -793,15 +905,19 @@
 "    <element column=\"person_name\" type=\"string\"/>\n"
 "</set>]]>"
 
-#: index.docbook:486
+#. Tag: para
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "Un bag conteniendo enteros (con un orden de iteraci&#x00f3;n determinado por "
 "el atributo <literal>order-by</literal>):"
 
-#: index.docbook:491
+#. Tag: programlisting
+#: collection_mapping.xml:520
+#, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
 "        table=\"item_sizes\" \n"
@@ -817,12 +933,16 @@
 "    <element column=\"size\" type=\"integer\"/>\n"
 "</bag>]]>"
 
-#: index.docbook:493
-msgid "An array of entities - in this case, a many to many association:"
+#. Tag: para
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr ""
 "Un array de entidades - en este caso, una asociaci&#x00f3;n muchos a muchos:"
 
-#: index.docbook:497
+#. Tag: programlisting
+#: collection_mapping.xml:526
+#, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
 "        table=\"PersonAddress\" \n"
@@ -840,11 +960,15 @@
 "    <many-to-many column=\"addressId\" class=\"Address\"/>\n"
 "</array>]]>"
 
-#: index.docbook:499
+#. Tag: para
+#: collection_mapping.xml:528
+#, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "Un mapa de &#x00ed;ndices de cadenas a fechas:"
 
-#: index.docbook:503
+#. Tag: programlisting
+#: collection_mapping.xml:532
+#, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
 "        table=\"holidays\" \n"
@@ -864,12 +988,16 @@
 "    <element column=\"hol_date\" type=\"date\"/>\n"
 "</map>]]>"
 
-#: index.docbook:505
-msgid "A list of components (discussed in the next chapter):"
+#. Tag: para
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr ""
 "Una lista de componentes (discutidos en el pr&#x00f3;ximo cap&#x00ed;tulo):"
 
-#: index.docbook:509
+#. Tag: programlisting
+#: collection_mapping.xml:538
+#, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
 "        table=\"CarComponents\">\n"
@@ -893,43 +1021,53 @@
 "    </composite-element>\n"
 "</list>]]>"
 
-#: index.docbook:514
+#. Tag: title
+#: collection_mapping.xml:543
+#, no-c-format
 msgid "One-to-many associations"
 msgstr "Asociaciones uno-a-muchos"
 
-#: index.docbook:516
+#. Tag: para
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr ""
 "Una <emphasis>asociaci&#x00f3;n uno a muchos</emphasis> enlaza las tablas de "
 "dos clases por medio de una clave for&#x00e1;nea, sin intervenci&#x00f3;n de "
 "tabla de colecci&#x00f3;n alguna. Este mapeo pierde cierta sem&#x00e1;ntica "
 "de colecciones Java normales:"
 
-#: index.docbook:524
+#. Tag: para
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr ""
 "Una instancia de la clase entidad contenida no puede pertenecer a m&#x00e1;s "
 "de una instancia de la colecci&#x00f3;n."
 
-#: index.docbook:530
+#. Tag: para
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "Una instancia de la clase entidad contenida no puede aparecer en m&#x00e1;s "
 "de un valor del &#x00ed;ndice de colecci&#x00f3;n."
 
-#: index.docbook:537
+#. Tag: para
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr ""
 "Una asociaci&#x00f3;n de <literal>Product</literal> a <literal>Part</"
 "literal> requiere la existencia de una columna clave for&#x00e1;nea y "
@@ -937,7 +1075,9 @@
 "Una etiqueta <literal>&lt;one-to-many&gt;</literal> indica que &#x00e9;sta "
 "es una asociaci&#x00f3;n uno a muchos."
 
-#: index.docbook:550
+#. Tag: programlisting
+#: collection_mapping.xml:579
+#, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
 "        class=\"ClassName\"\n"
@@ -955,15 +1095,19 @@
 "        embed-xml=\"true|false\"\n"
 "    />]]>"
 
-#: index.docbook:553
-msgid "<literal>class</literal> (required): The name of the associated class."
+#. Tag: para
+#: collection_mapping.xml:582
+#, fuzzy, no-c-format
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr "<literal>class</literal> (requerido): El nombre de la clase asociada."
 
-#: index.docbook:558
+#. Tag: para
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (opcional - por defecto a <literal>exception</"
@@ -971,33 +1115,38 @@
 "en cach&#x00e9; que referencien filas perdidas: <literal>ignore</literal> "
 "tratar&#x00e1; una fila perdida como una asociaci&#x00f3;n nula."
 
-#: index.docbook:565
+#. Tag: para
+#: collection_mapping.xml:594
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "<literal>entity-name</literal> (opcional): El nombre de entidad de la clase "
 "asociada, como una alternativa a <literal>class</literal>."
 
-#: index.docbook:573
+#. Tag: para
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "Observa que el elemento <literal>&lt;one-to-many&gt;</literal> no necesita "
 "declarar ninguna columna. Ni es necesario especificar el nombre de "
 "<literal>table</literal> en ning&#x00fa;n sitio."
 
-#: index.docbook:579
+#. Tag: para
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>Nota muy importante:</emphasis> Si la columna clave for&#x00e1;nea "
 "de una asociaci&#x00f3;n <literal>&lt;one-to-many&gt;</literal> es declarada "
@@ -1007,18 +1156,22 @@
 "marcado <literal>inverse=\"true\"</literal>. Ver la discusi&#x00f3;n sobre "
 "asociaciones bidireccionales m&#x00e1;s adelante en este cap&#x00ed;tulo."
 
-#: index.docbook:588
+#. Tag: para
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "Este ejemplo muestra un mapa de entidades <literal>Part</literal> por nombre "
 "(donde <literal>partName</literal> es una propiedad persistente de "
 "<literal>Part</literal>). Observa el uso de un &#x00ed;ndice basado en "
 "f&#x00f3;rmula."
 
-#: index.docbook:594
+#. Tag: programlisting
+#: collection_mapping.xml:625
+#, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
 "        cascade=\"all\">\n"
@@ -1034,15 +1187,21 @@
 "    <one-to-many class=\"Part\"/>\n"
 "</map>]]>"
 
-#: index.docbook:600
+#. Tag: title
+#: collection_mapping.xml:631
+#, no-c-format
 msgid "Advanced collection mappings"
 msgstr "Mapeos de colecci&#x00f3;n avanzados"
 
-#: index.docbook:603
+#. Tag: title
+#: collection_mapping.xml:634
+#, no-c-format
 msgid "Sorted collections"
 msgstr "Colecciones ordenadas"
 
-#: index.docbook:605
+#. Tag: para
+#: collection_mapping.xml:636
+#, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
 "literal> and <literal>java.util.SortedSet</literal>. You must specify a "
@@ -1052,7 +1211,9 @@
 "literal> y <literal>java.util.SortedSet</literal>. Debes especificar un "
 "comparador en el fichero de mapeo:"
 
-#: index.docbook:610
+#. Tag: programlisting
+#: collection_mapping.xml:641
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
 "            table=\"person_aliases\" \n"
@@ -1080,7 +1241,9 @@
 "    <element column=\"hol_date\" type=\"date\"/>\n"
 "</map>]]>"
 
-#: index.docbook:612
+#. Tag: para
+#: collection_mapping.xml:643
+#, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
 "<literal>unsorted</literal>, <literal>natural</literal> and the name of a "
@@ -1090,7 +1253,9 @@
 "<literal>unsorted</literal>, <literal>natural</literal> y el nombre de una "
 "clase que implemente <literal>java.util.Comparator</literal>."
 
-#: index.docbook:618
+#. Tag: para
+#: collection_mapping.xml:649
+#, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
 "or <literal>java.util.TreeMap</literal>."
@@ -1098,14 +1263,16 @@
 "Las colecciones ordenadas realmente se comportan como <literal>java.util."
 "TreeSet</literal> o <literal>java.util.TreeMap</literal>."
 
-#: index.docbook:623
+#. Tag: para
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "Si quieres que la misma base de datos ordene los elementos de colecci&#x00f3;"
 "n usa el atributo <literal>order-by</literal> de los mapeos <literal>set</"
@@ -1115,7 +1282,9 @@
 "<literal>LinkedHashMap</literal>). Esto realiza la ordenaci&#x00f3;n en la "
 "consulta SQL, no en memoria."
 
-#: index.docbook:632
+#. Tag: programlisting
+#: collection_mapping.xml:663
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
 "(name) asc\">\n"
@@ -1141,24 +1310,36 @@
 "    <element column=\"hol_date type=\"date\"/>\n"
 "</map>]]>"
 
-#: index.docbook:634
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "Observa que el valor del atributo <literal>order-by</literal> es una "
 "ordenaci&#x00f3;n SQL, no una ordenaci&#x00f3;n HQL!"
 
-#: index.docbook:639
+#. Tag: para
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "Las asociaciones pueden incluso ser ordenadas por alg&#x00fa;n criterio "
 "arbitrario en tiempo de ejecuci&#x00f3;n usando un <literal>filter()</"
 "literal> de colecci&#x00f3;n."
 
-#: index.docbook:644
+#. Tag: programlisting
+#: collection_mapping.xml:678
+#, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
 "\" ).list();]]>"
@@ -1166,11 +1347,15 @@
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
 "\" ).list();]]>"
 
-#: index.docbook:649
+#. Tag: title
+#: collection_mapping.xml:683
+#, no-c-format
 msgid "Bidirectional associations"
 msgstr "Asociaciones bidireccionales"
 
-#: index.docbook:651
+#. Tag: para
+#: collection_mapping.xml:685
+#, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
 "\"ends\" of the association. Two kinds of bidirectional association are "
@@ -1180,28 +1365,37 @@
 "nevegaci&#x00f3;n desde ambos \"extremos\" de la asociaci&#x00f3;n. Son "
 "soportados dos tipos de asociaci&#x00f3;n bidireccional:"
 
-#: index.docbook:658
+#. Tag: term
+#: collection_mapping.xml:692
+#, no-c-format
 msgid "one-to-many"
 msgstr "uno-a-muchos"
 
-#: index.docbook:660
-msgid "set or bag valued at one end, single-valued at the other"
+#. Tag: para
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "set o bag valorados en un extremo, monovaluados al otro"
 
-#: index.docbook:666
+#. Tag: term
+#: collection_mapping.xml:700
+#, no-c-format
 msgid "many-to-many"
 msgstr "muchos-a-muchos"
 
-#: index.docbook:668
+#. Tag: para
+#: collection_mapping.xml:702
+#, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "set o bag valorados a ambos extremos"
 
-#: index.docbook:677
+#. Tag: para
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "Puedes especificar una asociaci&#x00f3;n bidireccional muchos-a-muchos "
 "simplemente mapeando dos asociaciones muchos-a-muchos a la misma tabla de "
@@ -1209,16 +1403,21 @@
 "(cu&#x00e1;l de ellos es tu elecci&#x00f3;n, pero no puede ser una "
 "colecci&#x00f3;n indexada)."
 
-#: index.docbook:684
+#. Tag: para
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "He aqu&#x00ed; un ejemplo de una asociaci&#x00f3;n bidireccional muchos-a-"
 "muchos; cada categor&#x00ed;a puede tener muchos &#x00ed;tems y cada &#x00ed;"
 "tem puede estar en muchas categor&#x00ed;as:"
 
-#: index.docbook:689
+#. Tag: programlisting
+#: collection_mapping.xml:723
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
 "    <id name=\"id\" column=\"CATEGORY_ID\"/>\n"
@@ -1260,13 +1459,15 @@
 "    </bag>\n"
 "</class>]]>"
 
-#: index.docbook:691
+#. Tag: para
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "Los cambios hechos s&#x00f3;lo al extremo inverso de la asociaci&#x00f3;n "
 "<emphasis>no</emphasis> son persistidos. Esto significa que Hibernate tiene "
@@ -1275,7 +1476,9 @@
 "de entender si piensas en el modelo de objetos de Java y c&#x00f3;mo creamos "
 "una relaci&#x00f3;n muchos-a-muchos en Java:"
 
-#: index.docbook:699
+#. Tag: programlisting
+#: collection_mapping.xml:733
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "category.getItems().add(item);          // The category now \"knows\" about "
@@ -1297,7 +1500,9 @@
 "saved!\n"
 "session.persist(category);               // The relationship will be saved]]>"
 
-#: index.docbook:701
+#. Tag: para
+#: collection_mapping.xml:735
+#, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
 "database."
@@ -1305,9 +1510,11 @@
 "El lado no-inverso se usa para salvar la representaci&#x00f3;n en memoria a "
 "la base de datos."
 
-#: index.docbook:705
+#. Tag: para
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1316,7 +1523,9 @@
 "una asociaci&#x00f3;n muchos-a-uno y declarando el extremo multivaluado "
 "<literal>inverse=\"true\"</literal>."
 
-#: index.docbook:711
+#. Tag: programlisting
+#: collection_mapping.xml:745
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
 "    <id name=\"id\" column=\"parent_id\"/>\n"
@@ -1354,26 +1563,32 @@
 "        not-null=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:713
+#. Tag: para
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "Mapear un extremo de una asociaci&#x00f3;n con <literal>inverse=\"true\"</"
 "literal> no afecta la operaci&#x00f3;n de cascadas; &#x00e9;stos son "
 "conceptos ortogonales!"
 
-#: index.docbook:721
+#. Tag: title
+#: collection_mapping.xml:755
+#, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "Asociaciones bidireccionales con colecciones indexadas"
 
-#: index.docbook:722
+#. Tag: para
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "Requiere especial consideraci&#x00f3;n una asociaci&#x00f3;n bidireccional "
 "donde un extremo est&#x00e9; representado como una <literal>&lt;list&gt;</"
@@ -1382,7 +1597,9 @@
 "usando <literal>inverse=\"true\"</literal> en el mapeo de la colecci&#x00f3;"
 "n:"
 
-#: index.docbook:729
+#. Tag: programlisting
+#: collection_mapping.xml:763
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
 "    <id name=\"id\" column=\"parent_id\"/>\n"
@@ -1428,13 +1645,15 @@
 "        not-null=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:731
+#. Tag: para
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "Pero, si no existe tal proiedad en la clase hija, no podemos pensar en la "
 "asociaci&#x00f3;n como verdaderamente bidireccional (hay informaci&#x00f3;n "
@@ -1443,7 +1662,9 @@
 "<literal>inverse=\"true\"</literal>. En cambio, podr&#x00ed;amos usar el "
 "siguiente mapeo:"
 
-#: index.docbook:738
+#. Tag: programlisting
+#: collection_mapping.xml:772
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
 "    <id name=\"id\" column=\"parent_id\"/>\n"
@@ -1491,30 +1712,37 @@
 "        not-null=\"true\"/>\n"
 "</class>]]>"
 
-#: index.docbook:740
+#. Tag: para
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "Nota que, en este mapeo, el extremo de la asociaci&#x00f3;n valuado en "
 "colecci&#x00f3;n es responsable de las actualizaciones a la clave for&#x00e1;"
 "nea."
 
-#: index.docbook:748
+#. Tag: title
+#: collection_mapping.xml:782
+#, no-c-format
 msgid "Ternary associations"
 msgstr "Asociaciones ternarias"
 
-#: index.docbook:750
+#. Tag: para
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "Hay tres enfoques posibles para mapear una asociaci&#x00f3;n ternaria. Una "
 "es usar un <literal>Map</literal> con una asociaci&#x00f3;n como su &#x00ed;"
 "ndice:"
 
-#: index.docbook:755
+#. Tag: programlisting
+#: collection_mapping.xml:789
+#, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
 "    <key column=\"employer_id\" not-null=\"true\"/>\n"
@@ -1528,7 +1756,9 @@
 "    <one-to-many class=\"Contract\"/>\n"
 "</map>]]>"
 
-#: index.docbook:757
+#. Tag: programlisting
+#: collection_mapping.xml:791
+#, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
 "    <key column=\"incoming_node_id\"/>\n"
@@ -1542,37 +1772,44 @@
 "    <many-to-many column=\"connection_id\" class=\"Connection\"/>\n"
 "</map>]]>"
 
-#: index.docbook:759
+#. Tag: para
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "Un segundo enfoque es simplemente remodelar la asociaci&#x00f3;n como una "
 "clase de entidad. Este es el enfoque que usamos m&#x00e1;s comunmente."
 
-#: index.docbook:764
+#. Tag: para
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr ""
 "Una alternativa final es usar elementos compuestos, que discutiremos "
 "m&#x00e1;s adelante."
 
-#: index.docbook:771
+#. Tag: literal
+#: collection_mapping.xml:805
+#, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "Usando un &lt;idbag&gt;"
 
-#: index.docbook:773
+#. Tag: para
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "Si has adoptado completamente nuestra visi&#x00f3;n de que las claves "
 "compuestas son una cosa mala y que las entidades deben tener identificadores "
@@ -1586,16 +1823,20 @@
 "permite mapear asociaciones muchos a muchos y colecciones de valores a una "
 "tabla con una clave delegada."
 
-#: index.docbook:784
+#. Tag: para
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "El elemento <literal>&lt;idbag&gt;</literal> te permite mapear una "
 "<literal>List</literal> (o <literal>Collection</literal>) con sem&#x00e1;"
 "ntica de bag."
 
-#: index.docbook:789
+#. Tag: programlisting
+#: collection_mapping.xml:822
+#, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
 "    <collection-id column=\"ID\" type=\"long\">\n"
@@ -1613,12 +1854,14 @@
 "    <many-to-many column=\"PERSON2\" class=\"Person\" fetch=\"join\"/>\n"
 "</idbag>]]>"
 
-#: index.docbook:791
+#. Tag: para
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "Como puedes ver, un <literal>&lt;idbag&gt;</literal> tiene un generador de "
 "id sint&#x00e9;tico, igual que una clase de entidad! Una clave delegada "
@@ -1626,12 +1869,14 @@
 "ning&#x00fa;n mecanismo para descubrir el valor de clave delegada de una "
 "fila en particular, sin embargo."
 
-#: index.docbook:798
+#. Tag: para
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "Observa que el rendimiento de actualizaci&#x00f3;n de un <literal>&lt;"
 "idbag&gt;</literal> es <emphasis>mucho</emphasis> mejor que el de un "
@@ -1639,7 +1884,9 @@
 "individuales eficientemente y actualizarlas o borrarlas individualmente, "
 "igual que si fuese una lista, mapa o conjunto."
 
-#: index.docbook:805
+#. Tag: para
+#: collection_mapping.xml:837
+#, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
 "generation strategy is not supported for <literal>&lt;idbag&gt;</literal> "
@@ -1649,19 +1896,28 @@
 "identificador <literal>native</literal> no est&#x00e1; soportada para "
 "identificadores de colecciones <literal>&lt;idbag&gt;</literal>."
 
-#: index.docbook:829
+#. Tag: title
+#: collection_mapping.xml:861
+#, no-c-format
 msgid "Collection examples"
 msgstr "Ejemplos de colecci&#x00f3;n"
 
-#: index.docbook:831
+#. Tag: para
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "Ejemplos de colecci&#x00f3;n"
+
+#. Tag: para
+#: collection_mapping.xml:867
+#, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
+"The following class has a collection of <literal>Child</literal> instances:"
 msgstr ""
-"Las secciones previas son bastantes confusas. As&#x00ed; que miremos un "
-"ejemplo. Esta clase:"
 
-#: index.docbook:836
+#. Tag: programlisting
+#: collection_mapping.xml:871
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "import java.util.Set;\n"
@@ -1697,16 +1953,20 @@
 "    ....\n"
 "}]]>"
 
-#: index.docbook:838
+#. Tag: para
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "tiene una colecci&#x00f3;n de instancias de <literal>Child</literal>. Si "
 "cada hijo tiene como mucho un padre, el mapeo m&#x00e1;s natural es una "
 "asociaci&#x00f3;n uno-a-muchos:"
 
-#: index.docbook:844
+#. Tag: programlisting
+#: collection_mapping.xml:879
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -1750,11 +2010,15 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:846
+#. Tag: para
+#: collection_mapping.xml:881
+#, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "Esto mapea a las siguientes definiciones de tablas:"
 
-#: index.docbook:850
+#. Tag: programlisting
+#: collection_mapping.xml:885
+#, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
 "create table child ( id bigint not null primary key, name varchar(255), "
@@ -1766,7 +2030,9 @@
 "parent_id bigint )\n"
 "alter table child add constraint childfk0 (parent_id) references parent]]>"
 
-#: index.docbook:852
+#. Tag: para
+#: collection_mapping.xml:887
+#, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
 "many association:"
@@ -1774,7 +2040,9 @@
 "Si el padre es <emphasis>requerido</emphasis>, usa una asociaci&#x00f3;n "
 "bidireccional uno-a-muchos:"
 
-#: index.docbook:857
+#. Tag: programlisting
+#: collection_mapping.xml:892
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -1822,11 +2090,15 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:859
+#. Tag: para
+#: collection_mapping.xml:894
+#, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "Observa la restricci&#x00f3;n <literal>NOT NULL</literal>:"
 
-#: index.docbook:863
+#. Tag: programlisting
+#: collection_mapping.xml:898
+#, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
 "create table child ( id bigint not null\n"
@@ -1842,17 +2114,21 @@
 "                     parent_id bigint not null )\n"
 "alter table child add constraint childfk0 (parent_id) references parent]]>"
 
-#: index.docbook:865
+#. Tag: para
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "Alternativamente, si absolutamente insistes que esta asociaci&#x00f3;n debe "
 "ser unidireccional, puedes declarar la restricci&#x00f3;n <literal>NOT NULL</"
 "literal> en el mapeo de <literal>&lt;key&gt;</literal>:"
 
-#: index.docbook:871
+#. Tag: programlisting
+#: collection_mapping.xml:906
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -1896,15 +2172,19 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:873
+#. Tag: para
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr ""
 "En la otra mano, si un hijo pudiera tener m&#x00fa;ltiples padres, "
 "ser&#x00ed;a apropiada una asociaci&#x00f3;n muchos-a-muchos:"
 
-#: index.docbook:878
+#. Tag: programlisting
+#: collection_mapping.xml:913
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -1948,11 +2228,15 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:880
+#. Tag: para
+#: collection_mapping.xml:915
+#, no-c-format
 msgid "Table definitions:"
 msgstr "Definiciones de tabla:"
 
-#: index.docbook:884
+#. Tag: programlisting
+#: collection_mapping.xml:919
+#, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
 "create table child ( id bigint not null primary key, name varchar(255) )\n"
@@ -1974,24 +2258,39 @@
 "alter table childset add constraint childsetfk1 (child_id) references child]]"
 ">"
 
-#: index.docbook:886
+#. Tag: para
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "Para m&#x00e1;s ejemplos y un paseo completo a trav&#x00e9;s del mapeo de "
 "relaciones padre/hijo, ver <xref linkend=\"example-parentchild\"/>."
 
-#: index.docbook:891
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#. Tag: para
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr ""
 "Son posibles mapeos de asociaci&#x00f3;n a&#x00fa;n m&#x00e1;s complejos. "
 "Catalogaremos todas las posibilidades en el pr&#x00f3;ximo cap&#x00ed;tulo."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "Collection Mapping"
+#~ msgstr "Mapeo de Colecciones"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr "Algunos ejemplos, primero, un conjunto de cadenas:"
+
+#~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr ""
+#~ "Las secciones previas son bastantes confusas. As&#x00ed; que miremos un "
+#~ "ejemplo. Esta clase:"
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,33 +1,43 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: component_mapping.xml:29
+#, no-c-format
 msgid "Component Mapping"
 msgstr "Mapeo de Componentes"
 
-#: index.docbook:7
+#. Tag: para
+#: component_mapping.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "La noci&#x00f3;n de un <emphasis>componente</emphasis> es reusada en muchos "
 "contextos diferentes, para prop&#x00f3;sitos diferentes, a trav&#x00e9;s de "
 "Hibernate."
 
-#: index.docbook:13
+#. Tag: title
+#: component_mapping.xml:37
+#, no-c-format
 msgid "Dependent objects"
 msgstr "Objetos dependientes"
 
-#: index.docbook:15
+#. Tag: para
+#: component_mapping.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "Un componente es un objeto contenido que es persistido como un tipo de "
 "valor, no una referencia de entidad. El t&#x00e9;rmino \"componente\" hace "
@@ -35,7 +45,9 @@
 "a componentes a nivel de arquitectura). Por ejemplo, podr&#x00ed;as modelar "
 "una persona como:"
 
-#: index.docbook:21
+#. Tag: programlisting
+#: component_mapping.xml:45
+#, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
 "    private java.util.Date birthday;\n"
@@ -89,7 +101,9 @@
 "    ......\n"
 "}]]>"
 
-#: index.docbook:23
+#. Tag: programlisting
+#: component_mapping.xml:47
+#, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
 "    char initial;\n"
@@ -139,23 +153,29 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:25
+#. Tag: para
+#: component_mapping.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "Ahora <literal>Name</literal> puede ser persistido como un componente de "
 "<literal>Person</literal>. Observa que <literal>Name</literal> define "
 "m&#x00e9;todos getter y setter para sus propiedades persistentes, pero no "
 "necesita declarar ninguna interface ni propiedades identificadoras."
 
-#: index.docbook:32
-msgid "Our Hibernate mapping would look like:"
+#. Tag: para
+#: component_mapping.xml:56
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "Nuestro mapeo de Hibernate se ver&#x00ed;a as&#x00ed;:"
 
-#: index.docbook:36
+#. Tag: programlisting
+#: component_mapping.xml:60
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
 "    <id name=\"Key\" column=\"pid\" type=\"string\">\n"
@@ -183,7 +203,9 @@
 "    </component>\n"
 "</class>]]>"
 
-#: index.docbook:38
+#. Tag: para
+#: component_mapping.xml:62
+#, no-c-format
 msgid ""
 "The person table would have the columns <literal>pid</literal>, "
 "<literal>birthday</literal>, <literal>initial</literal>, <literal>first</"
@@ -193,15 +215,17 @@
 "<literal>birthday</literal>, <literal>initial</literal>, <literal>first</"
 "literal> y <literal>last</literal>."
 
-#: index.docbook:46
+#. Tag: para
+#: component_mapping.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "Como todos los tipos de valor, los componentes no soportan referencias "
 "compartidas. En otras palabras, dos personas pueden tener el mismo nombre, "
@@ -212,12 +236,14 @@
 "columnas del componente son nulas, el componente entero es nulo. Esto debe "
 "estar bien para la mayor&#x00ed;a de prop&#x00f3;sitos."
 
-#: index.docbook:55
+#. Tag: para
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "Las propiedades de un componentes pueden ser de cualquier tipo de Hibernate "
 "(colecciones, muchos-a-uno, asociaciones, otros componentes, etc). Los "
@@ -225,7 +251,9 @@
 "ex&#x00f3;tico. Hibernate est&#x00e1; concebido para soportar un modelo de "
 "objetos granularizado en fino."
 
-#: index.docbook:62
+#. Tag: para
+#: component_mapping.xml:85
+#, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
 "parent&gt;</literal> subelement that maps a property of the component class "
@@ -235,7 +263,9 @@
 "<literal>&lt;parent&gt;</literal> que mapee una propiedad de la clase del "
 "componente como una referencia de regreso a la entidad contenedora."
 
-#: index.docbook:68
+#. Tag: programlisting
+#: component_mapping.xml:91
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
 "    <id name=\"Key\" column=\"pid\" type=\"string\">\n"
@@ -265,23 +295,29 @@
 "    </component>\n"
 "</class>]]>"
 
-#: index.docbook:73
+#. Tag: title
+#: component_mapping.xml:96
+#, no-c-format
 msgid "Collections of dependent objects"
 msgstr "Colecciones de objetos dependientes"
 
-#: index.docbook:75
+#. Tag: para
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "Las colecciones de componentes est&#x00e1;n soportadas (por ejemplo, un "
 "array de tipo <literal>Name</literal>). Declara tu colecci&#x00f3;n de "
 "componentes remplazando la etiqueta <literal>&lt;element&gt;</literal> por "
 "una etiqueta <literal>&lt;composite-element&gt;</literal>."
 
-#: index.docbook:82
+#. Tag: programlisting
+#: component_mapping.xml:105
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
 "    <key column=\"id\"/>\n"
@@ -301,26 +337,29 @@
 "    </composite-element>\n"
 "</set>]]>"
 
-#: index.docbook:84
+#. Tag: para
+#: component_mapping.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "Nota: si defines un <literal>Set</literal> de elementos compuestos, es muy "
 "importante implementar <literal>equals()</literal> y <literal>hashCode()</"
 "literal> correctamente."
 
-#: index.docbook:90
+#. Tag: para
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "Los elementos compuestos pueden contener componentes pero no colecciones. Si "
 "tu elemento compuesto contiene a su vez componentes, usa la etiqueta "
@@ -332,16 +371,17 @@
 "es el mismo, el modelo relacional y la sem&#x00e1;ntica de persistencia "
 "siguen siendo ligeramente diferentes."
 
-#: index.docbook:102
+#. Tag: para
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "Por favor observa que un mapeo de elemento compuesto no soporta propiedades "
 "nulables si est&#x00e1;s usando un <literal>&lt;set&gt;</literal>. Hibernate "
@@ -352,13 +392,15 @@
 "<literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</literal>, "
 "<literal>&lt;bag&gt;</literal> o <literal>&lt;idbag&gt;</literal>."
 
-#: index.docbook:113
+#. Tag: para
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -371,7 +413,9 @@
 "<literal>price</literal> y <literal>quantity</literal> son propiedades de la "
 "asociaci&#x00f3;n:"
 
-#: index.docbook:123
+#. Tag: programlisting
+#: component_mapping.xml:148
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
 "    ....\n"
@@ -401,13 +445,15 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:125
+#. Tag: para
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "Por supuesto, no puede haber una referencia a la compra del otro lado para "
 "la navegaci&#x00f3;n bidireccional de la asociaci&#x00f3;n. Recuerda que los "
@@ -416,11 +462,15 @@
 "<literal>Order</literal>, pero no puede ser referenciada por el "
 "<literal>Item</literal> al mismo tiempo."
 
-#: index.docbook:133
+#. Tag: para
+#: component_mapping.xml:158
+#, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "Incluso son posibles las asociaciones ternarias (o cuaternarias, etc):"
 
-#: index.docbook:135
+#. Tag: programlisting
+#: component_mapping.xml:160
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
 "    ....\n"
@@ -444,22 +494,28 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:137
+#. Tag: para
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr ""
 "Los elementos compuestos pueden aparecer en consultas usando la misma "
 "sint&#x00e1;xis que las asociaciones a otras entidades."
 
-#: index.docbook:145
+#. Tag: title
+#: component_mapping.xml:170
+#, no-c-format
 msgid "Components as Map indices"
 msgstr "Componentes como &#x00ed;ndices de Map"
 
-#: index.docbook:147
+#. Tag: para
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -468,52 +524,72 @@
 "rate que sobrescribes <literal>hashCode()</literal> y <literal>equals()</"
 "literal> correctamente en la clase componente."
 
-#: index.docbook:156
+#. Tag: title
+#: component_mapping.xml:181
+#, no-c-format
 msgid "Components as composite identifiers"
 msgstr "Componentes como identificadores compuestos"
 
-#: index.docbook:158
+#. Tag: para
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "Puedes usar un componente como un identidicador de una clase entidad. Tu "
 "clase componente debe satisfacer ciertos requerimientos:"
 
-#: index.docbook:165
+#. Tag: para
+#: component_mapping.xml:190
+#, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "Debe implementar <literal>java.io.Serializable</literal>."
 
-#: index.docbook:170
+#. Tag: para
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "Debe re-implementar <literal>equals()</literal> y <literal>hashCode()</"
 "literal>, consistentemente con la noci&#x00f3;n de base de datos de igualdad "
 "de clave compuesta."
 
-#: index.docbook:179
+#. Tag: title
+#: component_mapping.xml:204
+#, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "Nota: en Hibernat3, el segundo requerimiento no es absolutamente un "
 "requerimiento r&#x00ed;gido de Hibernate. Pero de todas formas, h&#x00e1;zlo."
 
-#: index.docbook:183
+#. Tag: para
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "No puedes usar un <literal>IdentifierGenerator</literal> para generar claves "
 "compuestas. La aplicaci&#x00f3;n debe, en cambio, asignar sus propios "
 "identificadores."
 
-#: index.docbook:188
+#. Tag: para
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -524,25 +600,27 @@
 "<literal>OrderLine</literal> tiene una clave primaria que depende de la "
 "clave primaria (compuesta) de <literal>Order</literal>."
 
-#: index.docbook:196
+#. Tag: programlisting
+#: component_mapping.xml:224
+#, fuzzy, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -564,18 +642,22 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:198
+#. Tag: para
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "Ahora, cualquier clave for&#x00e1;nea que referencie la tabla de "
 "<literal>OrderLine</literal> es tambi&#x00e9;n compuesta. Debes declarar "
 "esto en tus mapeos de otras clases. Una asociaci&#x00f3;n a "
 "<literal>OrderLine</literal> ser&#x00ed;a mapeado as&#x00ed;:"
 
-#: index.docbook:204
+#. Tag: programlisting
+#: component_mapping.xml:232
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
 "<!-- the \"class\" attribute is optional, as usual -->\n"
@@ -591,15 +673,19 @@
 "    <column name=\"customerId\"/>\n"
 "</many-to-one>]]>"
 
-#: index.docbook:206
+#. Tag: para
+#: component_mapping.xml:235
+#, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(Nota que la etiqueta <literal>&lt;column&gt;</literal> es una alternativa "
-"al atributo <literal>column</literal> en cualquier sitio.)"
 
-#: index.docbook:211
+#. Tag: para
+#: component_mapping.xml:244
+#, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
 "literal> also uses the composite foreign key:"
@@ -608,7 +694,9 @@
 "<literal>OrderLine</literal> tambi&#x00e9;n usa la clave for&#x00e1;nea "
 "compuesta:"
 
-#: index.docbook:216
+#. Tag: programlisting
+#: component_mapping.xml:249
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
 "    <key column name=\"warehouseId\"/>\n"
@@ -628,7 +716,9 @@
 "    </many-to-many>\n"
 "</set>]]>"
 
-#: index.docbook:218
+#. Tag: para
+#: component_mapping.xml:251
+#, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
 "would use:"
@@ -636,7 +726,9 @@
 "La colecci&#x00f3;n de <literal>OrderLine</literal>s en <literal>Order</"
 "literal> usar&#x00ed;a:"
 
-#: index.docbook:223
+#. Tag: programlisting
+#: component_mapping.xml:256
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
 "    <key>\n"
@@ -654,15 +746,17 @@
 "    <one-to-many class=\"OrderLine\"/>\n"
 "</set>]]>"
 
-#: index.docbook:225
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#. Tag: para
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 "(El elemento <literal>&lt;one-to-many&gt;</literal>, como es usual, no "
 "declara columnas.)"
 
-#: index.docbook:229
+#. Tag: para
+#: component_mapping.xml:262
+#, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
 "composite foreign key."
@@ -670,7 +764,9 @@
 "Si <literal>OrderLine</literal> posee una colecci&#x00f3;n por s&#x00ed; "
 "misma, tiene tambi&#x00e9;n una clave for&#x00e1;nea compuesta."
 
-#: index.docbook:234
+#. Tag: programlisting
+#: component_mapping.xml:267
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
 "    ....\n"
@@ -704,15 +800,21 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:239
+#. Tag: title
+#: component_mapping.xml:272
+#, no-c-format
 msgid "Dynamic components"
 msgstr "Componentes din&#x00e1;micos"
 
-#: index.docbook:241
-msgid "You may even map a property of type <literal>Map</literal>:"
+#. Tag: para
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr "Puedes incluso mapear una propiedad de tipo <literal>Map</literal>:"
 
-#: index.docbook:245
+#. Tag: programlisting
+#: component_mapping.xml:278
+#, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
 "    <property name=\"foo\" column=\"FOO\" type=\"string\"/>\n"
@@ -726,15 +828,17 @@
 "    <many-to-one name=\"baz\" class=\"Baz\" column=\"BAZ_ID\"/>\n"
 "</dynamic-component>]]>"
 
-#: index.docbook:247
+#. Tag: para
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "La sem&#x00e1;ntica de un mapeo <literal>&lt;dynamic-component&gt;</literal> "
 "es &#x00ed;dentica a la de <literal>&lt;component&gt;</literal>. La ventaja "
@@ -746,8 +850,15 @@
 "configuraci&#x00f3;n de Hibernate por medio del objeto "
 "<literal>Configuration</literal>."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(Nota que la etiqueta <literal>&lt;column&gt;</literal> es una "
+#~ "alternativa al atributo <literal>column</literal> en cualquier sitio.)"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,22 +1,28 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: configuration.xml:29
+#, no-c-format
 msgid "Configuration"
 msgstr "Configuraci&#x00f3;n"
 
-#: index.docbook:7
+#. Tag: para
+#: configuration.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "Debido a que Hibernate est&#x00e1; dise&#x00f1;ado para operar en muchos "
 "entornos diferentes, hay un gran n&#x00fa;mero de par&#x00e1;metros de "
@@ -26,16 +32,20 @@
 "literal> que muestra las diversas opciones. Tan s&#x00f3;lo pon el fichero "
 "de ejemplo en tu classpath y personal&#x00ed;zalo."
 
-#: index.docbook:16
+#. Tag: title
+#: configuration.xml:40
+#, no-c-format
 msgid "Programmatic configuration"
 msgstr "Configuraci&#x00f3;n program&#x00e1;tica"
 
-#: index.docbook:18
+#. Tag: para
+#: configuration.xml:42
+#, fuzzy, no-c-format
 msgid ""
 "An instance of <classname>org.hibernate.cfg.Configuration</classname> "
 "represents an entire set of mappings of an application's Java types to an "
 "SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
-"used to build an (immutable) <interfacename>org.hibernate.SessionFactory</"
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
 "interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "Una instancia de <literal>org.hibernate.cfg.Configuration</literal> "
@@ -44,19 +54,23 @@
 "literal> es usada para construir una <literal>SessionFactory</literal> "
 "(inmutable). Los mapeos se compilan de varios ficheros de mapeo XML."
 
-#: index.docbook:25
+#. Tag: para
+#: configuration.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"You may obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
 "instance by instantiating it directly and specifying XML mapping documents. "
 "If the mapping files are in the classpath, use <literal>addResource()</"
-"literal>:"
+"literal>. For example:"
 msgstr ""
 "Puedes obtener una instancia de <literal>Configuration</literal> "
 "instanci&#x00e1;ndola directamente y especificando documentos de mapeo XML. "
 "Si los ficheros de mapeo est&#x00e1;n en el classpath, usa "
 "<literal>addResource()</literal>:"
 
-#: index.docbook:31
+#. Tag: programlisting
+#: configuration.xml:55
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
 "    .addResource(\"Item.hbm.xml\")\n"
@@ -66,15 +80,19 @@
 "    .addResource(\"Item.hbm.xml\")\n"
 "    .addResource(\"Bid.hbm.xml\");]]>"
 
-#: index.docbook:33
+#. Tag: para
+#: configuration.xml:57
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "Una forma alternativa (a veces mejor) es especificar la clase mapeada, y "
 "dejar que Hibernate encuentre el documento de mapeo por ti:"
 
-#: index.docbook:38
+#. Tag: programlisting
+#: configuration.xml:62
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
 "    .addClass(org.hibernate.auction.Item.class)\n"
@@ -84,9 +102,11 @@
 "    .addClass(org.hibernate.auction.Item.class)\n"
 "    .addClass(org.hibernate.auction.Bid.class);]]>"
 
-#: index.docbook:40
+#. Tag: para
+#: configuration.xml:64
+#, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <filename>/org/hibernate/"
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
 "auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
 "xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
@@ -96,15 +116,19 @@
 "Bid.hbm.xml</literal> en el classpath. Este enfoque elimina cualquier nombre "
 "de fichero en el c&#x00f3;digo."
 
-#: index.docbook:46
+#. Tag: para
+#: configuration.xml:70
+#, fuzzy, no-c-format
 msgid ""
 "A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
-"specify configuration properties:"
+"specify configuration properties. For example:"
 msgstr ""
 "Una <literal>Configuration</literal> tambi&#x00e9;n te permite especificar "
 "propiedades de configuraci&#x00f3;n:"
 
-#: index.docbook:51
+#. Tag: programlisting
+#: configuration.xml:75
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
 "    .addClass(org.hibernate.auction.Item.class)\n"
@@ -124,15 +148,19 @@
 "test\")\n"
 "    .setProperty(\"hibernate.order_updates\", \"true\");]]>"
 
-#: index.docbook:53
+#. Tag: para
+#: configuration.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr ""
 "Esta no es la &#x00fa;nica forma de pasar propiedades de configuraci&#x00f3;"
 "n a Hibernate. La diversas opciones incluyen:"
 
-#: index.docbook:60
+#. Tag: para
+#: configuration.xml:84
+#, no-c-format
 msgid ""
 "Pass an instance of <classname>java.util.Properties</classname> to "
 "<literal>Configuration.setProperties()</literal>."
@@ -140,7 +168,9 @@
 "Pasar una instancia de <literal>java.util.Properties</literal> a "
 "<literal>Configuration.setProperties()</literal>."
 
-#: index.docbook:66
+#. Tag: para
+#: configuration.xml:90
+#, no-c-format
 msgid ""
 "Place a file named <filename>hibernate.properties</filename> in a root "
 "directory of the classpath."
@@ -148,7 +178,9 @@
 "Colocar <literal>hibernate.properties</literal> en un directorio ra&#x00ed;z "
 "del classpath."
 
-#: index.docbook:71
+#. Tag: para
+#: configuration.xml:95
+#, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
 "Dproperty=value</literal>."
@@ -156,37 +188,47 @@
 "Establecer propiedades <literal>System</literal> usando <literal>java -"
 "Dproperty=value</literal>."
 
-#: index.docbook:76
+#. Tag: para
+#: configuration.xml:100
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "Incluir elementos <literal>&lt;property&gt;</literal> en <literal>hibernate."
 "cfg.xml</literal> (discutido luego)."
 
-#: index.docbook:83
+#. Tag: para
+#: configuration.xml:107
+#, fuzzy, no-c-format
 msgid ""
-"<filename>hibernate.properties</filename> is the easiest approach if you "
-"want to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
 "<literal>hibernate.properties</literal> es el enfoque m&#x00e1;s f&#x00e1;"
 "cil si quieres comenzar r&#x00e1;pido."
 
-#: index.docbook:87
+#. Tag: para
+#: configuration.xml:111
+#, fuzzy, no-c-format
 msgid ""
 "The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
-"startup-time object, to be discarded once a <literal>SessionFactory</"
+"startup-time object that will be discarded once a <literal>SessionFactory</"
 "literal> is created."
 msgstr ""
 "La <literal>Configuration</literal> est&#x00e1; concebida como un objeto de "
 "tiempo de arranque, para ser descartado una vez que una "
 "<literal>SessionFactory</literal> es creada."
 
-#: index.docbook:95
+#. Tag: title
+#: configuration.xml:119
+#, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "Obteniendo una SessionFactory"
 
-#: index.docbook:97
+#. Tag: para
+#: configuration.xml:121
+#, no-c-format
 msgid ""
 "When all mappings have been parsed by the <classname>org.hibernate.cfg."
 "Configuration</classname>, the application must obtain a factory for "
@@ -198,11 +240,15 @@
 "de <literal>Session</literal>. Esta f&#x00e1;brica est&#x00e1; concebida "
 "para ser compartida por todas las hebras de aplicaci&#x00f3;n:"
 
-#: index.docbook:103
+#. Tag: programlisting
+#: configuration.xml:127
+#, no-c-format
 msgid "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 msgstr "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 
-#: index.docbook:105
+#. Tag: para
+#: configuration.xml:129
+#, no-c-format
 msgid ""
 "Hibernate does allow your application to instantiate more than one "
 "<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful "
@@ -212,13 +258,17 @@
 "<literal>SessionFactory</literal>. Esto es &#x00fa;til si est&#x00e1;s "
 "usando m&#x00e1;s de una base de datos."
 
-#: index.docbook:114
+#. Tag: title
+#: configuration.xml:138
+#, no-c-format
 msgid "JDBC connections"
 msgstr "Conexiones JDBC"
 
-#: index.docbook:116
+#. Tag: para
+#: configuration.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <interfacename>org.hibernate.SessionFactory</"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
 "interfacename> create and pool JDBC connections for you. If you take this "
 "approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
 "as simple as:"
@@ -227,26 +277,33 @@
 "en pool conexiones JDBC para ti. Si adoptas este enfoque, abrir una "
 "<literal>Session</literal> es tan simple como:"
 
-#: index.docbook:122
+#. Tag: programlisting
+#: configuration.xml:146
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 msgstr ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 
-#: index.docbook:124
+#. Tag: para
+#: configuration.xml:148
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "En cuanto hagas algo que requiera acceso a la base de datos, se "
 "obtendr&#x00e1; una conexi&#x00f3;n JDBC del pool."
 
-#: index.docbook:129
+#. Tag: para
+#: configuration.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <classname>org.hibernate.cfg.Environment</classname>. We will now "
-"describe the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "Para que esto funcione, necesitamos pasar algunas propiedades de "
 "conexi&#x00f3;n JDBC a Hibernate. Todos los nombres de propiedades y su "
@@ -254,78 +311,110 @@
 "cfg.Environment</literal>. Describiremos ahora las configuraciones m&#x00e1;"
 "s importantes para la conexi&#x00f3;n JDBC."
 
-#: index.docbook:135
+#. Tag: para
+#: configuration.xml:159
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <classname>java.sql."
+"Hibernate will obtain and pool connections using <classname>java.sql."
 "DriverManager</classname> if you set the following properties:"
 msgstr ""
 "Hibernate obtendr&#x00e1; (y tendr&#x00e1; en pool) conexiones usando "
 "<literal>java.sql.DriverManager</literal> si configuras las siguientes "
 "propiedades:"
 
-#: index.docbook:141
+#. Tag: title
+#: configuration.xml:165
+#, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Propiedades JDBC de Hibernate"
 
-#: index.docbook:147, index.docbook:233, index.docbook:329, index.docbook:524,
-#: index.docbook:719, index.docbook:826, index.docbook:914
+#. Tag: entry
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353
+#: configuration.xml:548 configuration.xml:743 configuration.xml:850
+#: configuration.xml:938
+#, no-c-format
 msgid "Property name"
 msgstr "Nombre de propiedad"
 
-#: index.docbook:148, index.docbook:234, index.docbook:330, index.docbook:525,
-#: index.docbook:720, index.docbook:827, index.docbook:915
+#. Tag: entry
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354
+#: configuration.xml:549 configuration.xml:744 configuration.xml:851
+#: configuration.xml:939
+#, no-c-format
 msgid "Purpose"
 msgstr "Prop&#x00f3;sito"
 
-#: index.docbook:154
+#. Tag: property
+#: configuration.xml:178
+#, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
-#: index.docbook:157
+#. Tag: emphasis
+#: configuration.xml:181
+#, no-c-format
 msgid "JDBC driver class"
 msgstr "clase del driver jdbc"
 
-#: index.docbook:162
+#. Tag: property
+#: configuration.xml:186
+#, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
-#: index.docbook:165
+#. Tag: emphasis
+#: configuration.xml:189
+#, no-c-format
 msgid "JDBC URL"
 msgstr "URL de jdbc"
 
-#: index.docbook:170, index.docbook:264
+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
+#, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
-#: index.docbook:173
+#. Tag: emphasis
+#: configuration.xml:197
+#, no-c-format
 msgid "database user"
 msgstr "usuario de base de datos"
 
-#: index.docbook:178, index.docbook:272
+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
+#, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
-#: index.docbook:181
+#. Tag: emphasis
+#: configuration.xml:205
+#, no-c-format
 msgid "database user password"
 msgstr "contrase&#x00f1;a del usuario de base de datos"
 
-#: index.docbook:186
+#. Tag: property
+#: configuration.xml:210
+#, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr "hibernate.connection.pool_size"
 
-#: index.docbook:189
+#. Tag: emphasis
+#: configuration.xml:213
+#, no-c-format
 msgid "maximum number of pooled connections"
 msgstr "n&#x00fa;mero m&#x00e1;ximo de conexiones manejadas por pooling"
 
-#: index.docbook:196
+#. Tag: para
+#: configuration.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
 "replace the <property>hibernate.connection.pool_size</property> property "
 "with connection pool specific settings. This will turn off Hibernate's "
-"internal pool. For example, you might like to use C3P0."
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "El algoritmo de pooling de conexiones propio de Hibernate es sin embargo "
 "algo rudimentario. Est&#x00e1; concebido para ayudarte a comenzar y "
@@ -337,13 +426,15 @@
 "desactivar&#x00e1; el pool interno de Hibernate. Por ejemplo, podr&#x00ed;as "
 "querer usar C3P0."
 
-#: index.docbook:206
+#. Tag: para
+#: configuration.xml:230
+#, fuzzy, no-c-format
 msgid ""
 "C3P0 is an open source JDBC connection pool distributed along with Hibernate "
 "in the <filename>lib</filename> directory. Hibernate will use its "
 "<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
 "connection pooling if you set <property>hibernate.c3p0.*</property> "
-"properties. If you'd like to use Proxool refer to the packaged "
+"properties. If you would like to use Proxool, refer to the packaged "
 "<filename>hibernate.properties</filename> and the Hibernate web site for "
 "more information."
 msgstr ""
@@ -355,14 +446,19 @@
 "literal> empaquetado y al sitio web de Hibernate para m&#x00e1;s "
 "informaci&#x00f3;n."
 
-#: index.docbook:214
+#. Tag: para
+#: configuration.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Here is an example <filename>hibernate.properties</filename> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr ""
 "Aqu&#x00ed; hay un fichero <literal>hibernate.properties</literal> de "
 "ejemplo para C3P0:"
 
-#: index.docbook:218
+#. Tag: programlisting
+#: configuration.xml:242
+#, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
 "hibernate.connection.url = jdbc:postgresql://localhost/mydatabase\n"
@@ -384,43 +480,59 @@
 "hibernate.c3p0.max_statements=50\n"
 "hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect]]>"
 
-#: index.docbook:220
+#. Tag: para
+#: configuration.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. "
-"You'll need to set at least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "Para su uso en un servidor de aplicaciones, casi siempre debes configurar "
 "Hibernate para que obtenga conexiones de un <literal>Datasource</literal> "
 "del servidor de aplicaciones registrado en JNDI. Necesitar&#x00e1;s "
 "establecer al menos una de las siguientes propiedades:"
 
-#: index.docbook:227
+#. Tag: title
+#: configuration.xml:251
+#, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Propiedades de Datasource de Hibernate"
 
-#: index.docbook:240
+#. Tag: property
+#: configuration.xml:264
+#, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr "hibernate.connection.datasource"
 
-#: index.docbook:243
+#. Tag: emphasis
+#: configuration.xml:267
+#, no-c-format
 msgid "datasource JNDI name"
 msgstr "nombre del datasource JNDI"
 
-#: index.docbook:248
+#. Tag: property
+#: configuration.xml:272
+#, no-c-format
 msgid "hibernate.jndi.url"
 msgstr "hibernate.jndi.url"
 
-#: index.docbook:250
+#. Tag: entry
+#: configuration.xml:274
+#, no-c-format
 msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr "<emphasis>URL del provedor JNDI</emphasis> (optional)"
 
-#: index.docbook:256
+#. Tag: property
+#: configuration.xml:280
+#, no-c-format
 msgid "hibernate.jndi.class"
 msgstr "hibernate.jndi.class"
 
-#: index.docbook:258
+#. Tag: entry
+#: configuration.xml:282
+#, no-c-format
 msgid ""
 "<emphasis>class of the JNDI <literal>InitialContextFactory</literal></"
 "emphasis> (optional)"
@@ -428,25 +540,33 @@
 "<emphasis>clase de la <literal>InitialContextFactory</literal> de JNDI</"
 "emphasis> (opcional)"
 
-#: index.docbook:266
+#. Tag: entry
+#: configuration.xml:290
+#, no-c-format
 msgid "<emphasis>database user</emphasis> (optional)"
 msgstr "<emphasis>usuario de base de datos</emphasis> (opcional)"
 
-#: index.docbook:274
+#. Tag: entry
+#: configuration.xml:298
+#, no-c-format
 msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 "<emphasis>contrase&#x00f1;a del usuario de base de datos</emphasis> "
 "(opcional)"
 
-#: index.docbook:282
+#. Tag: para
+#: configuration.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example <filename>hibernate.properties</filename> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "He aqu&#x00ed; un fichero <literal>hibernate.properties</literal> de ejemplo "
 "para un un datasource JNDI provisto por un servidor de aplicaciones."
 
-#: index.docbook:287
+#. Tag: programlisting
+#: configuration.xml:311
+#, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
 "hibernate.transaction.factory_class = \\\n"
@@ -462,7 +582,9 @@
 "    org.hibernate.transaction.JBossTransactionManagerLookup\n"
 "hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect]]>"
 
-#: index.docbook:289
+#. Tag: para
+#: configuration.xml:313
+#, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
 "participate in the container-managed transactions of the application server."
@@ -471,11 +593,13 @@
 "autom&#x00e1;ticamente en las transacciones del servidor de aplicaciones "
 "manejadas por contenedor."
 
-#: index.docbook:294
+#. Tag: para
+#: configuration.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
+"Arbitrary connection properties can be given by prepending "
 "\"<literal>hibernate.connection</literal>\" to the connection property name. "
-"For example, you may specify a <property>charSet</property> connection "
+"For example, you can specify a <property>charSet</property> connection "
 "property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "Pueden darse propiedades de conexi&#x00f3;n arbitrarias anteponiendo "
@@ -483,9 +607,11 @@
 "ejemplo, puedes especificar un <literal>charSet</literal> usando "
 "<literal>hibernate.connection.charSet</literal>."
 
-#: index.docbook:300
+#. Tag: para
+#: configuration.xml:324
+#, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
+"You can define your own plugin strategy for obtaining JDBC connections by "
 "implementing the interface <interfacename>org.hibernate.connection."
 "ConnectionProvider</interfacename>, and specifying your custom "
 "implementation via the <property>hibernate.connection.provider_class</"
@@ -497,25 +623,31 @@
 "personalizada estableciendo <literal>hibernate.connection.provider_class</"
 "literal>."
 
-#: index.docbook:309
+#. Tag: title
+#: configuration.xml:333
+#, no-c-format
 msgid "Optional configuration properties"
 msgstr "Par&#x00e1;metros de configuraci&#x00f3;n opcionales"
 
-#: index.docbook:311
+#. Tag: para
+#: configuration.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "Hay un n&#x00fa;mero de otras propiedades que controlan el comportamiento de "
 "Hibernate en tiempo de ejecuci&#x00f3;n. Todas son opcionales y tienen "
 "valores por defecto razonables."
 
-#: index.docbook:316
+#. Tag: warning
+#: configuration.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <filename>hibernate.properties</filename>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>Advertencia: algunas de estas propiedades son de \"nivel-de-sistema"
 "\" solamente.</emphasis>. Las propiedades a nivel de sistema s&#x00f3;lo "
@@ -523,15 +655,21 @@
 "literal> o <literal>hibernate.properties</literal>. <emphasis>No</emphasis> "
 "pueden establecerse por medio de las otras t&#x00e9;cnicas arriba descritas."
 
-#: index.docbook:323
+#. Tag: title
+#: configuration.xml:347
+#, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Propiedades de Configuraci&#x00f3;n de Hibernate"
 
-#: index.docbook:336
+#. Tag: property
+#: configuration.xml:360
+#, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
-#: index.docbook:338
+#. Tag: entry
+#: configuration.xml:362
+#, no-c-format
 msgid ""
 "The classname of a Hibernate <classname>org.hibernate.dialect.Dialect</"
 "classname> which allows Hibernate to generate SQL optimized for a particular "
@@ -541,30 +679,38 @@
 "a Hibernate generar SQL optimizado para una base de datos relacional en "
 "particular."
 
-#: index.docbook:341
+#. Tag: para
+#: configuration.xml:365
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>full.classname.of.Dialect</"
 "literal>"
 
-#: index.docbook:345
+#. Tag: para
+#: configuration.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"In most cases Hibernate will actually be able to chose the correct "
-"<classname>org.hibernate.dialect.Dialect</classname> implementation to use "
-"based on the <literal>JDBC metadata</literal> returned by the JDBC driver."
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
 msgstr ""
 "UNTRANSLATED! In most cases Hibernate will actually be able to chose the "
 "correct <classname>org.hibernate.dialect.Dialect</classname> implementation "
 "to use based on the <literal>JDBC metadata</literal> returned by the JDBC "
 "driver."
 
-#: index.docbook:354
+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr "hibernate.show_sql"
 
-#: index.docbook:356
+#. Tag: entry
+#: configuration.xml:380
+#, no-c-format
 msgid ""
 "Write all SQL statements to console. This is an alternative to setting the "
 "log category <literal>org.hibernate.SQL</literal> to <literal>debug</"
@@ -574,30 +720,41 @@
 "setting the log category <literal>org.hibernate.SQL</literal> to "
 "<literal>debug</literal>."
 
-#: index.docbook:360, index.docbook:372, index.docbook:466, index.docbook:479,
-#: index.docbook:492, index.docbook:505, index.docbook:559, index.docbook:586,
-#: index.docbook:599, index.docbook:654, index.docbook:882, index.docbook:897,
-#: index.docbook:987
+#. Tag: para
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490
+#: configuration.xml:503 configuration.xml:516 configuration.xml:529
+#: configuration.xml:583 configuration.xml:610 configuration.xml:623
+#: configuration.xml:678 configuration.xml:906 configuration.xml:921
+#: configuration.xml:1011
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 
-#: index.docbook:368
+#. Tag: property
+#: configuration.xml:392
+#, no-c-format
 msgid "hibernate.format_sql"
 msgstr "hibernate.format_sql"
 
-#: index.docbook:370
+#. Tag: entry
+#: configuration.xml:394
+#, no-c-format
 msgid "Pretty print the SQL in the log and console."
 msgstr "Pretty print the SQL in the log and console."
 
-#: index.docbook:380
+#. Tag: property
+#: configuration.xml:404
+#, no-c-format
 msgid "hibernate.default_schema"
 msgstr "hibernate.default_schema"
 
-#: index.docbook:382
+#. Tag: entry
+#: configuration.xml:406
+#, no-c-format
 msgid ""
 "Qualify unqualified table names with the given schema/tablespace in "
 "generated SQL."
@@ -605,33 +762,46 @@
 "Cualifica, en el SQL generado, los nombres de tabla sin cualificar con el "
 "esquema/tablespace dado."
 
-#: index.docbook:385
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+#. Tag: para
+#: configuration.xml:409
+#, fuzzy, no-c-format
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>SCHEMA_NAME</literal>"
 
-#: index.docbook:393
+#. Tag: property
+#: configuration.xml:417
+#, no-c-format
 msgid "hibernate.default_catalog"
 msgstr "hibernate.default_catalog"
 
-#: index.docbook:395
+#. Tag: entry
+#: configuration.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 "Cualifica, en el SQL generado, los nombres de tabla sin cualificar con el "
 "cat&#x00e1;logo dado."
 
-#: index.docbook:398
+#. Tag: para
+#: configuration.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>CATALOG_NAME</literal>"
 
-#: index.docbook:406
+#. Tag: property
+#: configuration.xml:430
+#, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr "hibernate.session_factory_name"
 
-#: index.docbook:408
+#. Tag: entry
+#: configuration.xml:432
+#, no-c-format
 msgid ""
 "The <interfacename>org.hibernate.SessionFactory</interfacename> will be "
 "automatically bound to this name in JNDI after it has been created."
@@ -639,21 +809,27 @@
 "La <literal>SessionFactory</literal> ser&#x00e1; ligada a este nombre en "
 "JNDI autom&#x00e1;ticamente despu&#x00e9;s de ser creada."
 
-#: index.docbook:411, index.docbook:853
+#. Tag: para
+#: configuration.xml:435 configuration.xml:877
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 
-#: index.docbook:419
+#. Tag: property
+#: configuration.xml:443
+#, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr "hibernate.max_fetch_depth"
 
-#: index.docbook:421
+#. Tag: entry
+#: configuration.xml:445
+#, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -662,45 +838,59 @@
 "a-uno, muchos-a-uno). Un <literal>0</literal> deshabilita la "
 "recuperaci&#x00f3;n por outer join por defecto."
 
-#: index.docbook:425
+#. Tag: para
+#: configuration.xml:449
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> valores recomendados entre "
 "<literal>0</literal> y <literal>3</literal>"
 
-#: index.docbook:434
+#. Tag: property
+#: configuration.xml:458
+#, no-c-format
 msgid "hibernate.default_batch_fetch_size"
 msgstr "hibernate.default_batch_fetch_size"
 
-#: index.docbook:436
-msgid "Set a default size for Hibernate batch fetching of associations."
+#. Tag: entry
+#: configuration.xml:460
+#, fuzzy, no-c-format
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr ""
 "Establece un tama&#x00f1;o por defecto para la recuperaci&#x00f3;n en lote "
 "de asociaciones de Hibernate."
 
-#: index.docbook:438
+#. Tag: para
+#: configuration.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> valores recomendados <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 
-#: index.docbook:447
+#. Tag: property
+#: configuration.xml:471
+#, no-c-format
 msgid "hibernate.default_entity_mode"
 msgstr "hibernate.default_entity_mode"
 
-#: index.docbook:449
+#. Tag: entry
+#: configuration.xml:473
+#, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "Establece un modo por defecto de representaci&#x00f3;n de entidades para "
 "todas las sesiones abiertas por esta <literal>SessionFactory</literal>"
 
-#: index.docbook:452
+#. Tag: para
+#: configuration.xml:476
+#, no-c-format
 msgid ""
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
 "literal>"
@@ -708,13 +898,17 @@
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
 "literal>"
 
-#: index.docbook:460
+#. Tag: property
+#: configuration.xml:484
+#, no-c-format
 msgid "hibernate.order_updates"
 msgstr "hibernate.order_updates"
 
-#: index.docbook:462
+#. Tag: entry
+#: configuration.xml:486
+#, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
@@ -722,22 +916,30 @@
 "clave primaria de los items a actualizar. Esto resultar&#x00e1; en menos "
 "bloqueos muertos de transacci&#x00f3;n en sistemas altamente concurrentes."
 
-#: index.docbook:474
+#. Tag: property
+#: configuration.xml:498
+#, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr "hibernate.generate_statistics"
 
-#: index.docbook:476
+#. Tag: entry
+#: configuration.xml:500
+#, no-c-format
 msgid ""
 "If enabled, Hibernate will collect statistics useful for performance tuning."
 msgstr ""
 "De habilitarse, Hibernate colectar&#x00e1; estad&#x00ed;sticas &#x00fa;tiles "
 "para la afinaci&#x00f3;n de rendimiento."
 
-#: index.docbook:487
+#. Tag: property
+#: configuration.xml:511
+#, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr "hibernate.use_identifer_rollback"
 
-#: index.docbook:489
+#. Tag: entry
+#: configuration.xml:513
+#, no-c-format
 msgid ""
 "If enabled, generated identifier properties will be reset to default values "
 "when objects are deleted."
@@ -745,11 +947,15 @@
 "De habilitarse, las propiedades identificadoras generadas ser&#x00e1;n "
 "reseteadas a valores por defecto cuando los objetos sean borrados."
 
-#: index.docbook:500
+#. Tag: property
+#: configuration.xml:524
+#, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr "hibernate.use_sql_comments"
 
-#: index.docbook:502
+#. Tag: entry
+#: configuration.xml:526
+#, no-c-format
 msgid ""
 "If turned on, Hibernate will generate comments inside the SQL, for easier "
 "debugging, defaults to <literal>false</literal>."
@@ -758,15 +964,21 @@
 "m&#x00e1;s f&#x00e1;cil depuraci&#x00f3;n, por defecto a <literal>false</"
 "literal>."
 
-#: index.docbook:516
+#. Tag: title
+#: configuration.xml:540
+#, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "Propiedades de JDBC y Conexiones de Hibernate"
 
-#: index.docbook:531
+#. Tag: property
+#: configuration.xml:555
+#, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr "hibernate.jdbc.fetch_size"
 
-#: index.docbook:533
+#. Tag: entry
+#: configuration.xml:557
+#, no-c-format
 msgid ""
 "A non-zero value determines the JDBC fetch size (calls <literal>Statement."
 "setFetchSize()</literal>)."
@@ -775,33 +987,43 @@
 "recuperaci&#x00f3;n de JDBC (llama a <literal>Statement.setFetchSize()</"
 "literal>)."
 
-#: index.docbook:540
+#. Tag: property
+#: configuration.xml:564
+#, no-c-format
 msgid "hibernate.jdbc.batch_size"
 msgstr "hibernate.jdbc.batch_size"
 
-#: index.docbook:542
+#. Tag: entry
+#: configuration.xml:566
+#, no-c-format
 msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr ""
 "Un valor distinto de cero habilita el uso de actualizaciones en lote de "
 "JDBC2 por Hibernate."
 
-#: index.docbook:544
+#. Tag: para
+#: configuration.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> valores recomendados entre "
 "<literal>5</literal> y <literal>30</literal>"
 
-#: index.docbook:552
+#. Tag: property
+#: configuration.xml:576
+#, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr "hibernate.jdbc.batch_versioned_data"
 
-#: index.docbook:554
+#. Tag: entry
+#: configuration.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "Establece esta propiedad a <literal>true</literal> si tu driver JDBC "
@@ -810,11 +1032,15 @@
 "DML en lote para versionar autom&#x00e1;ticamente los datos. Por defecto a "
 "<literal>false</literal>."
 
-#: index.docbook:567
+#. Tag: property
+#: configuration.xml:591
+#, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr "hibernate.jdbc.factory_class"
 
-#: index.docbook:569
+#. Tag: entry
+#: configuration.xml:593
+#, no-c-format
 msgid ""
 "Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfacename>. "
 "Most applications will not need this configuration property."
@@ -823,22 +1049,28 @@
 "las aplicaciones no necesitar&#x00e1;n esta propiedad de configuraci&#x00f3;"
 "n."
 
-#: index.docbook:572
+#. Tag: para
+#: configuration.xml:596
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 
-#: index.docbook:580
+#. Tag: property
+#: configuration.xml:604
+#, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr "hibernate.jdbc.use_scrollable_resultset"
 
-#: index.docbook:582
+#. Tag: entry
+#: configuration.xml:606
+#, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "Habilita el uso de resultados scrollables de JDBC2 por Hibernate. Esta "
@@ -846,11 +1078,15 @@
 "por el usuario, en caso contrario Hibernate usa los metadatos de "
 "conexi&#x00f3;n."
 
-#: index.docbook:594
+#. Tag: property
+#: configuration.xml:618
+#, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr "hibernate.jdbc.use_streams_for_binary"
 
-#: index.docbook:596
+#. Tag: entry
+#: configuration.xml:620
+#, no-c-format
 msgid ""
 "Use streams when writing/reading <literal>binary</literal> or "
 "<literal>serializable</literal> types to/from JDBC. <emphasis>*system-level "
@@ -859,16 +1095,20 @@
 "Usa flujos (streams) al escribir/leer tipos <literal>binary</literal> o "
 "<literal>serializable</literal> a/desde JDBC (propiedad a nivel de sistema)."
 
-#: index.docbook:607
+#. Tag: property
+#: configuration.xml:631
+#, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr "hibernate.jdbc.use_get_generated_keys"
 
-#: index.docbook:609
+#. Tag: entry
+#: configuration.xml:633
+#, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "Habilita el uso de <literal>PreparedStatement.getGeneratedKeys()</literal> "
@@ -878,16 +1118,22 @@
 "Por defecto, se intenta determinar las capacidades del driver usando los "
 "metadatos de conexi&#x00f3;n."
 
-#: index.docbook:615, index.docbook:745, index.docbook:757, index.docbook:771,
-#: index.docbook:809
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+#. Tag: para
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781
+#: configuration.xml:795 configuration.xml:833
+#, fuzzy, no-c-format
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr "<emphasis role=\"strong\">ej.</emphasis> <literal>true|false</literal>"
 
-#: index.docbook:623
+#. Tag: property
+#: configuration.xml:647
+#, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr "hibernate.connection.provider_class"
 
-#: index.docbook:625
+#. Tag: entry
+#: configuration.xml:649
+#, no-c-format
 msgid ""
 "The classname of a custom <interfacename>org.hibernate.connection."
 "ConnectionProvider</interfacename> which provides JDBC connections to "
@@ -896,22 +1142,28 @@
 "EL nombre de clase de un <literal>ConnectionProvider</literal> personalizado "
 "que provea conexiones JDBC a Hibernate."
 
-#: index.docbook:628
+#. Tag: para
+#: configuration.xml:652
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 
-#: index.docbook:636
+#. Tag: property
+#: configuration.xml:660
+#, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr "hibernate.connection.isolation"
 
-#: index.docbook:638
+#. Tag: entry
+#: configuration.xml:662
+#, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <interfacename>java.sql."
-"Connection</interfacename> for meaningful values but note that most "
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
 "databases do not support all isolation levels and some define additional, "
 "non-standard isolations."
 msgstr ""
@@ -920,36 +1172,45 @@
 "observa que la mayor&#x00ed;a de las bases de datos no soportan todos los "
 "niveles de aislamiento."
 
-#: index.docbook:642
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+#. Tag: para
+#: configuration.xml:666
+#, fuzzy, no-c-format
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
 
-#: index.docbook:650
+#. Tag: property
+#: configuration.xml:674
+#, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr "hibernate.connection.autocommit"
 
-#: index.docbook:652
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+#. Tag: entry
+#: configuration.xml:676
+#, fuzzy, no-c-format
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "Habilita compromiso autom&#x00e1;tico (autocommit) para las conexiones JDBC "
 "en pool (no recomendado)."
 
-#: index.docbook:662
+#. Tag: property
+#: configuration.xml:686
+#, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr "hibernate.connection.release_mode"
 
-#: index.docbook:664
+#. Tag: entry
+#: configuration.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "Especifica cu&#x00e1;ndo Hibernate debe liberar las conexiones JDBC. Por "
 "defecto, una conexi&#x00f3;n JDBC es retenida hasta que la sesi&#x00f3;n es "
@@ -963,20 +1224,24 @@
 "transacci&#x00f3;n y <literal>after_transaction</literal> para la estrategia "
 "JDBC de transacci&#x00f3;n."
 
-#: index.docbook:675
+#. Tag: para
+#: configuration.xml:699
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>on_close</literal> (por "
 "defecto)| <literal>after_transaction</literal> | <literal>after_statement</"
 "literal> | <literal>auto</literal>"
 
-#: index.docbook:680
+#. Tag: para
+#: configuration.xml:704
+#, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -989,13 +1254,17 @@
 "configured for use controls the connection release mode for those "
 "<literal>Session</literal>s. See"
 
-#: index.docbook:691
+#. Tag: entry
+#: configuration.xml:715
+#, no-c-format
 msgid ""
 "<property>hibernate.connection.</property><emphasis>&lt;propertyName&gt;</"
 "emphasis>"
 msgstr "hibernate.connection.<emphasis>&lt;propertyName&gt;</emphasis>"
 
-#: index.docbook:694
+#. Tag: entry
+#: configuration.xml:718
+#, no-c-format
 msgid ""
 "Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to "
 "<literal>DriverManager.getConnection()</literal>."
@@ -1003,12 +1272,16 @@
 "Pasa la propiedad JDBC <literal>propertyName</literal> a "
 "<literal>DriverManager.getConnection()</literal>."
 
-#: index.docbook:700
+#. Tag: entry
+#: configuration.xml:724
+#, no-c-format
 msgid ""
 "<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;</emphasis>"
 msgstr "hibernate.jndi.<emphasis>&lt;propertyName&gt;</emphasis>"
 
-#: index.docbook:703
+#. Tag: entry
+#: configuration.xml:727
+#, no-c-format
 msgid ""
 "Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI "
 "<literal>InitialContextFactory</literal>."
@@ -1016,34 +1289,46 @@
 "Pasa la propiedad <literal>propertyName</literal> a "
 "<literal>InitialContextFactory</literal> de JNDI."
 
-#: index.docbook:713
+#. Tag: title
+#: configuration.xml:737
+#, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Propiedades de Cach&#x00e9; de Hibernate"
 
-#: index.docbook:726
+#. Tag: literal
+#: configuration.xml:750
+#, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr "hibernate.cache.provider_class"
 
-#: index.docbook:728
+#. Tag: entry
+#: configuration.xml:752
+#, no-c-format
 msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr ""
 "El nombre de clase de un <literal>CacheProvider</literal> personalizado."
 
-#: index.docbook:730
+#. Tag: para
+#: configuration.xml:754
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 
-#: index.docbook:738
+#. Tag: literal
+#: configuration.xml:762
+#, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr "hibernate.cache.use_minimal_puts"
 
-#: index.docbook:740
+#. Tag: entry
+#: configuration.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1053,24 +1338,32 @@
 "est&#x00e1; habilitado por defecto para implementaciones de cach&#x00e9; en "
 "cluster."
 
-#: index.docbook:753
+#. Tag: literal
+#: configuration.xml:777
+#, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr "hibernate.cache.use_query_cache"
 
-#: index.docbook:755
+#. Tag: entry
+#: configuration.xml:779
+#, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 "Habilita el cach&#x00e9; de lectura, consultas individuales todav&#x00ed;a "
 "tienen que ponerse cachables."
 
-#: index.docbook:765
+#. Tag: literal
+#: configuration.xml:789
+#, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr "hibernate.cache.use_second_level_cache"
 
-#: index.docbook:767
+#. Tag: entry
+#: configuration.xml:791
+#, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1078,11 +1371,15 @@
 "nivel, que est&#x00e1; habilitado por defecto para clases que especifican un "
 "mapeo <literal>&lt;cache&gt;</literal>."
 
-#: index.docbook:779
+#. Tag: literal
+#: configuration.xml:803
+#, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr "hibernate.cache.query_cache_factory"
 
-#: index.docbook:781
+#. Tag: entry
+#: configuration.xml:805
+#, no-c-format
 msgid ""
 "The classname of a custom <literal>QueryCache</literal> interface, defaults "
 "to the built-in <literal>StandardQueryCache</literal>."
@@ -1091,33 +1388,45 @@
 "personalizada, por defecto al <literal>StandardQueryCache</literal> "
 "prefabricado."
 
-#: index.docbook:784
+#. Tag: para
+#: configuration.xml:808
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 
-#: index.docbook:792
+#. Tag: literal
+#: configuration.xml:816
+#, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr "hibernate.cache.region_prefix"
 
-#: index.docbook:794
+#. Tag: entry
+#: configuration.xml:818
+#, no-c-format
 msgid "A prefix to use for second-level cache region names."
 msgstr ""
 "Un prefijo a usar para los nombres de regi&#x00f3;n del cach&#x00e9; de "
 "segundo nivel."
 
-#: index.docbook:796
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+#. Tag: para
+#: configuration.xml:820
+#, fuzzy, no-c-format
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr "<emphasis role=\"strong\">ej.</emphasis> <literal>prefix</literal>"
 
-#: index.docbook:804
+#. Tag: literal
+#: configuration.xml:828
+#, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr "hibernate.cache.use_structured_entries"
 
-#: index.docbook:806
+#. Tag: entry
+#: configuration.xml:830
+#, no-c-format
 msgid ""
 "Forces Hibernate to store data in the second-level cache in a more human-"
 "friendly format."
@@ -1125,15 +1434,21 @@
 "Fuerza a Hibernate a almacenar los datos en el cach&#x00e9; de segundo nivel "
 "en un formato m&#x00e1;s amigable al humano."
 
-#: index.docbook:820
+#. Tag: title
+#: configuration.xml:844
+#, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Propiedades de Transacci&#x00f3;n de Hibernate"
 
-#: index.docbook:833
+#. Tag: literal
+#: configuration.xml:857
+#, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr "hibernate.transaction.factory_class"
 
-#: index.docbook:835
+#. Tag: entry
+#: configuration.xml:859
+#, no-c-format
 msgid ""
 "The classname of a <literal>TransactionFactory</literal> to use with "
 "Hibernate <literal>Transaction</literal> API (defaults to "
@@ -1143,19 +1458,25 @@
 "API de <literal>Transaction</literal> de Hibernate (por defectoa "
 "<literal>JDBCTransactionFactory</literal>)."
 
-#: index.docbook:839
+#. Tag: para
+#: configuration.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 
-#: index.docbook:847
+#. Tag: literal
+#: configuration.xml:871
+#, no-c-format
 msgid "jta.UserTransaction"
 msgstr "jta.UserTransaction"
 
-#: index.docbook:849
+#. Tag: entry
+#: configuration.xml:873
+#, no-c-format
 msgid ""
 "A JNDI name used by <literal>JTATransactionFactory</literal> to obtain the "
 "JTA <literal>UserTransaction</literal> from the application server."
@@ -1164,33 +1485,43 @@
 "obtener la <literal>UserTransaction</literal> JTA del servidor de "
 "aplicaciones."
 
-#: index.docbook:861
+#. Tag: literal
+#: configuration.xml:885
+#, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr "hibernate.transaction.manager_lookup_class"
 
-#: index.docbook:863
+#. Tag: entry
+#: configuration.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "El nombre de clase de un <literal>TransactionManagerLookup</literal> "
 "requerido cuando el chach&#x00e9; a nivel de JVM est&#x00e1; habilitado o "
 "cuando se usa un generador alto/bajo en un entorno JTA."
 
-#: index.docbook:867
+#. Tag: para
+#: configuration.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 
-#: index.docbook:875
+#. Tag: literal
+#: configuration.xml:899
+#, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr "hibernate.transaction.flush_before_completion"
 
-#: index.docbook:877
+#. Tag: entry
+#: configuration.xml:901
+#, no-c-format
 msgid ""
 "If enabled, the session will be automatically flushed during the before "
 "completion phase of the transaction. Built-in and automatic session context "
@@ -1201,14 +1532,18 @@
 "ticamente durante la fase previa a la compleci&#x00f3;n de la "
 "transacci&#x00f3;n. (Muy &#x00fa;til cuando se usa Hibernate con CMT)."
 
-#: index.docbook:890
+#. Tag: literal
+#: configuration.xml:914
+#, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr "hibernate.transaction.auto_close_session"
 
-#: index.docbook:892
+#. Tag: entry
+#: configuration.xml:916
+#, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -1216,17 +1551,23 @@
 "durante la fase posterior a la compleci&#x00f3;n de la transacci&#x00f3;n. "
 "(Muy &#x00fa;til cuando se usa Hibernate con CMT)."
 
-#: index.docbook:908
+#. Tag: title
+#: configuration.xml:932
+#, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "Propiedades Miscel&#x00e1;neas"
 
-#: index.docbook:921
+#. Tag: literal
+#: configuration.xml:945
+#, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr "hibernate.current_session_context_class"
 
-#: index.docbook:923
+#. Tag: entry
+#: configuration.xml:947
+#, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -1234,9 +1575,11 @@
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 
-#: index.docbook:928
+#. Tag: para
+#: configuration.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -1244,17 +1587,23 @@
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 
-#: index.docbook:937
+#. Tag: literal
+#: configuration.xml:961
+#, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr "hibernate.query.factory_class"
 
-#: index.docbook:939
+#. Tag: entry
+#: configuration.xml:963
+#, no-c-format
 msgid "Chooses the HQL parser implementation."
 msgstr "Elige la implementaci&#x00f3;n de parser HQL."
 
-#: index.docbook:941
+#. Tag: para
+#: configuration.xml:965
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -1262,34 +1611,44 @@
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 
-#: index.docbook:950
+#. Tag: literal
+#: configuration.xml:974
+#, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr "hibernate.query.substitutions"
 
-#: index.docbook:952
+#. Tag: entry
+#: configuration.xml:976
+#, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "Mapeos de s&#x00ed;mbolos en consultas Hibernate a s&#x00ed;mbolos SQL. (los "
 "s&#x00ed;mbolos puedem ser nombres de funci&#x00f3;n o literales, por "
 "ejemplo)."
 
-#: index.docbook:955
+#. Tag: para
+#: configuration.xml:979
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 
-#: index.docbook:963
+#. Tag: literal
+#: configuration.xml:987
+#, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr "hibernate.hbm2ddl.auto"
 
-#: index.docbook:965
+#. Tag: entry
+#: configuration.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -1299,25 +1658,31 @@
 "esquema de base de datos ser&#x00e1; desechado cuando la "
 "<literal>SessionFactory</literal> se cierre expl&#x00ed;citamente."
 
-#: index.docbook:971
+#. Tag: para
+#: configuration.xml:995
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ej.</emphasis> <literal>update</literal> | "
 "<literal>create</literal> | <literal>create-drop</literal>"
 
-#: index.docbook:980
+#. Tag: literal
+#: configuration.xml:1004
+#, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr "hibernate.cglib.use_reflection_optimizer"
 
-#: index.docbook:982
+#. Tag: entry
+#: configuration.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "Habilita el uso de CGLIB en vez de reflecc&#x00f3;n en tiempo de "
 "ejecuci&#x00f3;n (propiedad a nivel de sistema). La reflecci&#x00f3;n a "
@@ -1325,17 +1690,21 @@
 "que Hibernate siempre requiere CGLIB incluso si desactivas el optimizador. "
 "No puedes establecer esta propiedad en <literal>hibernate.cfg.xml</literal>."
 
-#: index.docbook:998
+#. Tag: title
+#: configuration.xml:1022
+#, no-c-format
 msgid "SQL Dialects"
 msgstr "SQL Dialects"
 
-#: index.docbook:1000
+#. Tag: para
+#: configuration.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "You should always set the <literal>hibernate.dialect</literal> property to "
 "the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
@@ -1343,207 +1712,317 @@
 "defaults for some of the other properties listed above, saving you the "
 "effort of specifying them manually."
 
-#: index.docbook:1008
+#. Tag: title
+#: configuration.xml:1032
+#, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Dialectos SQL de Hibernate(<literal>hibernate.dialect</literal>)"
 
-#: index.docbook:1016
+#. Tag: entry
+#: configuration.xml:1040
+#, no-c-format
 msgid "RDBMS"
 msgstr "RDBMS"
 
-#: index.docbook:1017
+#. Tag: entry
+#: configuration.xml:1041
+#, no-c-format
 msgid "Dialect"
 msgstr "Dialecto"
 
-#: index.docbook:1022
+#. Tag: entry
+#: configuration.xml:1046
+#, no-c-format
 msgid "<entry>DB2</entry>"
 msgstr "<entry>DB2</entry>"
 
-#: index.docbook:1022
+#. Tag: literal
+#: configuration.xml:1046
+#, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr "org.hibernate.dialect.DB2Dialect"
 
-#: index.docbook:1025
+#. Tag: entry
+#: configuration.xml:1049
+#, no-c-format
 msgid "DB2 AS/400"
 msgstr "DB2 AS/400"
 
-#: index.docbook:1025
+#. Tag: literal
+#: configuration.xml:1049
+#, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr "org.hibernate.dialect.DB2400Dialect"
 
-#: index.docbook:1028
+#. Tag: entry
+#: configuration.xml:1052
+#, no-c-format
 msgid "DB2 OS390"
 msgstr "DB2 OS390"
 
-#: index.docbook:1028
+#. Tag: literal
+#: configuration.xml:1052
+#, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr "org.hibernate.dialect.DB2390Dialect"
 
-#: index.docbook:1031
+#. Tag: entry
+#: configuration.xml:1055
+#, no-c-format
 msgid "PostgreSQL"
 msgstr "PostgreSQL"
 
-#: index.docbook:1031
+#. Tag: literal
+#: configuration.xml:1055
+#, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr "org.hibernate.dialect.PostgreSQLDialect"
 
-#: index.docbook:1034
+#. Tag: entry
+#: configuration.xml:1058
+#, no-c-format
 msgid "MySQL"
 msgstr "MySQL"
 
-#: index.docbook:1034
+#. Tag: literal
+#: configuration.xml:1058
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr "org.hibernate.dialect.MySQLDialect"
 
-#: index.docbook:1037
+#. Tag: entry
+#: configuration.xml:1061
+#, no-c-format
 msgid "MySQL with InnoDB"
 msgstr "MySQL con InnoDB"
 
-#: index.docbook:1037
+#. Tag: literal
+#: configuration.xml:1061
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr "org.hibernate.dialect.MySQLInnoDBDialect"
 
-#: index.docbook:1040
+#. Tag: entry
+#: configuration.xml:1064
+#, no-c-format
 msgid "MySQL with MyISAM"
 msgstr "MySQL con MyISAM"
 
-#: index.docbook:1040
+#. Tag: literal
+#: configuration.xml:1064
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr "org.hibernate.dialect.MySQLMyISAMDialect"
 
-#: index.docbook:1043
+#. Tag: entry
+#: configuration.xml:1067
+#, no-c-format
 msgid "Oracle (any version)"
 msgstr "Oracle (cualquier versi&#x00f3;n)"
 
-#: index.docbook:1043
+#. Tag: literal
+#: configuration.xml:1067
+#, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr "org.hibernate.dialect.OracleDialect"
 
-#: index.docbook:1046
-msgid "Oracle 9i/10g"
+#. Tag: entry
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
-#: index.docbook:1046
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#. Tag: literal
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
-#: index.docbook:1049
+#. Tag: entry
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
+#, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
-#: index.docbook:1049
+#. Tag: literal
+#: configuration.xml:1076
+#, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
-#: index.docbook:1052
+#. Tag: entry
+#: configuration.xml:1079
+#, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
-#: index.docbook:1052
+#. Tag: literal
+#: configuration.xml:1079
+#, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
-#: index.docbook:1055
+#. Tag: entry
+#: configuration.xml:1082
+#, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
-#: index.docbook:1055
+#. Tag: literal
+#: configuration.xml:1082
+#, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
-#: index.docbook:1058
+#. Tag: entry
+#: configuration.xml:1085
+#, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
-#: index.docbook:1058
+#. Tag: literal
+#: configuration.xml:1085
+#, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
-#: index.docbook:1061
+#. Tag: entry
+#: configuration.xml:1088
+#, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
-#: index.docbook:1061
+#. Tag: literal
+#: configuration.xml:1088
+#, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
-#: index.docbook:1064
+#. Tag: entry
+#: configuration.xml:1091
+#, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
-#: index.docbook:1064
+#. Tag: literal
+#: configuration.xml:1091
+#, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
-#: index.docbook:1067
+#. Tag: entry
+#: configuration.xml:1094
+#, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
-#: index.docbook:1067
+#. Tag: literal
+#: configuration.xml:1094
+#, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
-#: index.docbook:1070
+#. Tag: entry
+#: configuration.xml:1097
+#, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
-#: index.docbook:1070
+#. Tag: literal
+#: configuration.xml:1097
+#, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
-#: index.docbook:1073
+#. Tag: entry
+#: configuration.xml:1100
+#, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
-#: index.docbook:1073
+#. Tag: literal
+#: configuration.xml:1100
+#, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
-#: index.docbook:1076
+#. Tag: entry
+#: configuration.xml:1103
+#, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
-#: index.docbook:1076
+#. Tag: literal
+#: configuration.xml:1103
+#, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
-#: index.docbook:1079
+#. Tag: entry
+#: configuration.xml:1106
+#, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
-#: index.docbook:1079
+#. Tag: literal
+#: configuration.xml:1106
+#, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
-#: index.docbook:1082
+#. Tag: entry
+#: configuration.xml:1109
+#, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
-#: index.docbook:1082
+#. Tag: literal
+#: configuration.xml:1109
+#, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
-#: index.docbook:1085
+#. Tag: entry
+#: configuration.xml:1112
+#, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
-#: index.docbook:1085
+#. Tag: literal
+#: configuration.xml:1112
+#, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
-#: index.docbook:1094
+#. Tag: title
+#: configuration.xml:1121
+#, no-c-format
 msgid "Outer Join Fetching"
 msgstr "Recuperaci&#x00f3;n por Uni&#x00f3;n Externa (Outer Join Fetching)"
 
-#: index.docbook:1096
+#. Tag: para
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "Si tu base de datos soporta uniones externas del estilo ANSI, Oracle o "
 "Sybase, la <emphasis>recuperaci&#x00f3;n por uni&#x00f3;n externa</emphasis> "
@@ -1554,12 +2033,14 @@
 "asociaciones muchos-a-uno, uno-a-muchos, muchos-a-muchos y uno-a-uno sea "
 "tra&#x00ed;do en una sola <literal>SELECT</literal> SQL."
 
-#: index.docbook:1105
+#. Tag: para
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "La recuperaci&#x00f3;n por uni&#x00f3;n externa puede ser deshabilitada "
@@ -1569,20 +2050,26 @@
 "uni&#x00f3;n externa para asociaciones uno-a-uno y muchos-a-uno que hayan "
 "sido mapeadas con <literal>fetch=\"join\"</literal>."
 
-#: index.docbook:1113
+#. Tag: para
+#: configuration.xml:1140
+#, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr ""
 "Ver <xref linkend=\"performance-fetching\"/> para m&#x00e1;s "
 "informaci&#x00f3;n."
 
-#: index.docbook:1120
+#. Tag: title
+#: configuration.xml:1147
+#, no-c-format
 msgid "Binary Streams"
 msgstr "Flujos Binarios"
 
-#: index.docbook:1122
+#. Tag: para
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -1593,65 +2080,86 @@
 "habilitar <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>Esta es una propiedad a nivel de sistema solamente.</emphasis>"
 
-#: index.docbook:1133
+#. Tag: title
+#: configuration.xml:1160
+#, no-c-format
 msgid "Second-level and query cache"
 msgstr "Cach&#x00e9; de segundo nivel y de lectura"
 
-#: index.docbook:1135
+#. Tag: para
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "Las propiedades prefijadas por <literal>hibernate.cache</literal> te "
 "permiten usar un sistema de cach&#x00e9; de segundo nivel en el &#x00e1;"
 "mbito de un proceso o cluster con Hibernate. Ver <xref linkend=\"performance-"
 "cache\"/> para m&#x00e1;s detalles."
 
-#: index.docbook:1145
+#. Tag: title
+#: configuration.xml:1172
+#, no-c-format
 msgid "Query Language Substitution"
 msgstr "Sustituci&#x00f3;n de Lenguaje de Consulta"
 
-#: index.docbook:1147
+#. Tag: para
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "Puedes definir nuevos s&#x00ed;mbolos de consulta de Hibernate usando "
 "<literal>hibernate.query.substitutions</literal>. Por ejemplo:"
 
-#: index.docbook:1152
+#. Tag: programlisting
+#: configuration.xml:1179
+#, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions true=1, false=0"
 
-#: index.docbook:1154
+#. Tag: para
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "causar&#x00ed;a que los s&#x00ed;mbolos <literal>true</literal> y "
 "<literal>false</literal> sean traducidos a literales enteros en el SQL "
 "generado."
 
-#: index.docbook:1159
+#. Tag: programlisting
+#: configuration.xml:1186
+#, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
-#: index.docbook:1161
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#. Tag: para
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
 "te permitir&#x00ed;a renombrar la funci&#x00f3;n <literal>LOWER</literal> de "
 "SQL."
 
-#: index.docbook:1168
+#. Tag: title
+#: configuration.xml:1195
+#, no-c-format
 msgid "Hibernate statistics"
 msgstr "Hibernate statistics"
 
-#: index.docbook:1170
+#. Tag: para
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -1663,35 +2171,35 @@
 "interfaces en <literal>org.hibernate.stats</literal> para m&#x00e1;s "
 "informaci&#x00f3;n."
 
-#: index.docbook:1182
+#. Tag: title
+#: configuration.xml:1209
+#, no-c-format
 msgid "Logging"
 msgstr "Registros de mensajes (Logging)"
 
-#: index.docbook:1184
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr "Hibernate registra varios eventos usando commons-logging de Apache."
-
-#: index.docbook:1188
+#. Tag: para
+#: configuration.xml:1211
+#, no-c-format
 msgid ""
-"The commons-logging service will direct output to either Apache Log4j (if "
-"you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
-"logging (if running under JDK1.4 or above). You may download Log4j from "
-"<literal>http://jakarta.apache.org</literal>. To use Log4j you will need to "
-"place a <literal>log4j.properties</literal> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
+"Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
+"can direct your logging output to several logging frameworks (NOP, Simple, "
+"log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
-"El servicio de commons-logging saldr&#x00e1; directamente ya sea a Log4J (si "
-"incluyes <literal>log4j.jar</literal> in your classpath) o JDK1.4 logging "
-"(al ejecutar bajo JDK1.4 o superior). Puedes descargar Log4J desde "
-"<literal>http://logging.apache.org</literal>. Para usar Log4J "
-"necesitar&#x00e1;s colocar un fichero <literal>log4j.properties</literal> en "
-"tu classpath. Un fichero de propiedades de ejemplo se distribuye con "
-"Hibernate en el directorio <literal>src/</literal>."
 
-#: index.docbook:1198
+#. Tag: para
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -1703,47 +2211,69 @@
 "dispositivo esencial en la resoluci&#x00f3;n de problemas. Las "
 "categor&#x00ed;as de registro m&#x00e1;s interesantes son las siguientes:"
 
-#: index.docbook:1207
+#. Tag: title
+#: configuration.xml:1231
+#, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Categor&#x00ed;as de Registro de Hibernate"
 
-#: index.docbook:1213
+#. Tag: entry
+#: configuration.xml:1237
+#, no-c-format
 msgid "Category"
 msgstr "Categor&#x00ed;a"
 
-#: index.docbook:1214
+#. Tag: entry
+#: configuration.xml:1238
+#, no-c-format
 msgid "Function"
 msgstr "Funci&#x00f3;n"
 
-#: index.docbook:1219
+#. Tag: literal
+#: configuration.xml:1243
+#, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
-#: index.docbook:1220
+#. Tag: entry
+#: configuration.xml:1244
+#, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr "Registra todas las sentencias DML de SQL a medida que se ejecutan"
 
-#: index.docbook:1223
+#. Tag: literal
+#: configuration.xml:1247
+#, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
-#: index.docbook:1224
+#. Tag: entry
+#: configuration.xml:1248
+#, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "Registra todos los par&#x00e1;metros JDBC"
 
-#: index.docbook:1227
+#. Tag: literal
+#: configuration.xml:1251
+#, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
-#: index.docbook:1228
+#. Tag: entry
+#: configuration.xml:1252
+#, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr "Registra todas las sentencias DDL de SQL a medida que se ejecutan"
 
-#: index.docbook:1231
+#. Tag: literal
+#: configuration.xml:1255
+#, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
-#: index.docbook:1232
+#. Tag: entry
+#: configuration.xml:1256
+#, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
 "at flush time"
@@ -1751,60 +2281,87 @@
 "Registra el estado de todas las entidades (m&#x00e1;ximo de 20 entidades) "
 "asociadas con la sesi&#x00f3;n en tiempo de limpieza (flush)"
 
-#: index.docbook:1238
+#. Tag: literal
+#: configuration.xml:1262
+#, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
-#: index.docbook:1239
+#. Tag: entry
+#: configuration.xml:1263
+#, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "Registra toda la actividad del cach&#x00e9; de segundo nivel"
 
-#: index.docbook:1242
+#. Tag: literal
+#: configuration.xml:1266
+#, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
-#: index.docbook:1243
+#. Tag: entry
+#: configuration.xml:1267
+#, no-c-format
 msgid "Log transaction related activity"
 msgstr "Registra la actividad relacionada con la transacci&#x00f3;n"
 
-#: index.docbook:1246
+#. Tag: literal
+#: configuration.xml:1270
+#, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
-#: index.docbook:1247
+#. Tag: entry
+#: configuration.xml:1271
+#, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "Registra toda adquisici&#x00f3;n de recursos JDBC"
 
-#: index.docbook:1250
+#. Tag: literal
+#: configuration.xml:1274
+#, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast"
 
-#: index.docbook:1251
+#. Tag: entry
+#: configuration.xml:1275
+#, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
 "Regista los ASTs de HQL y SQL, as&#x00ed; como otra informaci&#x00f3;n sobre "
 "an&#x00e1;lisis de consultas."
 
-#: index.docbook:1256
+#. Tag: literal
+#: configuration.xml:1280
+#, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
-#: index.docbook:1257
+#. Tag: entry
+#: configuration.xml:1281
+#, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "Registra todas las peticiones de autorizaci&#x00f3;n JAAS"
 
-#: index.docbook:1260
+#. Tag: literal
+#: configuration.xml:1284
+#, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
-#: index.docbook:1261
+#. Tag: entry
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr ""
 "Registra todo (mucha informaci&#x00f3;n, pero muy &#x00fa;til para la "
 "resoluci&#x00f3;n de problemas)"
 
-#: index.docbook:1270
+#. Tag: para
+#: configuration.xml:1294
+#, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
 "with <literal>debug</literal> enabled for the category <literal>org."
@@ -1816,11 +2373,15 @@
 "hibernate.SQL</literal> o, alternativamente, la propiedad <literal>hibernate."
 "show_sql</literal> habilitada."
 
-#: index.docbook:1280
+#. Tag: title
+#: configuration.xml:1304
+#, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "Implementando una <literal>NamingStrategy</literal>"
 
-#: index.docbook:1282
+#. Tag: para
+#: configuration.xml:1306
+#, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
 "to specify a \"naming standard\" for database objects and schema elements."
@@ -1829,9 +2390,11 @@
 "especificar un \"est&#x00e1;ndar de nombrado\" para objetos de la base de "
 "datos y elementos de esquema."
 
-#: index.docbook:1287
+#. Tag: para
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -1846,16 +2409,20 @@
 "(prefijos <literal>TBL_</literal>, por ejemplo). La estrategia por defecto "
 "usada por Hibernate m&#x00ed;nima en absoluto."
 
-#: index.docbook:1296
+#. Tag: para
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "Puedes especificar una estrategia diferente llamando a "
 "<literal>Configuration.setNamingStrategy()</literal> antes de agregar los "
 "mapeos:"
 
-#: index.docbook:1301
+#. Tag: programlisting
+#: configuration.xml:1325
+#, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
 "    .setNamingStrategy(ImprovedNamingStrategy.INSTANCE)\n"
@@ -1869,7 +2436,9 @@
 "    .addFile(\"Bid.hbm.xml\")\n"
 "    .buildSessionFactory();]]>"
 
-#: index.docbook:1303
+#. Tag: para
+#: configuration.xml:1327
+#, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
 "strategy that might be a useful starting point for some applications."
@@ -1878,11 +2447,15 @@
 "estrategia prefabricada que puede ser un punto de partida &#x00fa;til para "
 "algunas aplicaciones."
 
-#: index.docbook:1311
+#. Tag: title
+#: configuration.xml:1335
+#, no-c-format
 msgid "XML configuration file"
 msgstr "Fichero de configuraci&#x00f3;n XML"
 
-#: index.docbook:1313
+#. Tag: para
+#: configuration.xml:1337
+#, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
 "in a file named <literal>hibernate.cfg.xml</literal>. This file can be used "
@@ -1895,15 +2468,19 @@
 "<literal>hibernate.properties</literal> o, si ambos est&#x00e1;n presentes, "
 "para sobrescribir propiedades."
 
-#: index.docbook:1320
+#. Tag: para
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "El fichero de configuraci&#x00f3;n XML se espera por defecto en la ra&#x00ed;"
 "z o tu <literal>CLASSPATH</literal>. He aqu&#x00ed; un ejemplo:"
 
-#: index.docbook:1325
+#. Tag: programlisting
+#: configuration.xml:1349
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
 "<!DOCTYPE hibernate-configuration PUBLIC\n"
@@ -1983,14 +2560,16 @@
 "\n"
 "</hibernate-configuration>]]>"
 
-#: index.docbook:1327
+#. Tag: para
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "Como puedes ver, la ventaja de este enfoque es la externalizaci&#x00f3;n de "
 "los nombres de los fichero de mapeo a configuraci&#x00f3;n. El "
@@ -2000,11 +2579,15 @@
 "o <literal>hibernate.cfg.xml</literal>, ambos son equivalentes, excepto por "
 "los beneficios de usar la sintaxis XML arriba mencionados."
 
-#: index.docbook:1336
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#. Tag: para
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr "Con la configuraci&#x00f3;n XML, arrancar Hibernate es tan simple como"
 
-#: index.docbook:1340
+#. Tag: programlisting
+#: configuration.xml:1364
+#, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
 "buildSessionFactory();]]>"
@@ -2012,11 +2595,15 @@
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
 "buildSessionFactory();]]>"
 
-#: index.docbook:1342
-msgid "You can pick a different XML configuration file using"
+#. Tag: para
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "Puedes tomar un fichero XML diferente usando"
 
-#: index.docbook:1346
+#. Tag: programlisting
+#: configuration.xml:1370
+#, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
 "    .configure(\"catdb.cfg.xml\")\n"
@@ -2026,25 +2613,31 @@
 "    .configure(\"catdb.cfg.xml\")\n"
 "    .buildSessionFactory();]]>"
 
-#: index.docbook:1351
+#. Tag: title
+#: configuration.xml:1375
+#, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "Integraci&#x00f3; con Servidores de Aplicaciones J2EE"
 
-#: index.docbook:1353
+#. Tag: para
+#: configuration.xml:1377
+#, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr ""
 "Hibernate tiene los siguientes puntos de integraci&#x00f3;n con la "
 "infraestructura J2EE:"
 
-#: index.docbook:1359
+#. Tag: para
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>Datasources manejados por contenedor</emphasis>: Hibernate puede "
@@ -2058,7 +2651,9 @@
 "<literal>Transaction</literal> de Hibernate para mantener tu c&#x00f3;digo "
 "portable."
 
-#: index.docbook:1374
+#. Tag: para
+#: configuration.xml:1398
+#, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
 "<literal>SessionFactory</literal> to JNDI after startup."
@@ -2066,14 +2661,16 @@
 "<emphasis>Ligamento Autom&#x00e1;tico JNDI</emphasis>: Hibernate puede ligar "
 "sus <literal>SessionFactory</literal> a JNDI despu&#x00e9;s del arranque."
 
-#: index.docbook:1383
+#. Tag: para
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>Ligamento de Sesi&#x00f3;n JTA:</emphasis> La <literal>Session</"
@@ -2085,15 +2682,17 @@
 "n JTA. La demarcaci&#x00f3;n de transacci&#x00f3;n es declarativa, en "
 "descriptores de despliegue de EJB."
 
-#: index.docbook:1396
+#. Tag: para
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>Despliegue JMX:</emphasis> Si tienes un servidor de aplicaciones "
 "capaz de JMX (por ejemplo, JBoss AS), puedes optar por desplegar Hibernate "
@@ -2104,7 +2703,9 @@
 "cuidar&#x00e1; de las dependencias entre servicios (El datasource debe estar "
 "disponible antes que arranque Hibernate, etc)."
 
-#: index.docbook:1407
+#. Tag: para
+#: configuration.xml:1431
+#, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
 "option <literal>hibernate.connection.aggressive_release</literal> to true if "
@@ -2115,15 +2716,19 @@
 "aggressive_release</literal> a true si tu servidor de aplicaciones muestra "
 "excepciones \"connection containment\"."
 
-#: index.docbook:1414
+#. Tag: title
+#: configuration.xml:1438
+#, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "Configuraci&#x00f3;n de la estrategia de transacci&#x00f3;n"
 
-#: index.docbook:1416
+#. Tag: para
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -2136,7 +2741,9 @@
 "usar transacciones manejadas por bean y llamar la API de JTA y "
 "<literal>UserTransaction</literal> cuando sea necesario."
 
-#: index.docbook:1424
+#. Tag: para
+#: configuration.xml:1448
+#, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
 "recommend the optional Hibernate <literal>Transaction</literal> API, which "
@@ -2152,57 +2759,75 @@
 "estableciendo la propiedad de configuraci&#x00f3;n <literal>hibernate."
 "transaction.factory_class</literal> de Hibernate."
 
-#: index.docbook:1431
-msgid "There are three standard (built-in) choices:"
+#. Tag: para
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "Hay tres elecciones est&#x00e1;ndar (prefabricadas):"
 
-#: index.docbook:1437
+#. Tag: literal
+#: configuration.xml:1461
+#, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "org.hibernate.transaction.JDBCTransactionFactory"
 
-#: index.docbook:1439
+#. Tag: para
+#: configuration.xml:1463
+#, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr "delega a transacciones de base de datos (JDBC) (por defecto)"
 
-#: index.docbook:1443
+#. Tag: literal
+#: configuration.xml:1467
+#, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
-#: index.docbook:1445
+#. Tag: para
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "delega a transacciones manejadas por contenedor si una transacci&#x00f3;n "
 "existente est&#x00f3; por debajo en este contexto (ej. m&#x00e9;todo de un "
 "bean de sesi&#x00f3;n EJB), en otro caso una nueva transacci&#x00f3;n es "
 "comenzada y se usan transacciones manejadas por bean."
 
-#: index.docbook:1453
+#. Tag: literal
+#: configuration.xml:1477
+#, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
-#: index.docbook:1455
+#. Tag: para
+#: configuration.xml:1479
+#, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "delega a transacciones JTA manejadas por contenedor"
 
-#: index.docbook:1460
+#. Tag: para
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr ""
 "Puedes definir tambi&#x00e9;n tus propias estrategias de transacci&#x00f3;n "
 "(para un servicio de transacci&#x00f3;n CORBA, por ejemplo)."
 
-#: index.docbook:1465
+#. Tag: para
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Algunas funcionalidades en Hibernate (ej, el cach&#x00e9; de segundo nivel, "
 "ligamento autom&#x00e1;tico de JTA y Session, etc.) requieren acceso al "
@@ -2211,108 +2836,158 @@
 "obtener una referencia al <literal>TransactionManager</literal>, pues J2EE "
 "no estandariza un solo mecanismo:"
 
-#: index.docbook:1473
+#. Tag: title
+#: configuration.xml:1497
+#, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "TransactionManagers de JTA"
 
-#: index.docbook:1479
+#. Tag: entry
+#: configuration.xml:1503
+#, no-c-format
 msgid "Transaction Factory"
 msgstr "Transaction Factory"
 
-#: index.docbook:1480
+#. Tag: entry
+#: configuration.xml:1504
+#, no-c-format
 msgid "Application Server"
 msgstr "Servidor de Aplicaciones"
 
-#: index.docbook:1485
+#. Tag: literal
+#: configuration.xml:1509
+#, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
-#: index.docbook:1486
+#. Tag: entry
+#: configuration.xml:1510
+#, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
-#: index.docbook:1489
+#. Tag: literal
+#: configuration.xml:1513
+#, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
-#: index.docbook:1490
+#. Tag: entry
+#: configuration.xml:1514
+#, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
-#: index.docbook:1493
+#. Tag: literal
+#: configuration.xml:1517
+#, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
-#: index.docbook:1494
+#. Tag: entry
+#: configuration.xml:1518
+#, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
-#: index.docbook:1497
+#. Tag: literal
+#: configuration.xml:1521
+#, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
-#: index.docbook:1498
+#. Tag: entry
+#: configuration.xml:1522
+#, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
-#: index.docbook:1501
+#. Tag: literal
+#: configuration.xml:1525
+#, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
-#: index.docbook:1502
+#. Tag: entry
+#: configuration.xml:1526
+#, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
-#: index.docbook:1505
+#. Tag: literal
+#: configuration.xml:1529
+#, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
-#: index.docbook:1506
+#. Tag: entry
+#: configuration.xml:1530
+#, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
-#: index.docbook:1509
+#. Tag: literal
+#: configuration.xml:1533
+#, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
-#: index.docbook:1510
+#. Tag: entry
+#: configuration.xml:1534
+#, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
-#: index.docbook:1513
+#. Tag: literal
+#: configuration.xml:1537
+#, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
-#: index.docbook:1514
+#. Tag: entry
+#: configuration.xml:1538
+#, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
-#: index.docbook:1517
+#. Tag: literal
+#: configuration.xml:1541
+#, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
-#: index.docbook:1518
+#. Tag: entry
+#: configuration.xml:1542
+#, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
-#: index.docbook:1521
+#. Tag: literal
+#: configuration.xml:1545
+#, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
-#: index.docbook:1522
+#. Tag: entry
+#: configuration.xml:1546
+#, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
-#: index.docbook:1531
+#. Tag: title
+#: configuration.xml:1555
+#, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "<literal>SessionFactory</literal> ligada a JNDI"
 
-#: index.docbook:1533
+#. Tag: para
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "Una <literal>SessionFactory</literal> de Hibernate ligada a JNDI puede "
 "simplificar la obtenci&#x00f3;n de la f&#x00e1;brica y la creaci&#x00f3;n de "
@@ -2320,14 +2995,16 @@
 "relacionado a un <literal>Datasource</literal> ligado a JNDI, simplemente "
 "ambos usan el mismo registro!"
 
-#: index.docbook:1540
+#. Tag: para
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "Si deseas tener la <literal>SessionFactory</literal> ligada a un espacio de "
 "nombres de JNDI, especifica un nombre (ej. <literal>java:hibernate/"
@@ -2337,7 +3014,9 @@
 "especialmente &#x00fa;til en entornos con una implementaci&#x00f3; JNDI de "
 "s&#x00f3;lo lectura por defecto, ej. Tomcat.)"
 
-#: index.docbook:1548
+#. Tag: para
+#: configuration.xml:1572
+#, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
 "use the values of <literal>hibernate.jndi.url</literal>, <literal>hibernate."
@@ -2350,13 +3029,16 @@
 "se especifican, se usar&#x00e1; el <literal>InitialContext</literal> por "
 "defecto."
 
-#: index.docbook:1555
+#. Tag: para
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "Hibernate colocar&#x00e1; autom&#x00e1;ticamente la <literal>SessionFactory</"
 "literal> en JNDI despu&#x00e9;s que llames a <literal>cfg.buildSessionFactory"
@@ -2365,19 +3047,24 @@
 "aplicaci&#x00f3;n, a menos qie uses el despliegue JMX con el "
 "<literal>HibernateService</literal> (discutido luego)."
 
-#: index.docbook:1562
+#. Tag: para
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "UNTRANSLATED! If you use a JNDI <literal>SessionFactory</literal>, an EJB or "
 "any other class may obtain the <literal>SessionFactory</literal> using a "
 "JNDI lookup."
 
-#: index.docbook:1567
+#. Tag: para
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -2392,30 +3079,35 @@
 "embargo, <literal>HibernateUtil</literal> es m&#x00e1;s com&#x00fa;n en un "
 "entorno no manejado."
 
-#: index.docbook:1579
+#. Tag: title
+#: configuration.xml:1603
+#, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "Ligado autom&#x00e1;tico de JTA y Session"
 
-#: index.docbook:1581
+#. Tag: para
+#: configuration.xml:1605
+#, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <link linkend=\"architecture-current-session\">current "
-"sessions</link>. Using the <literal>\"jta\"</literal> session context, if "
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
 "there is no Hibernate <literal>Session</literal> associated with the current "
 "JTA transaction, one will be started and associated with that JTA "
 "transaction the first time you call <literal>sessionFactory.getCurrentSession"
 "()</literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "UNTRANSLATED! The easiest way to handle <literal>Session</literal>s and "
 "transactions is Hibernates automatic \"current\" <literal>Session</literal> "
@@ -2437,17 +3129,21 @@
 "boundaries. If you run in an EJB container, declarative transaction "
 "demarcation with CMT is preferred."
 
-#: index.docbook:1604
+#. Tag: title
+#: configuration.xml:1628
+#, no-c-format
 msgid "JMX deployment"
 msgstr "Despliegue JMX"
 
-#: index.docbook:1606
+#. Tag: para
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "La l&#x00ed;nea <literal>cfg.buildSessionFactory()</literal> todav&#x00ed;a "
 "tiene que ser ejecutada en algun sitio para obtener una "
@@ -2456,11 +3152,13 @@
 "<literal>HibernateUtil</literal>) o bien despliegas Hibernate como un "
 "<emphasis>servicio manejado</emphasis>."
 
-#: index.docbook:1614
+#. Tag: para
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "Hibernate se distribuye con <literal>org.hibernate.jmx.HibernateService</"
@@ -2469,7 +3167,9 @@
 "espec&#x00ed;ficos del vendedor. He aqu&#x00ed; un <literal>jboss-service."
 "xml</literal> de ejemplo para JBoss 4.0.x:"
 
-#: index.docbook:1621
+#. Tag: programlisting
+#: configuration.xml:1645
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<server>\n"
@@ -2563,14 +3263,16 @@
 "\n"
 "</server>]]>"
 
-#: index.docbook:1623
+#. Tag: para
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
@@ -2586,8 +3288,28 @@
 "caliente). Consulta la documentaci&#x00f3;n de JBoss AS para m&#x00e1;s "
 "informaci&#x00f3;n sobre el servicio JMX y despliegue de EJB."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr "Hibernate registra varios eventos usando commons-logging de Apache."
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid ""
+#~ "The commons-logging service will direct output to either Apache Log4j (if "
+#~ "you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
+#~ "logging (if running under JDK1.4 or above). You may download Log4j from "
+#~ "<literal>http://jakarta.apache.org</literal>. To use Log4j you will need "
+#~ "to place a <literal>log4j.properties</literal> file in your classpath, an "
+#~ "example properties file is distributed with Hibernate in the <literal>src/"
+#~ "</literal> directory."
+#~ msgstr ""
+#~ "El servicio de commons-logging saldr&#x00e1; directamente ya sea a Log4J "
+#~ "(si incluyes <literal>log4j.jar</literal> in your classpath) o JDK1.4 "
+#~ "logging (al ejecutar bajo JDK1.4 o superior). Puedes descargar Log4J "
+#~ "desde <literal>http://logging.apache.org</literal>. Para usar Log4J "
+#~ "necesitar&#x00e1;s colocar un fichero <literal>log4j.properties</literal> "
+#~ "en tu classpath. Un fichero de propiedades de ejemplo se distribuye con "
+#~ "Hibernate en el directorio <literal>src/</literal>."
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,33 +1,43 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: events.xml:29
+#, no-c-format
 msgid "Interceptors and events"
 msgstr "Interceptores y eventos"
 
-#: index.docbook:7
+#. Tag: para
+#: events.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "Frecuentemente es &#x00fa;til para la aplicaci&#x00f3;n reaccionar a ciertos "
 "eventos que ocurran dentro de Hibernate. Esto permite la implementaci&#x00f3;"
 "n de ciertos tipos de funcionalidade gen&#x00e9;rica, y extensi&#x00f3;n de "
 "la funcionalidad de Hibernate."
 
-#: index.docbook:14
+#. Tag: title
+#: events.xml:38
+#, no-c-format
 msgid "Interceptors"
 msgstr "Interceptores"
 
-#: index.docbook:16
+#. Tag: para
+#: events.xml:40
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -46,15 +56,19 @@
 "creado y actualiza la propiedad <literal>lastUpdateTimestamp</literal> "
 "cuando un <literal>Auditable</literal> es acutalizado."
 
-#: index.docbook:27
+#. Tag: para
+#: events.xml:51
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "UNTRANSLATED! You may either implement <literal>Interceptor</literal> "
 "directly or (better) extend <literal>EmptyInterceptor</literal>."
 
-#: index.docbook:32
+#. Tag: programlisting
+#: events.xml:56
+#, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
 "\n"
@@ -221,15 +235,19 @@
 "\n"
 "}]]>"
 
-#: index.docbook:34
+#. Tag: para
+#: events.xml:58
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "UNTRANSLATED! Interceptors come in two flavors: <literal>Session</literal>-"
 "scoped and <literal>SessionFactory</literal>-scoped."
 
-#: index.docbook:39
+#. Tag: para
+#: events.xml:63
+#, no-c-format
 msgid ""
 "A <literal>Session</literal>-scoped interceptor is specified when a session "
 "is opened using one of the overloaded SessionFactory.openSession() methods "
@@ -239,21 +257,25 @@
 "when a session is opened using one of the overloaded SessionFactory."
 "openSession() methods accepting an <literal>Interceptor</literal>."
 
-#: index.docbook:45
+#. Tag: programlisting
+#: events.xml:69
+#, no-c-format
 msgid "<![CDATA[Session session = sf.openSession( new AuditInterceptor() );]]>"
 msgstr ""
 "<![CDATA[Session session = sf.openSession( new AuditInterceptor() );]]>"
 
-#: index.docbook:47
+#. Tag: para
+#: events.xml:71
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "UNTRANSLATED! A <literal>SessionFactory</literal>-scoped interceptor is "
 "registered with the <literal>Configuration</literal> object prior to "
@@ -265,40 +287,48 @@
 "session-specific state since multiple sessions will use this interceptor "
 "(potentially) concurrently."
 
-#: index.docbook:56
+#. Tag: programlisting
+#: events.xml:80
+#, no-c-format
 msgid ""
 "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor() );]]>"
 msgstr ""
 "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor() );]]>"
 
-#: index.docbook:61
+#. Tag: title
+#: events.xml:85
+#, no-c-format
 msgid "Event system"
 msgstr "Sistema de eventos"
 
-#: index.docbook:63
+#. Tag: para
+#: events.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "Si tienes que reaccionar a eventos particulares en tu capa de persistencia, "
 "puedes tambi&#x00e9;n la arquitectura de <emphasis>eventos</emphasis> de "
 "Hibernate3. El sistema de eventos puede ser usado en adici&#x00f3;n o como "
 "un remplazo a los interceptores."
 
-#: index.docbook:69
+#. Tag: para
+#: events.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -320,25 +350,28 @@
 "petici&#x00f3;n <literal>load()</literal> hecha a la <literal>Session</"
 "literal>."
 
-#: index.docbook:84
+#. Tag: para
+#: events.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "Los oyentes deben ser considerados efectivamente singletons; quiere decir, "
 "que son compartidos entre las peticiones, y por lo tanto no guardan "
 "ning&#x00fa;n estado en variables de instancia."
 
-#: index.docbook:89
+#. Tag: para
+#: events.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "Un oyente personalizado debe implementar la interface apropiada para el "
@@ -352,7 +385,9 @@
 "est&#x00e1; soportada). He aqu&#x00ed; un ejemplo de un oyente personalizado "
 "de eventos load:"
 
-#: index.docbook:99
+#. Tag: programlisting
+#: events.xml:123
+#, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
 "    // this is the single method defined by the LoadEventListener interface\n"
@@ -379,7 +414,9 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:101
+#. Tag: para
+#: events.xml:125
+#, no-c-format
 msgid ""
 "You also need a configuration entry telling Hibernate to use the listener in "
 "addition to the default listener:"
@@ -387,7 +424,9 @@
 "Necesitas adem&#x00e1;s una entrada de configuraci&#x00f3;n dici&#x00e9;"
 "ndole a Hibernate que use el oyente en vez del oyente por defecto:"
 
-#: index.docbook:106
+#. Tag: programlisting
+#: events.xml:130
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
 "    <session-factory>\n"
@@ -407,11 +446,15 @@
 "    </session-factory>\n"
 "</hibernate-configuration>]]>"
 
-#: index.docbook:108
-msgid "Instead, you may register it programmatically:"
+#. Tag: para
+#: events.xml:132
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "En cambio, puedes registrarlo program&#x00e1;ticamente:"
 
-#: index.docbook:112
+#. Tag: programlisting
+#: events.xml:136
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
 "LoadEventListener[] stack = { new MyLoadListener(), new "
@@ -422,13 +465,15 @@
 "cfg.getSessionEventListenerConfig().setLoadEventListener( new MyLoadListener"
 "() );]]>"
 
-#: index.docbook:114
+#. Tag: para
+#: events.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "Los oyentes registrados declarativamente no pueden compartir instancias. Si "
 "el mismo nombre de clase es usado en m&#x00fa;ltiples elementos <literal>&lt;"
@@ -437,11 +482,13 @@
 "oyentes entre tipos de oyente debes usar el enfoque de registraci&#x00f3;n "
 "program&#x00e1;tica."
 
-#: index.docbook:122
+#. Tag: para
+#: events.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -452,16 +499,20 @@
 "durante la registraci&#x00f3;n lo hace m&#x00e1;s f&#x00e1;cil para activar "
 "o desactivar oyentes personalizados durante la configuraci&#x00f3;n."
 
-#: index.docbook:132
+#. Tag: title
+#: events.xml:156
+#, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Seguridad declarativa de Hibernate"
 
-#: index.docbook:133
+#. Tag: para
+#: events.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "Usualmente, la seguridad declarativa en aplicaciones Hibernate es manejada "
 "en una capa de fachada de sesi&#x00f3;n. Ahora, Hibernate3 permite que "
@@ -469,7 +520,9 @@
 "JAAS. Esta en una funcionalidad opcional constru&#x00ed;da encima de la "
 "arquitectura de eventos."
 
-#: index.docbook:139
+#. Tag: para
+#: events.xml:163
+#, no-c-format
 msgid ""
 "First, you must configure the appropriate event listeners, to enable the use "
 "of JAAS authorization."
@@ -477,7 +530,9 @@
 "Primero, debes configurar los oyentes de eventos apropiados, para habilitar "
 "el uso de autorizaci&#x00f3;n JAAS."
 
-#: index.docbook:144
+#. Tag: programlisting
+#: events.xml:168
+#, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
 "JACCPreDeleteEventListener\"/>\n"
@@ -497,27 +552,33 @@
 "<listener type=\"pre-load\" class=\"org.hibernate.secure."
 "JACCPreLoadEventListener\"/>]]>"
 
-#: index.docbook:146
+#. Tag: para
+#: events.xml:170
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "UNTRANSLATED! Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;"
 "</literal> is just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;"
 "listener class=\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly "
 "one listener for a particular event type."
 
-#: index.docbook:152
+#. Tag: para
+#: events.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "Seguido, a&#x00fa;n en <literal>hibernate.cfg.xml</literal>, liga los "
 "permisos a roles:"
 
-#: index.docbook:156
+#. Tag: programlisting
+#: events.xml:180
+#, no-c-format
 msgid ""
 "<![CDATA[<grant role=\"admin\" entity-name=\"User\" actions=\"insert,update,"
 "read\"/>\n"
@@ -527,12 +588,14 @@
 "read\"/>\n"
 "<grant role=\"su\" entity-name=\"User\" actions=\"*\"/>]]>"
 
-#: index.docbook:158
+#. Tag: para
+#: events.xml:182
+#, no-c-format
 msgid "The role names are the roles understood by your JACC provider."
 msgstr "Los nombres de role son los roles entendidos por tu proveedor de JACC."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,30 +1,40 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:20
+#. Tag: title
+#: example_mappings.xml:29
+#, no-c-format
 msgid "Example: Various Mappings"
 msgstr "Ejemplo: Varios Mapeos"
 
-#: index.docbook:22
-msgid "This chapters shows off some more complex association mappings."
+#. Tag: para
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr ""
 "Este cap&#x00ed;tulo muestra mapeos de asociaciones m&#x00e1;s complejos."
 
-#: index.docbook:27
+#. Tag: title
+#: example_mappings.xml:37
+#, no-c-format
 msgid "Employer/Employee"
 msgstr "Empleador/Empleado"
 
-#: index.docbook:29
+#. Tag: para
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "El siguiente modelo de la relaci&#x00f3;n entre <literal>Employer</literal> "
 "y <literal>Employee</literal> usa una clase de entidad real "
@@ -33,11 +43,15 @@
 "de empleo para los mismos dos participantes. Se usan componentes para "
 "modelar valores monetarios y nombres de empleado."
 
-#: index.docbook:46
-msgid "Heres a possible mapping document:"
+#. Tag: para
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "He aqu&#x00ed; un documento de mapeo posible:"
 
-#: index.docbook:50
+#. Tag: programlisting
+#: example_mappings.xml:60
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "        \n"
@@ -141,14 +155,17 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:52
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#. Tag: para
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr ""
 "Y he aqu&#x00ed; el esquema de tablas generado por <literal>SchemaExport</"
 "literal>."
 
-#: index.docbook:56
+#. Tag: programlisting
+#: example_mappings.xml:66
+#, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
 "    id BIGINT not null, \n"
@@ -222,19 +239,23 @@
 "create sequence employment_id_seq\n"
 "create sequence employer_id_seq]]>"
 
-#: index.docbook:61
+#. Tag: title
+#: example_mappings.xml:71
+#, no-c-format
 msgid "Author/Work"
 msgstr "Autor/Obra"
 
-#: index.docbook:63
+#. Tag: para
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "Considera el siguiente modelo de las relaciones entre <literal>Work</"
 "literal>, <literal>Author</literal> y <literal>Person</literal>. "
@@ -245,13 +266,17 @@
 "posibilidad hubiese sido que <literal>Author</literal> extendiera "
 "<literal>Person</literal>."
 
-#: index.docbook:81
+#. Tag: para
+#: example_mappings.xml:91
+#, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr ""
 "El siguiente documento de mapeo representa estas relaciones correctamente:"
 
-#: index.docbook:85
+#. Tag: programlisting
+#: example_mappings.xml:95
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -357,13 +382,15 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:87
+#. Tag: para
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "Hay cuatro tablas en este mapeo. <literal>works</literal>, <literal>authors</"
 "literal> y <literal>persons</literal> tienen los datos de obra, autor y "
@@ -371,7 +398,9 @@
 "asociaci&#x00f3;n enlazando autores a obras. He aqu&#x00ed; el esquema de "
 "tablas, tal como fue generado por <literal>SchemaExport</literal>."
 
-#: index.docbook:95
+#. Tag: programlisting
+#: example_mappings.xml:105
+#, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
 "    id BIGINT not null generated by default as identity, \n"
@@ -445,21 +474,25 @@
 "alter table author_work\n"
 "    add constraint author_workFK1 foreign key (work_id) references works]]>"
 
-#: index.docbook:100
+#. Tag: title
+#: example_mappings.xml:110
+#, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Cliente/Orden/Producto"
 
-#: index.docbook:102
+#. Tag: para
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "Ahora considera un modelo de las relaciones entre <literal>Customer</"
 "literal>, <literal>Order</literal> y <literal>LineItem</literal> y "
@@ -472,11 +505,15 @@
 "literal> y <literal>Product</literal>. En Hibernate, esto se llama un "
 "elemento compuesto."
 
-#: index.docbook:122
-msgid "The mapping document:"
+#. Tag: para
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "El documento de mapeo:"
 
-#: index.docbook:126
+#. Tag: programlisting
+#: example_mappings.xml:136
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -554,7 +591,9 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:128
+#. Tag: para
+#: example_mappings.xml:138
+#, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
 "<literal>line_items</literal> and <literal>products</literal> hold customer, "
@@ -567,7 +606,9 @@
 "respectivamente. Adem&#x00e1;s <literal>line_items</literal> act&#x00fa;a "
 "como una tabla de asociaci&#x00f3;n enlazando &#x00f3;rdenes con productos."
 
-#: index.docbook:135
+#. Tag: programlisting
+#: example_mappings.xml:145
+#, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
 "    id BIGINT not null generated by default as identity, \n"
@@ -639,14 +680,18 @@
 "alter table line_items\n"
 "    add constraint line_itemsFK1 foreign key (order_id) references orders]]>"
 
-#: index.docbook:140
+#. Tag: title
+#: example_mappings.xml:150
+#, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "Mapeos miscel&#x00e1;neos de ejemplo"
 
-#: index.docbook:142
+#. Tag: para
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "Todos estos ejemplos est&#x00e1;n tomados de la bater&#x00ed;a de pruebas de "
@@ -654,15 +699,15 @@
 "all&#x00ed;. Mira en la carpeta <literal>test</literal> de la "
 "distribuci&#x00f3;n de Hibernate."
 
-#: index.docbook:148
-msgid "TODO: put words around this stuff"
-msgstr "POR HACER: poner palabras alrededor de este material"
-
-#: index.docbook:151
+#. Tag: title
+#: example_mappings.xml:161
+#, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "Asociaci&#x00f3;n uno-a-uno \"Tipificada\""
 
-#: index.docbook:152
+#. Tag: programlisting
+#: example_mappings.xml:162
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"name\"/>\n"
@@ -718,11 +763,15 @@
 "    <property name=\"zip\"/>\n"
 "</class>]]>"
 
-#: index.docbook:156
+#. Tag: title
+#: example_mappings.xml:166
+#, no-c-format
 msgid "Composite key example"
 msgstr "Ejemplo de clave compuesta"
 
-#: index.docbook:157
+#. Tag: programlisting
+#: example_mappings.xml:167
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
 "\n"
@@ -952,11 +1001,15 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:161
+#. Tag: title
+#: example_mappings.xml:171
+#, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr "Muchos-a-muchos con atributo de clave compuesta compartido"
 
-#: index.docbook:162
+#. Tag: programlisting
+#: example_mappings.xml:172
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
 "    <composite-id>\n"
@@ -1030,11 +1083,15 @@
 "</class>\n"
 "]]>"
 
-#: index.docbook:166
+#. Tag: title
+#: example_mappings.xml:176
+#, no-c-format
 msgid "Content based discrimination"
 msgstr "Discriminaci&#x00f3;n basada en contenido"
 
-#: index.docbook:167
+#. Tag: programlisting
+#: example_mappings.xml:177
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
 "    discriminator-value=\"P\">\n"
@@ -1138,11 +1195,15 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:171
+#. Tag: title
+#: example_mappings.xml:181
+#, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Asociaciones sobre claves alternativas"
 
-#: index.docbook:172
+#. Tag: programlisting
+#: example_mappings.xml:182
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    \n"
@@ -1244,8 +1305,11 @@
 "    \n"
 "</class>]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "POR HACER: poner palabras alrededor de este material"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,30 +1,35 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: example_parentchild.xml:29
+#, no-c-format
 msgid "Example: Parent/Child"
 msgstr "Ejemplo: Padre/Hijo"
 
-#: index.docbook:7
+#. Tag: para
+#: example_parentchild.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "Una de las primer&#x00ed;simas cosas que los usuarios nuevos intentan hacer "
 "con Hibernate es modelar una relaci&#x00f3;n de tipo padre / hijo. Para esto "
@@ -42,33 +47,41 @@
 "en cascada</emphasis> para modelar una relaci&#x00f3;n padre / hijo "
 "eficiente y elegantemente. &#x00a1;No es para nada dif&#x00ed;cil!"
 
-#: index.docbook:21
+#. Tag: title
+#: example_parentchild.xml:45
+#, no-c-format
 msgid "A note about collections"
 msgstr "Una nota sobre las colecciones"
 
-#: index.docbook:23
+#. Tag: para
+#: example_parentchild.xml:47
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Se considera que las colecciones de Hibernate son una parte l&#x00f3;gica de "
 "la entidad que las posee; nunca de las entidades contenidas. &#x00a1;Esta es "
 "una distinci&#x00f3;n crucial! Esto tiene las siguientes consecuencias:"
 
-#: index.docbook:30
+#. Tag: para
+#: example_parentchild.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr ""
 "Cuando se quita / a&#x00f1;ade un objeto desde / a una colecci&#x00f3;n, se "
 "incrementa el n&#x00fa;mero de versi&#x00f3;n del due&#x00f1;o de la "
 "colecci&#x00f3;n."
 
-#: index.docbook:36
+#. Tag: para
+#: example_parentchild.xml:60
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -79,14 +92,15 @@
 "de datos. Asimismo, a&#x00f1;adir una instancia de tipo de valor a la "
 "colecci&#x00f3;n causar&#x00e1; que su estado sea inmediatamente persistente."
 
-#: index.docbook:44
+#. Tag: para
+#: example_parentchild.xml:68
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "Por otro lado, si se quita una entidad de una colecci&#x00f3;n (una "
 "asociaci&#x00f3;n uno-a-muchos o muchos-a-muchos), no ser&#x00e1; borrado, "
@@ -95,13 +109,15 @@
 "asociada! Asimismo, a&#x00f1;adir una entidad a una colecci&#x00f3;n no "
 "causa que la entidad se vuelva persistente, por defecto."
 
-#: index.docbook:54
+#. Tag: para
+#: example_parentchild.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "En cambio, el comportamiento por defecto es que al a&#x00f1;adir una entidad "
 "a una colecci&#x00f3;n se crea meramente un enlace entre las dos entidades, "
@@ -110,11 +126,15 @@
 "una relaci&#x00f3;n padre / hijo. donde la vida del hijo est&#x00e1; ligada "
 "al ciclo de vida del padre."
 
-#: index.docbook:64
+#. Tag: title
+#: example_parentchild.xml:88
+#, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr "Uno-a-muchos bidirectional"
 
-#: index.docbook:66
+#. Tag: para
+#: example_parentchild.xml:90
+#, no-c-format
 msgid ""
 "Suppose we start with a simple <literal>&lt;one-to-many&gt;</literal> "
 "association from <literal>Parent</literal> to <literal>Child</literal>."
@@ -123,7 +143,9 @@
 "to-many&gt;</literal> desde <literal>Parent</literal> a <literal>Child</"
 "literal>."
 
-#: index.docbook:71
+#. Tag: programlisting
+#: example_parentchild.xml:95
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
 "    <key column=\"parent_id\"/>\n"
@@ -135,11 +157,15 @@
 "    <one-to-many class=\"Child\"/>\n"
 "</set>]]>"
 
-#: index.docbook:73
-msgid "If we were to execute the following code"
+#. Tag: para
+#: example_parentchild.xml:97
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "Si ejecut&#x00e1;semos el siguiente c&#x00f3;digo"
 
-#: index.docbook:77
+#. Tag: programlisting
+#: example_parentchild.xml:101
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = .....;\n"
 "Child c = new Child();\n"
@@ -153,17 +179,23 @@
 "session.save(c);\n"
 "session.flush();]]>"
 
-#: index.docbook:79
+#. Tag: para
+#: example_parentchild.xml:103
+#, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr "Hibernate publicar&#x00ed;a dos sentencias SQL:"
 
-#: index.docbook:85
+#. Tag: para
+#: example_parentchild.xml:109
+#, no-c-format
 msgid ""
 "an <literal>INSERT</literal> to create the record for <literal>c</literal>"
 msgstr ""
 "un <literal>INSERT</literal> para crear el registro de <literal>c</literal>"
 
-#: index.docbook:88
+#. Tag: para
+#: example_parentchild.xml:112
+#, no-c-format
 msgid ""
 "an <literal>UPDATE</literal> to create the link from <literal>p</literal> to "
 "<literal>c</literal>"
@@ -171,10 +203,12 @@
 "un <literal>UPDATE</literal> para crear el enlace desde <literal>p</literal> "
 "a <literal>c</literal>"
 
-#: index.docbook:95
+#. Tag: para
+#: example_parentchild.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -184,7 +218,9 @@
 "restricci&#x00f3;n de nulabilidad especificando <literal>not-null=\"true\"</"
 "literal> en el mapeo de la colecci&#x00f3;n:"
 
-#: index.docbook:101
+#. Tag: programlisting
+#: example_parentchild.xml:125
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
 "    <key column=\"parent_id\" not-null=\"true\"/>\n"
@@ -196,16 +232,20 @@
 "    <one-to-many class=\"Child\"/>\n"
 "</set>]]>"
 
-#: index.docbook:103
+#. Tag: para
+#: example_parentchild.xml:127
+#, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr "Sin embargo, esta no es la soluci&#x00f3;n recomendada."
 
-#: index.docbook:106
+#. Tag: para
+#: example_parentchild.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "El caso subyacente de este comportamiento es que el enlace (la clave "
@@ -215,7 +255,9 @@
 "literal>. De modo que la soluci&#x00f3;n es hacer el enlace parte del mapeo "
 "del <literal>Child</literal>."
 
-#: index.docbook:113
+#. Tag: programlisting
+#: example_parentchild.xml:137
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"parent\" column=\"parent_id\" not-null=\"true\"/"
 ">]]>"
@@ -223,25 +265,31 @@
 "<![CDATA[<many-to-one name=\"parent\" column=\"parent_id\" not-null=\"true\"/"
 ">]]>"
 
-#: index.docbook:115
+#. Tag: para
+#: example_parentchild.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(Necesitamos adem&#x00e1;s a&#x00f1;adir la propiedad <literal>parent</"
 "literal> a la clase <literal>Child</literal>.)"
 
-#: index.docbook:119
+#. Tag: para
+#: example_parentchild.xml:143
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "Ahora que la entidad <literal>Child</literal> est&#x00e1; gestionando el "
 "estado del enlace, le decimos a la colecci&#x00f3;n que no actualice el "
 "enlace. Usamos el atributo <literal>inverse</literal>."
 
-#: index.docbook:124
+#. Tag: programlisting
+#: example_parentchild.xml:148
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
 "    <key column=\"parent_id\"/>\n"
@@ -253,13 +301,17 @@
 "    <one-to-many class=\"Child\"/>\n"
 "</set>]]>"
 
-#: index.docbook:126
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#. Tag: para
+#: example_parentchild.xml:150
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr ""
 "El siguiente c&#x00f3;digo podr&#x00ed;a ser usado para a&#x00f1;adir un "
 "nuevo <literal>Child</literal>"
 
-#: index.docbook:130
+#. Tag: programlisting
+#: example_parentchild.xml:154
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "Child c = new Child();\n"
@@ -275,21 +327,27 @@
 "session.save(c);\n"
 "session.flush();]]>"
 
-#: index.docbook:132
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#. Tag: para
+#: example_parentchild.xml:156
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr ""
 "Y ahora, &#x00a1;S&#x00f3;lo se publicar&#x00ed;a un <literal>INSERT</"
 "literal> de SQL!"
 
-#: index.docbook:136
+#. Tag: para
+#: example_parentchild.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "Para ajustar un poco m&#x00e1;s las cosas, podr&#x00ed;amos crear un "
 "m&#x00e9;todo <literal>addChild()</literal> en <literal>Parent</literal>."
 
-#: index.docbook:141
+#. Tag: programlisting
+#: example_parentchild.xml:165
+#, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
 "    c.setParent(this);\n"
@@ -301,13 +359,17 @@
 "    children.add(c);\n"
 "}]]>"
 
-#: index.docbook:143
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#. Tag: para
+#: example_parentchild.xml:167
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr ""
 "Ahora, el c&#x00f3;digo para a&#x00f1;adir un <literal>Child</literal> se ve "
 "as&#x00ed;"
 
-#: index.docbook:147
+#. Tag: programlisting
+#: example_parentchild.xml:171
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "Child c = new Child();\n"
@@ -321,19 +383,25 @@
 "session.save(c);\n"
 "session.flush();]]>"
 
-#: index.docbook:152
+#. Tag: title
+#: example_parentchild.xml:176
+#, no-c-format
 msgid "Cascading life cycle"
 msgstr "Ciclo de vida en cascada"
 
-#: index.docbook:154
+#. Tag: para
+#: example_parentchild.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "La llamada expl&#x00ed;cita a <literal>save()</literal> es a&#x00fa;n "
 "molesta. Apuntaremos a esto usando tratamientos en cascada."
 
-#: index.docbook:159
+#. Tag: programlisting
+#: example_parentchild.xml:183
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
 "    <key column=\"parent_id\"/>\n"
@@ -345,11 +413,15 @@
 "    <one-to-many class=\"Child\"/>\n"
 "</set>]]>"
 
-#: index.docbook:161
-msgid "This simplifies the code above to"
+#. Tag: para
+#: example_parentchild.xml:185
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "Esto simplifica el c&#x00f3;digo anterior a"
 
-#: index.docbook:165
+#. Tag: programlisting
+#: example_parentchild.xml:189
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "Child c = new Child();\n"
@@ -361,9 +433,11 @@
 "p.addChild(c);\n"
 "session.flush();]]>"
 
-#: index.docbook:167
+#. Tag: para
+#: example_parentchild.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -371,7 +445,9 @@
 "<literal>Parent</literal>. Lo siguiente quita <literal>p</literal> y todos "
 "sus hijos de la base de datos."
 
-#: index.docbook:172
+#. Tag: programlisting
+#: example_parentchild.xml:196
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "session.delete(p);\n"
@@ -381,11 +457,15 @@
 "session.delete(p);\n"
 "session.flush();]]>"
 
-#: index.docbook:174
-msgid "However, this code"
+#. Tag: para
+#: example_parentchild.xml:198
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "Sin embargo, este c&#x00f3;digo"
 
-#: index.docbook:178
+#. Tag: programlisting
+#: example_parentchild.xml:202
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "Child c = (Child) p.getChildren().iterator().next();\n"
@@ -399,11 +479,13 @@
 "c.setParent(null);\n"
 "session.flush();]]>"
 
-#: index.docbook:180
+#. Tag: para
+#: example_parentchild.xml:204
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "no quitar&#x00e1; <literal>c</literal> de la base de datos; s&#x00f3;lo "
@@ -412,7 +494,9 @@
 "Necesitas borrar el hijo expl&#x00ed;citamente llamando a <literal>delete()</"
 "literal>."
 
-#: index.docbook:186
+#. Tag: programlisting
+#: example_parentchild.xml:210
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
 "Child c = (Child) p.getChildren().iterator().next();\n"
@@ -426,19 +510,23 @@
 "session.delete(c);\n"
 "session.flush();]]>"
 
-#: index.docbook:188
+#. Tag: para
+#: example_parentchild.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "Ahora, en nuestro caso, un <literal>Child</literal> no puede existir "
 "realmente sin su padre. De modo que si quitamos un <literal>Child</literal> "
 "de la colecci&#x00f3;n, realmente queremos que sea borrado. Para esto, "
 "debemos usar <literal>cascade=\"all-delete-orphan\"</literal>."
 
-#: index.docbook:194
+#. Tag: programlisting
+#: example_parentchild.xml:218
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all-delete-orphan"
 "\">\n"
@@ -452,13 +540,15 @@
 "    <one-to-many class=\"Child\"/>\n"
 "</set>]]>"
 
-#: index.docbook:196
+#. Tag: para
+#: example_parentchild.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "Nota: aunque el mapeo de la colecci&#x00f3;n especifique <literal>inverse="
 "\"true\"</literal>, el tratamiento en cascada se procesa a&#x00fa;n al "
@@ -467,24 +557,29 @@
 "a la colecci&#x00f3;n. No es suficiente con simplemente llamar a "
 "<literal>setParent()</literal>."
 
-#: index.docbook:206
+#. Tag: title
+#: example_parentchild.xml:230
+#, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr "Tratamiento en cascada y <literal>unsaved-value</literal>"
 
-#: index.docbook:208
+#. Tag: para
+#: example_parentchild.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "Sup&#x00f3;n que hemos cargado un <literal>Parent</literal> en una "
 "<literal>Session</literal>, hemos hecho algunos cambios en una acci&#x00f3;n "
@@ -502,15 +597,19 @@
 "necesario especificar un <literal>unsaved-value</literal> expl&#x00ed;"
 "citamente.</emphasis>"
 
-#: index.docbook:220
+#. Tag: para
+#: example_parentchild.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "The following code will update <literal>parent</literal> and <literal>child</"
 "literal> and insert <literal>newChild</literal>."
 
-#: index.docbook:225
+#. Tag: programlisting
+#: example_parentchild.xml:249
+#, no-c-format
 msgid ""
 "<![CDATA[//parent and child were both loaded in a previous session\n"
 "parent.addChild(child);\n"
@@ -526,16 +625,17 @@
 "session.update(parent);\n"
 "session.flush();]]>"
 
-#: index.docbook:227
+#. Tag: para
+#: example_parentchild.xml:251
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "Bueno, todo eso est&#x00e1; muy bien para el caso de un identificador "
 "generado, pero &#x00bf;qu&#x00e9; de los identificadores asignados y de los "
@@ -547,28 +647,34 @@
 "bien consultar&#x00e1; realmente el cach&#x00e9; de segundo nivel, o bien, "
 "en el peor de los casos, la base de datos, para ver si existe la fila."
 
-#: index.docbook:260
+#. Tag: title
+#: example_parentchild.xml:284
+#, no-c-format
 msgid "Conclusion"
 msgstr "Conclusi&#x00f3;n"
 
-#: index.docbook:262
+#. Tag: para
+#: example_parentchild.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "Hay que resumir un poco aqu&#x00ed; y podr&#x00ed;a parecer confuso a la "
 "primera vez. Sin embargo, en la pr&#x00e1;ctica, todo funciona muy "
 "agradablemente. La mayor&#x00ed;a de las aplicaciones de Hibernate usan el "
 "patr&#x00f3;n padre / hijo en muchos sitios."
 
-#: index.docbook:267
+#. Tag: para
+#: example_parentchild.xml:291
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "Hemos mencionado una alternativa en el primer p&#x00e1;rrafo. Ninguno de los "
@@ -579,8 +685,8 @@
 "compuestos no pueden poseer sus propias colecciones, y no deben ser el hijo "
 "de cualquier otra entidad que no sea su padre &#x00fa;nico."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,29 +1,39 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: example_weblog.xml:29
+#, no-c-format
 msgid "Example: Weblog Application"
 msgstr "Ejemplo: Aplicaci&#x00f3;n de Weblog"
 
-#: index.docbook:8
+#. Tag: title
+#: example_weblog.xml:32
+#, no-c-format
 msgid "Persistent Classes"
 msgstr "Clases Persistentes"
 
-#: index.docbook:10
+#. Tag: para
+#: example_weblog.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "Las clases persistentes representan un weblog, y un &#x00ed;tem enviado a un "
 "weblog. Van a ser modelados como una relaci&#x00f3;n padre/hijo est&#x00f1;"
 "ndar, pero usaremos un bag ordenado, en vez de un conjunto (set)."
 
-#: index.docbook:16
+#. Tag: programlisting
+#: example_weblog.xml:40
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "\n"
@@ -83,7 +93,9 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:18
+#. Tag: programlisting
+#: example_weblog.xml:42
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "\n"
@@ -173,15 +185,21 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:23
+#. Tag: title
+#: example_weblog.xml:47
+#, no-c-format
 msgid "Hibernate Mappings"
 msgstr "Mapeos de Hibernate"
 
-#: index.docbook:25
-msgid "The XML mappings should now be quite straightforward."
+#. Tag: para
+#: example_weblog.xml:49
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "Los mapeos XML ahora deben ser absolutamente directos."
 
-#: index.docbook:29
+#. Tag: programlisting
+#: example_weblog.xml:53
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -263,7 +281,9 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:31
+#. Tag: programlisting
+#: example_weblog.xml:55
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -353,19 +373,25 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:36
+#. Tag: title
+#: example_weblog.xml:60
+#, no-c-format
 msgid "Hibernate Code"
 msgstr "C&#x00f3;digo Hibernate"
 
-#: index.docbook:38
+#. Tag: para
+#: example_weblog.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr ""
 "La siguiente clase demuestra algunos de los tipos de cosas que podemos haces "
 "con estas clases, usando Hibernate."
 
-#: index.docbook:43
+#. Tag: programlisting
+#: example_weblog.xml:67
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "\n"
@@ -845,8 +871,8 @@
 "    }\n"
 "}]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,19 +1,25 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: filters.xml:29
+#, no-c-format
 msgid "Filtering data"
 msgstr "Filtrando datos"
 
-#: index.docbook:7
+#. Tag: para
+#: filters.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "Hibernate3 provee un nuevo enfoque innovador para manejar datos con reglas "
@@ -21,20 +27,24 @@
 "global, con nombre y parametrizado que puede ser habilitado o deshabilitado "
 "para una sesión de Hibernate en particular."
 
-#: index.docbook:14
+#. Tag: title
+#: filters.xml:38
+#, no-c-format
 msgid "Hibernate filters"
 msgstr "Filtros de Hibernate"
 
-#: index.docbook:16
+#. Tag: para
+#: filters.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "Hibernate3 añade la habilidad de predefinir criterios de filtros y unir esos "
 "filtros tanto a nivel de una clase como de una colección. Un criterio de "
@@ -46,7 +56,9 @@
 "Los filtros pueden ser usados como vistas de base de datos, pero "
 "parametrizados dentro de la aplicación."
 
-#: index.docbook:26
+#. Tag: para
+#: filters.xml:50
+#, no-c-format
 msgid ""
 "In order to use filters, they must first be defined and then attached to the "
 "appropriate mapping elements. To define a filter, use the <literal>&lt;"
@@ -58,7 +70,9 @@
 "<literal>&lt;filter-def/&gt;</literal> dentro de un elemento <literal>&lt;"
 "hibernate-mapping/&gt;</literal>:"
 
-#: index.docbook:32
+#. Tag: programlisting
+#: filters.xml:56
+#, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\">\n"
 "    <filter-param name=\"myFilterParam\" type=\"string\"/>\n"
@@ -68,11 +82,15 @@
 "    <filter-param name=\"myFilterParam\" type=\"string\"/>\n"
 "</filter-def>]]>"
 
-#: index.docbook:34
-msgid "Then, this filter can be attached to a class:"
+#. Tag: para
+#: filters.xml:58
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "Entonces este filtro puede ser unido a una clase:"
 
-#: index.docbook:38
+#. Tag: programlisting
+#: filters.xml:62
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"myClass\" ...>\n"
 "    ...\n"
@@ -86,11 +104,15 @@
 "\"/>\n"
 "</class>]]>"
 
-#: index.docbook:40
-msgid "or, to a collection:"
+#. Tag: para
+#: filters.xml:64
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "o a una colección:"
 
-#: index.docbook:44
+#. Tag: programlisting
+#: filters.xml:68
+#, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
 "    <filter name=\"myFilter\" condition=\":myFilterParam = MY_FILTERED_COLUMN"
@@ -102,20 +124,24 @@
 "\"/>\n"
 "</set>]]>"
 
-#: index.docbook:46
-msgid "or, even to both (or multiples of each) at the same time."
+#. Tag: para
+#: filters.xml:70
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr "o incluso a ambos (o muchos de cada uno) al mismo tiempo."
 
-#: index.docbook:50
+#. Tag: para
+#: filters.xml:74
+#, fuzzy, no-c-format
 msgid ""
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enabledFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "Los métodos en <literal>Session</literal> son: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
@@ -126,7 +152,9 @@
 "de la interface <literal>Filter</literal>. Usando el filtro simple definido "
 "arriba, esto se vería así:"
 
-#: index.docbook:59
+#. Tag: programlisting
+#: filters.xml:83
+#, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
 "\"some-value\");]]>"
@@ -134,22 +162,29 @@
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
 "\"some-value\");]]>"
 
-#: index.docbook:61
+#. Tag: para
+#: filters.xml:85
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "Nota que los métodos en la interface org.hibernate.Filter permiten el "
 "encadenamiento de métodos común en gran parte de Hibernate."
 
-#: index.docbook:65
+#. Tag: para
+#: filters.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr ""
 "Un ejemplo completo, usando datos temporales con un patrón efectivo de "
 "fechas de registro:"
 
-#: index.docbook:69
+#. Tag: programlisting
+#: filters.xml:93
+#, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"effectiveDate\">\n"
 "    <filter-param name=\"asOfDate\" type=\"date\"/>\n"
@@ -217,17 +252,20 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:71
+#. Tag: para
+#: filters.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "Entonces, en orden de asegurar que siempre tendrás de vuelta registros "
 "actualmente efectivos, simplemente habilita el filtro en la sesión previo a "
 "recuperar los datos de empleados:"
 
-#: index.docbook:76
+#. Tag: programlisting
+#: filters.xml:100
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
 "session.enableFilter(\"effectiveDate\").setParameter(\"asOfDate\", new Date"
@@ -247,24 +285,28 @@
 "         .list();\n"
 "]]>"
 
-#: index.docbook:78
+#. Tag: para
+#: filters.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "En el HQL de arriba, aunque sólo hemos mencionado explícitamente una "
 "restricción de salario en los resultados, debido al filtro habilitado la "
 "consulta sólo devolverá empleados actualmente activos que tengan un salario "
 "mayor que un millón de dólares."
 
-#: index.docbook:84
+#. Tag: para
+#: filters.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "Nota: si planeas usar filtros con unión externa (outer joining) (bien a "
 "través de HQL, o bien de recuperación de carga) sé cuidadoso en la dirección "
@@ -272,32 +314,38 @@
 "externa izquierda (left outer joining). En general, coloca el primer "
 "parámetro seguido del nombre(s) de columna(s) después del operador."
 
-#: index.docbook:91
+#. Tag: para
+#: filters.xml:115
+#, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr ""
 
-#: index.docbook:98
+#. Tag: programlisting
+#: filters.xml:122
+#, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
 "def>\n"
 "<filter-def name=\"myOtherFilter\">abc=xyz</filter-def>]]>"
 msgstr ""
 
-#: index.docbook:100
+#. Tag: para
+#: filters.xml:124
+#, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,36 +1,52 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
-msgid "Inheritance Mapping"
+#. Tag: title
+#: inheritance_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "Mapeo de Herencia"
 
-#: index.docbook:8
-msgid "The Three Strategies"
+#. Tag: title
+#: inheritance_mapping.xml:32
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "Las Tres Estrategias"
 
-#: index.docbook:10
+#. Tag: para
+#: inheritance_mapping.xml:34
+#, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr ""
 "Hibernate soporta las tres estrategias b&#x00e1;sicas de mapeo de herencia:"
 
-#: index.docbook:16
+#. Tag: para
+#: inheritance_mapping.xml:40
+#, no-c-format
 msgid "table per class hierarchy"
 msgstr "<para>tabla por jerarqu&#x00ed;a de clases</para>"
 
-#: index.docbook:21
+#. Tag: para
+#: inheritance_mapping.xml:45
+#, no-c-format
 msgid "<para>table per subclass</para>"
 msgstr "<para>tabla por subclase</para>"
 
-#: index.docbook:26
+#. Tag: para
+#: inheritance_mapping.xml:50
+#, no-c-format
 msgid "table per concrete class"
 msgstr "tabla por clase concreta"
 
-#: index.docbook:32
+#. Tag: para
+#: inheritance_mapping.xml:56
+#, no-c-format
 msgid ""
 "In addition, Hibernate supports a fourth, slightly different kind of "
 "polymorphism:"
@@ -38,22 +54,26 @@
 "En adici&#x00f3;n, Hibernate soporta un cuarto, ligeramente diferente tipo "
 "de polimorfismo:"
 
-#: index.docbook:39
+#. Tag: para
+#: inheritance_mapping.xml:63
+#, no-c-format
 msgid "implicit polymorphism"
 msgstr "polimorfismo impl&#x00ed;cito"
 
-#: index.docbook:45
+#. Tag: para
+#: inheritance_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "UNTRANSLATED! It is possible to define <literal>subclass</literal>, "
 "<literal>union-subclass</literal>, and <literal>joined-subclass</literal> "
@@ -66,18 +86,20 @@
 "when using the extends keyword. The ordering inside a single mapping file "
 "still needs to be defined as superclasses before subclasses."
 
-#: index.docbook:59
+#. Tag: para
+#: inheritance_mapping.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "<![CDATA[\n"
 "                                 <hibernate-mapping>\n"
@@ -88,7 +110,9 @@
 "                                         </subclass>\n"
 " </hibernate-mapping>]]>"
 
-#: index.docbook:70
+#. Tag: programlisting
+#: inheritance_mapping.xml:94
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 " <hibernate-mapping>\n"
@@ -110,23 +134,29 @@
 "combinando los elementos <literal>&lt;subclass&gt;</literal> y <literal>&lt;"
 "join&gt;</literal> (ver debajo)."
 
-#: index.docbook:74
+#. Tag: title
+#: inheritance_mapping.xml:98
+#, no-c-format
 msgid "Table per class hierarchy"
 msgstr "Tabla por jerarqu&#x00ed;a de clases"
 
-#: index.docbook:76
+#. Tag: para
+#: inheritance_mapping.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "Sup&#x00f3;n que tenemos una interface <literal>Payment</literal>, con los "
 "implementadores <literal>CreditCardPayment</literal>, <literal>CashPayment</"
 "literal>, <literal>ChequePayment</literal>. El mapeo de tabla por "
 "jerarqu&#x00ed;a se ver&#x00ed;a as&#x00ed;:"
 
-#: index.docbook:83
+#. Tag: programlisting
+#: inheritance_mapping.xml:107
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"PAYMENT_ID\">\n"
@@ -166,26 +196,34 @@
 "    </subclass>\n"
 "</class>]]>"
 
-#: index.docbook:85
+#. Tag: para
+#: inheritance_mapping.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "Se requiere exactamente una tabla. Hay una gran limitaci&#x00f3;n de esta "
 "estrategia de mapeo: las columnas declaradas por las subclases, como "
 "<literal>CCTYPE</literal>, no pueden tener restricciones <literal>NOT NULL</"
 "literal>."
 
-#: index.docbook:94
+#. Tag: title
+#: inheritance_mapping.xml:118
+#, no-c-format
 msgid "Table per subclass"
 msgstr "Tabla por subclase"
 
-#: index.docbook:96
-msgid "A table per subclass mapping would look like:"
+#. Tag: para
+#: inheritance_mapping.xml:120
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "Un mapeo de tabla por sublclase se ver&#x00ed;a as&#x00ed;:"
 
-#: index.docbook:100
+#. Tag: programlisting
+#: inheritance_mapping.xml:124
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"PAYMENT_ID\">\n"
@@ -229,30 +267,36 @@
 "    </joined-subclass>\n"
 "</class>]]>"
 
-#: index.docbook:102
+#. Tag: para
+#: inheritance_mapping.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "Se requieren cuatro tablas. Las tres tablas de subclase tienen asociaciones "
 "de clave primaria a la tabla de superclase (de modo que en el modelo "
 "relacional es realmente una asociaci&#x00f3;n uno-a-uno)."
 
-#: index.docbook:111
-msgid "Table per subclass, using a discriminator"
+#. Tag: title
+#: inheritance_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "Tabla por subclase, usando un discriminador"
 
-#: index.docbook:113
+#. Tag: para
+#: inheritance_mapping.xml:137
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "Observa que la implementaci&#x00f3;n de Hibernate de tabla por subclase no "
 "requiere ninguna columna discriminadora. Otros mapeadores objeto/relacional "
@@ -264,7 +308,9 @@
 "combinar el uso de <literal>&lt;subclass&gt;</literal> y <literal>&lt;"
 "join&gt;</literal>, como sigue:"
 
-#: index.docbook:125
+#. Tag: programlisting
+#: inheritance_mapping.xml:149
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"PAYMENT_ID\">\n"
@@ -322,7 +368,9 @@
 "    </subclass>\n"
 "</class>]]>"
 
-#: index.docbook:127
+#. Tag: para
+#: inheritance_mapping.xml:151
+#, no-c-format
 msgid ""
 "The optional <literal>fetch=\"select\"</literal> declaration tells Hibernate "
 "not to fetch the <literal>ChequePayment</literal> subclass data using an "
@@ -333,19 +381,25 @@
 "literal> usando una uni&#x00f3;n externa (outer join) al consultar la "
 "superclase."
 
-#: index.docbook:136
+#. Tag: title
+#: inheritance_mapping.xml:160
+#, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr "Mezclando tabla por jerarqu&#x00ed;a de clases con tabla por subclase"
 
-#: index.docbook:138
+#. Tag: para
+#: inheritance_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "Puedes incluso mezclar las estrategias de tabla po jerarqu&#x00ed;a y tabla "
 "por subclase usando este enfoque:"
 
-#: index.docbook:143
+#. Tag: programlisting
+#: inheritance_mapping.xml:167
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"PAYMENT_ID\">\n"
@@ -389,7 +443,9 @@
 "    </subclass>\n"
 "</class>]]>"
 
-#: index.docbook:145
+#. Tag: para
+#: inheritance_mapping.xml:169
+#, no-c-format
 msgid ""
 "For any of these mapping strategies, a polymorphic association to the root "
 "<literal>Payment</literal> class is mapped using <literal>&lt;many-to-one&gt;"
@@ -399,7 +455,9 @@
 "polim&#x00f3;rfica a la clase ra&#x00ed;z <literal>Payment</literal> es "
 "mapeada usando <literal>&lt;many-to-one&gt;</literal>."
 
-#: index.docbook:151
+#. Tag: programlisting
+#: inheritance_mapping.xml:175
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"payment\" column=\"PAYMENT_ID\" class=\"Payment"
 "\"/>]]>"
@@ -407,19 +465,25 @@
 "<![CDATA[<many-to-one name=\"payment\" column=\"PAYMENT_ID\" class=\"Payment"
 "\"/>]]>"
 
-#: index.docbook:156
+#. Tag: title
+#: inheritance_mapping.xml:180
+#, no-c-format
 msgid "Table per concrete class"
 msgstr "Tabla por clase concreta"
 
-#: index.docbook:158
+#. Tag: para
+#: inheritance_mapping.xml:182
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "Podr&#x00ed;amos ir de dos maneras a la estrategia de mapeo de tabla por "
 "clase concreta. La primera es usar <literal>&lt;union-subclass&gt;</literal>."
 
-#: index.docbook:163
+#. Tag: programlisting
+#: inheritance_mapping.xml:187
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\">\n"
 "    <id name=\"id\" type=\"long\" column=\"PAYMENT_ID\">\n"
@@ -457,7 +521,9 @@
 "    </union-subclass>\n"
 "</class>]]>"
 
-#: index.docbook:165
+#. Tag: para
+#: inheritance_mapping.xml:189
+#, no-c-format
 msgid ""
 "Three tables are involved for the subclasses. Each table defines columns for "
 "all properties of the class, including inherited properties."
@@ -465,13 +531,15 @@
 "Est&#x00e1;n implicadas tres tablas. Cada tabla define columnas para todas "
 "las propiedades de la clase, inccluyendo las propiedades heredadas."
 
-#: index.docbook:170
+#. Tag: para
+#: inheritance_mapping.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "La limitaci&#x00f3;n de este enfoque es que si una propiedad es mapeada en "
 "la superclase, el nombre de columna debe ser el mismo en todas las tablas de "
@@ -481,27 +549,35 @@
 "clave primaria tiene que ser compartida a trav&#x00e9;s de todas las "
 "subclases unidas de una jerarqu&#x00ed;a."
 
-#: index.docbook:179
+#. Tag: para
+#: inheritance_mapping.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "UNTRANSLATED! If your superclass is abstract, map it with <literal>abstract="
 "\"true\"</literal>. Of course, if it is not abstract, an additional table "
 "(defaults to <literal>PAYMENT</literal> in the example above) is needed to "
 "hold instances of the superclass."
 
-#: index.docbook:189
-msgid "Table per concrete class, using implicit polymorphism"
+#. Tag: title
+#: inheritance_mapping.xml:213
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "Tabla por clase concreta, usando polimorfismo impl&#x00ed;cito"
 
-#: index.docbook:191
+#. Tag: para
+#: inheritance_mapping.xml:215
+#, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr "Un enfoque alternativo es hacer uso de polimorfismo impl&#x00ed;cito:"
 
-#: index.docbook:195
+#. Tag: programlisting
+#: inheritance_mapping.xml:219
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"CREDIT_PAYMENT_ID\">\n"
@@ -551,14 +627,16 @@
 "    ...\n"
 "</class>]]>"
 
-#: index.docbook:197
+#. Tag: para
+#: inheritance_mapping.xml:221
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "Nota que en ning&#x00fa;n sitio mencionamos la interface <literal>Payment</"
 "literal> expl&#x00ed;citamente. Nota adem&#x00e1;s que las propiedades de "
@@ -568,7 +646,9 @@
 "\"&gt; ]</literal> en la declaraci&#x00f3;n <literal>DOCTYPE</literal> y "
 "<literal>&amp;allproperties;</literal> en el mapeo)."
 
-#: index.docbook:207
+#. Tag: para
+#: inheritance_mapping.xml:231
+#, no-c-format
 msgid ""
 "The disadvantage of this approach is that Hibernate does not generate SQL "
 "<literal>UNION</literal>s when performing polymorphic queries."
@@ -576,7 +656,9 @@
 "La desventaja de este enfoque es que Hibernate no genera <literal>UNION</"
 "literal>s de SQL al realizar consultas polim&#x00f3;rficas."
 
-#: index.docbook:212
+#. Tag: para
+#: inheritance_mapping.xml:236
+#, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
 "literal> is usually mapped using <literal>&lt;any&gt;</literal>."
@@ -585,7 +667,9 @@
 "<literal>Payment</literal> es mapeada generalmente usando <literal>&lt;"
 "any&gt;</literal>."
 
-#: index.docbook:217
+#. Tag: programlisting
+#: inheritance_mapping.xml:241
+#, no-c-format
 msgid ""
 "<![CDATA[<any name=\"payment\" meta-type=\"string\" id-type=\"long\">\n"
 "    <meta-value value=\"CREDIT\" class=\"CreditCardPayment\"/>\n"
@@ -603,18 +687,21 @@
 "    <column name=\"PAYMENT_ID\"/>\n"
 "</any>]]>"
 
-#: index.docbook:222
+#. Tag: title
+#: inheritance_mapping.xml:246
+#, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr "Mezclando polimorfismo impl&#x00ed;cito con otros mapeos de herencia"
 
-#: index.docbook:224
+#. Tag: para
+#: inheritance_mapping.xml:248
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "Hay una cosa m&#x00e1;s por notar acerca de este mapeo. Ya que las subclases "
 "se mapean cada una en su propio elemento <literal>&lt;class&gt;</literal> (y "
@@ -623,7 +710,9 @@
 "(Y todav&#x00ed;a puedes seguir usando consultas polim&#x00f3;rficas contra "
 "la interface <literal>Payment</literal>.)"
 
-#: index.docbook:232
+#. Tag: programlisting
+#: inheritance_mapping.xml:256
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
 "    <id name=\"id\" type=\"long\" column=\"CREDIT_PAYMENT_ID\">\n"
@@ -681,14 +770,16 @@
 "    </joined-subclass>\n"
 "</class>]]>"
 
-#: index.docbook:234
+#. Tag: para
+#: inheritance_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "Una vez m&#x00e1;s, no mencionamos a <literal>Payment</literal> expl&#x00ed;"
@@ -699,23 +790,28 @@
 "literal>), <literal>CashPayment</literal> y <literal>ChequePayment</literal> "
 "pero no instancias de <literal>NonelectronicTransaction</literal>."
 
-#: index.docbook:249
+#. Tag: title
+#: inheritance_mapping.xml:273
+#, no-c-format
 msgid "Limitations"
 msgstr "Limitaciones"
 
-#: index.docbook:251
+#. Tag: para
+#: inheritance_mapping.xml:275
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "Existen ciertas limitaciones al enfoque de \"polimorfismo impl&#x00ed;cito\" "
 "en la estrategia de mapeo de tabla por clase concreta. Existen limitaciones "
 "algo menos restrictivas a los mapeos <literal>&lt;union-subclass&gt;</"
 "literal>."
 
-#: index.docbook:258
+#. Tag: para
+#: inheritance_mapping.xml:282
+#, no-c-format
 msgid ""
 "The following table shows the limitations of table per concrete-class "
 "mappings, and of implicit polymorphism, in Hibernate."
@@ -723,91 +819,142 @@
 "La siguiente tabla muestra las limitaciones de mapeos de tabla por clase "
 "concreta, y de polmorfismo impl&#x00ed;cito, en Hibernate."
 
-#: index.docbook:264
+#. Tag: title
+#: inheritance_mapping.xml:288
+#, no-c-format
 msgid "Features of inheritance mappings"
 msgstr "Funcionalidades de mapeo de herencia"
 
-#: index.docbook:276
+#. Tag: entry
+#: inheritance_mapping.xml:301
+#, no-c-format
 msgid "Inheritance strategy"
 msgstr "Estrategia de herencia"
 
-#: index.docbook:277
+#. Tag: entry
+#: inheritance_mapping.xml:302
+#, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "muchos-a-uno polim&#x00f3;rfica"
 
-#: index.docbook:278
+#. Tag: entry
+#: inheritance_mapping.xml:303
+#, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "uno-a-uno polim&#x00f3;rfica"
 
-#: index.docbook:279
+#. Tag: entry
+#: inheritance_mapping.xml:304
+#, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "uno-a-muchos polim&#x00f3;rfica"
 
-#: index.docbook:280
+#. Tag: entry
+#: inheritance_mapping.xml:305
+#, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "mushos-a-muchos polim&#x00f3;rfica"
 
-#: index.docbook:281
+#. Tag: entry
+#: inheritance_mapping.xml:306
+#, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr "<literal>load()/get()</literal> polim&#x00f3;rficos"
 
-#: index.docbook:282
+#. Tag: entry
+#: inheritance_mapping.xml:307
+#, no-c-format
 msgid "Polymorphic queries"
 msgstr "Consultas polim&#x00f3;rficas"
 
-#: index.docbook:283
+#. Tag: entry
+#: inheritance_mapping.xml:308
+#, no-c-format
 msgid "Polymorphic joins"
 msgstr "Uniones polim&#x00f3;rficas"
 
-#: index.docbook:284
+#. Tag: entry
+#: inheritance_mapping.xml:309
+#, no-c-format
 msgid "Outer join fetching"
 msgstr "Recuperaci&#x00f3;n por uni&#x00f3;n externa (outer join)"
 
-#: index.docbook:289
+#. Tag: entry
+#: inheritance_mapping.xml:314
+#, no-c-format
 msgid "table per class-hierarchy"
 msgstr "<entry>tabla por jerarqu&#x00ed;a de clases</entry>"
 
-#: index.docbook:290, index.docbook:301, index.docbook:312
+#. Tag: literal
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
+#, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
-#: index.docbook:291, index.docbook:302, index.docbook:313
+#. Tag: literal
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
+#, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
-#: index.docbook:292, index.docbook:303
+#. Tag: literal
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
+#, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
-#: index.docbook:293, index.docbook:304, index.docbook:315
+#. Tag: literal
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
+#, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
-#: index.docbook:294, index.docbook:305, index.docbook:316
+#. Tag: literal
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
+#, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
-#: index.docbook:295, index.docbook:306, index.docbook:317, index.docbook:328
+#. Tag: literal
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
+#, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
-#: index.docbook:296, index.docbook:307, index.docbook:318
+#. Tag: literal
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
+#, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
-#: index.docbook:297, index.docbook:308, index.docbook:319
+#. Tag: emphasis
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
+#, no-c-format
 msgid "supported"
 msgstr "soportada"
 
-#: index.docbook:300
+#. Tag: entry
+#: inheritance_mapping.xml:325
+#, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr "<entry>tabla por subclase</entry>"
 
-#: index.docbook:311
+#. Tag: entry
+#: inheritance_mapping.xml:336
+#, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "tabla por clase concreta (union-subclass)"
 
-#: index.docbook:314
+#. Tag: entry
+#: inheritance_mapping.xml:339
+#, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
 "literal> only)"
@@ -815,30 +962,41 @@
 "<literal>&lt;one-to-many&gt;</literal> (para <literal>inverse=\"true\"</"
 "literal> solamente)"
 
-#: index.docbook:322
+#. Tag: entry
+#: inheritance_mapping.xml:347
+#, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "tabla por clase concreta (polimorfismo impl&#x00ed;cito)"
 
-#: index.docbook:323
+#. Tag: literal
+#: inheritance_mapping.xml:348
+#, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
-#: index.docbook:324, index.docbook:325, index.docbook:329, index.docbook:330
+#. Tag: emphasis
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
+#, no-c-format
 msgid "not supported"
 msgstr "no soportada"
 
-#: index.docbook:326
+#. Tag: literal
+#: inheritance_mapping.xml:351
+#, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
-#: index.docbook:327
+#. Tag: literal
+#: inheritance_mapping.xml:352
+#, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"
 msgstr ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: performance.xml:29
+#, no-c-format
 msgid "Improving performance"
 msgstr "Mejorando el rendimiento"
 
-#: index.docbook:8
+#. Tag: title
+#: performance.xml:32
+#, no-c-format
 msgid "Fetching strategies"
 msgstr "Estrategias de recuperaci&#x00f3;n"
 
-#: index.docbook:10
+#. Tag: para
+#: performance.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "Una <emphasis>estrategia de recuperaci&#x00f3;n</emphasis> es la estrategia "
 "que usar&#x00e1; Hibernate para recuperar los objetos asociados cuando la "
@@ -27,13 +35,17 @@
 "sobrescritas por una consulta HQL o <literal>Criteria</literal> en "
 "particular."
 
-#: index.docbook:17
+#. Tag: para
+#: performance.xml:41
+#, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr "Hibernate3 define las siguientes estrategias de recuperaci&#x00f3;n:"
 
-#: index.docbook:23
+#. Tag: para
+#: performance.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -41,12 +53,14 @@
 "Hibernate recupera la instancia asociada o colecci&#x00f3;n en la misma "
 "<literal>SELECT</literal>, usando una <literal>OUTER JOIN</literal>."
 
-#: index.docbook:30
+#. Tag: para
+#: performance.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n por selecci&#x00f3;n (select fetching)</"
 "emphasis> - se usa una segunda <literal>SELECT</literal> para recuperar la "
@@ -55,13 +69,15 @@
 "\"</literal>, la segunda selecci&#x00f3;n s&#x00f3;lo ser&#x00e1; ejecutada "
 "cuando realmente accedas a la asociaci&#x00f3;n."
 
-#: index.docbook:39
+#. Tag: para
+#: performance.xml:63
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n por subselecci&#x00f3;n (subselect fetching)</"
 "emphasis> - se usa una segunda <literal>SELECT</literal> para recuperar las "
@@ -71,11 +87,13 @@
 "literal>, esta segunda selecci&#x00f3;n s&#x00f3;lo ser&#x00e1; ejecutada "
 "cuando realmente accedas a la asociaci&#x00f3;n."
 
-#: index.docbook:48
+#. Tag: para
+#: performance.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n en lote</emphasis> - una estrategia de "
@@ -84,45 +102,55 @@
 "sola <literal>SELECT</literal>, especificando una lista de claves primarias "
 "o de claves for&#x00e1;neas."
 
-#: index.docbook:57
+#. Tag: para
+#: performance.xml:81
+#, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "Hibernate tambi&#x00e9;n distingue entre:"
 
-#: index.docbook:63
+#. Tag: para
+#: performance.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n inmediata</emphasis> - una asociaci&#x00f3;n, "
 "colecci&#x00f3;n o atributo es recuperado inmediatamente, cuando el "
 "due&#x00f1;o es cargado."
 
-#: index.docbook:69
+#. Tag: para
+#: performance.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n perezosa de colecciones</emphasis> - se "
 "recupera una colecci&#x00f3;n cuando la aplicaci&#x00f3;n invoca una "
 "operaci&#x00f3;n sobre la colecci&#x00f3;n. (Esto es por defecto para las "
 "colecciones.)"
 
-#: index.docbook:76
+#. Tag: para
+#: performance.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
 "elements of the collection are accessed from the database as needed. "
 "Hibernate tries not to fetch the whole collection into memory unless "
 "absolutely needed (suitable for very large collections)"
 
-#: index.docbook:84
+#. Tag: para
+#: performance.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -130,22 +158,26 @@
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 
-#: index.docbook:91
+#. Tag: para
+#: performance.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>Recuperaci&#x00f3;n por proxy</emphasis> - se recupera una "
 "asociaci&#x00f3;n monovaluada cuando se invoca un m&#x00e9;todo que no sea "
 "el getter del identificador sobre el objeto asociado."
 
-#: index.docbook:101
+#. Tag: para
+#: performance.xml:125
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -154,13 +186,16 @@
 "variable de instancia (requiere instrumentaci&#x00f3;n del bytecode en "
 "tiempo de ejecuci&#x00f3;n). Este enfoque es raramente necesario."
 
-#: index.docbook:110
+#. Tag: para
+#: performance.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "Aqu&#x00ed; tenemos dos nociones ortogonales: <emphasis>cu&#x00e1;ndo</"
 "emphasis> se recupera la aplicaci&#x00f3;n, y <emphasis>c&#x00f3;mo</"
@@ -170,15 +205,19 @@
 "est&#x00e1;n siempre disponibles en cualquier instancia separada de una "
 "clase en particular."
 
-#: index.docbook:119
+#. Tag: title
+#: performance.xml:143
+#, no-c-format
 msgid "Working with lazy associations"
 msgstr "Trabajando con asociaciones perezosas"
 
-#: index.docbook:121
+#. Tag: para
+#: performance.xml:145
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "Por defecto, Hibernate3 usa una recuperaci&#x00f3;n perezosa por "
 "selecci&#x00f3;n para colecciones y una recuperaci&#x00f3;n por proxy "
@@ -186,12 +225,13 @@
 "tienen sentido para casi todas las asociaciones en casi todas las "
 "aplicaciones."
 
-#: index.docbook:127
+#. Tag: para
+#: performance.xml:151
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>Nota:</emphasis> si estableces <literal>hibernate."
 "default_batch_fetch_size</literal>, Hibernate usar&#x00e1; la "
@@ -199,18 +239,21 @@
 "perezosa (esta optimizaci&#x00f3;n tambi&#x00e9;n puede ser habilitada a un "
 "nivel m&#x00e1;s granularizado)."
 
-#: index.docbook:134
+#. Tag: para
+#: performance.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "Sin embargo, la recuperaci&#x00f3;n perezosa plantea un problema del que "
 "tienes que estar al tanto. Acceder a una asociaci&#x00f3;n perezosa fuera "
 "del contexto de una sesi&#x00f3;n de Hibernate abierta resultar&#x00e1; en "
 "una excepci&#x00f3;n. Por ejemplo:"
 
-#: index.docbook:140
+#. Tag: programlisting
+#: performance.xml:164
+#, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
 "Transaction tx = s.beginTransaction();\n"
@@ -236,13 +279,15 @@
 "\n"
 "Integer accessLevel = (Integer) permissions.get(\"accounts\");  // Error!]]>"
 
-#: index.docbook:142
+#. Tag: para
+#: performance.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "Ya que la colecci&#x00f3;n de permisos no fue inicializada cuando se "
 "cerr&#x00f3; la <literal>Session</literal>, la colecci&#x00f3;n no "
@@ -251,14 +296,16 @@
 "soluci&#x00f3;n es mover el c&#x00f3;digo que lee de la colecci&#x00f3;n a "
 "justo antes que la transacci&#x00f3;n sea comprometida."
 
-#: index.docbook:150
+#. Tag: para
+#: performance.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "Alternativamente, podr&#x00ed;amos usar una colecci&#x00f3;n no perezosa o "
 "asociaci&#x00f3;n, especificando <literal>lazy=\"false\"</literal> para el "
@@ -268,13 +315,15 @@
 "modelo de objetos, Hibernate terminar&#x00e1; necesitando recuperar la base "
 "de datos entera en cada transacci&#x00f3;n!"
 
-#: index.docbook:159
+#. Tag: para
+#: performance.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "Por otro lado, frecuentemente necesitamos elegir la recuperaci&#x00f3;n por "
 "uni&#x00f3;n (que es no perezosa por naturaleza) en vez de la "
@@ -284,11 +333,15 @@
 "estrategia de recuperaci&#x00f3;n son id&#x00e9;nticas a las de las "
 "asociaciones monovaluadas y colecciones."
 
-#: index.docbook:170
+#. Tag: title
+#: performance.xml:194
+#, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "Afinando las estrategias de recuperaci&#x00f3;n"
 
-#: index.docbook:172
+#. Tag: para
+#: performance.xml:196
+#, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
 "problems, so we might want to enable join fetching in the mapping document:"
@@ -298,7 +351,9 @@
 "querr&#x00ed;amos habilitar la recuperaci&#x00f3;n por uni&#x00f3;n (join "
 "fetching) en el documento de mapeo:"
 
-#: index.docbook:177
+#. Tag: programlisting
+#: performance.xml:201
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
 "            fetch=\"join\">\n"
@@ -312,12 +367,16 @@
 "    <one-to-many class=\"Permission\"/>\n"
 "</set]]>"
 
-#: index.docbook:179
+#. Tag: programlisting
+#: performance.xml:203
+#, no-c-format
 msgid "<![CDATA[<many-to-one name=\"mother\" class=\"Cat\" fetch=\"join\"/>]]>"
 msgstr ""
 "<![CDATA[<many-to-one name=\"mother\" class=\"Cat\" fetch=\"join\"/>]]>"
 
-#: index.docbook:181
+#. Tag: para
+#: performance.xml:205
+#, no-c-format
 msgid ""
 "The <literal>fetch</literal> strategy defined in the mapping document "
 "affects:"
@@ -325,40 +384,52 @@
 "La estrategia de recuperaci&#x00f3;n definida en el documento de mapeo "
 "afecta a:"
 
-#: index.docbook:187
+#. Tag: para
+#: performance.xml:211
+#, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr ""
 "las recuperaciones v&#x00ed;a <literal>get()</literal> o <literal>load()</"
 "literal>"
 
-#: index.docbook:192
+#. Tag: para
+#: performance.xml:216
+#, no-c-format
 msgid "retrieval that happens implicitly when an association is navigated"
 msgstr ""
 "las recuperaciones que ocurren impl&#x00ed;citamente cuando se navega una "
 "asociaci&#x00f3;n (recuperaci&#x00f3;n perezosa)"
 
-#: index.docbook:197
+#. Tag: para
+#: performance.xml:221
+#, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr "las consultas de <literal>Criteria</literal>"
 
-#: index.docbook:202
+#. Tag: para
+#: performance.xml:226
+#, no-c-format
 msgid "HQL queries if <literal>subselect</literal> fetching is used"
 msgstr "HQL queries if <literal>subselect</literal> fetching is used"
 
-#: index.docbook:208
+#. Tag: para
+#: performance.xml:232
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "No matter what fetching strategy you use, the defined non-lazy graph is "
 "guaranteed to be loaded into memory. Note that this might result in several "
 "immediate selects being used to execute a particular HQL query."
 
-#: index.docbook:214
+#. Tag: para
+#: performance.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -372,18 +443,22 @@
 "usando una uni&#x00f3;n externa. En la API de consulta de <literal>Criteria</"
 "literal>, usar&#x00ed;as <literal>setFetchMode(FetchMode.JOIN)</literal>."
 
-#: index.docbook:223
+#. Tag: para
+#: performance.xml:247
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "Si acaso lo deseases, podr&#x00ed;as cambiar la estrategia de "
 "recuperaci&#x00f3;n usada por <literal>get()</literal> or <literal>load()</"
 "literal>; simplemente usa una consulta <literal>Criteria</literal>, por "
 "ejemplo:"
 
-#: index.docbook:229
+#. Tag: programlisting
+#: performance.xml:253
+#, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
 "                .setFetchMode(\"permissions\", FetchMode.JOIN)\n"
@@ -395,34 +470,42 @@
 "                .add( Restrictions.idEq(userId) )\n"
 "                .uniqueResult();]]>"
 
-#: index.docbook:231
+#. Tag: para
+#: performance.xml:255
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(Esto es el equivalente de Hibernate de lo que otras soluciones ORM llaman "
 "un \"plan de recuperaci&#x00f3;n\".)"
 
-#: index.docbook:235
+#. Tag: para
+#: performance.xml:259
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr ""
 "Una forma completamente diferente de evitar problemas con selecciones N+1 es "
 "usar el cach&#x00e9; de segundo nivel."
 
-#: index.docbook:243
+#. Tag: title
+#: performance.xml:267
+#, no-c-format
 msgid "Single-ended association proxies"
 msgstr "Proxies de asociaciones de un solo extremo"
 
-#: index.docbook:245
+#. Tag: para
+#: performance.xml:269
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "La recuperaci&#x00f3;n perezosa de colecciones est&#x00e1; implementada "
 "usando la implementaci&#x00f3;n de colecciones persistentes propia de "
@@ -433,9 +516,11 @@
 "persistentes usando mejora del bytecode en tiempo de ejecuci&#x00f3;n (por "
 "medio de la excelente biblioteca CGLIB)."
 
-#: index.docbook:253
+#. Tag: para
+#: performance.xml:277
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -444,13 +529,15 @@
 "de asociaciones <literal>muchos-a-uno</literal> y <literal>uno-a-uno</"
 "literal>."
 
-#: index.docbook:259
+#. Tag: para
+#: performance.xml:283
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "El fichero de mapeo puede declarar una interface a usar como interface de "
 "proxy para esa clase, con el atributo <literal>proxy</literal>. Por defecto, "
@@ -459,15 +546,19 @@
 "visibilidad de paquete. &#x00a1;Recomendamos este constructor para todas las "
 "clases persistentes!</emphasis>"
 
-#: index.docbook:266
+#. Tag: para
+#: performance.xml:290
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr ""
 "Hay algunos puntos a tener en cuenta al extender este enfoque a clases "
 "polim&#x00f3;rficas, por ejemplo."
 
-#: index.docbook:271
+#. Tag: programlisting
+#: performance.xml:294
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
 "    ......\n"
@@ -483,7 +574,9 @@
 "    </subclass>\n"
 "</class>]]>"
 
-#: index.docbook:273
+#. Tag: para
+#: performance.xml:296
+#, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
 "<literal>DomesticCat</literal>, even if the underlying instance is an "
@@ -493,7 +586,9 @@
 "de un cast a <literal>DomesticCat</literal>, incluso aunque la instancia "
 "subyacente sea instancia de <literal>DomesticCat</literal>:"
 
-#: index.docbook:279
+#. Tag: programlisting
+#: performance.xml:302
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
 "proxy (does not hit the db)\n"
@@ -511,12 +606,16 @@
 "    ....\n"
 "}]]>"
 
-#: index.docbook:281
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#. Tag: para
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr ""
 "Segundo, es posible romper con el operador <literal>==</literal> de un proxy."
 
-#: index.docbook:285
+#. Tag: programlisting
+#: performance.xml:308
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
 "instantiate a Cat proxy\n"
@@ -532,7 +631,9 @@
 "DomesticCat proxy!\n"
 "System.out.println(cat==dc);                            // false]]>"
 
-#: index.docbook:287
+#. Tag: para
+#: performance.xml:310
+#, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
 "have two references to different proxy objects, the underlying instance will "
@@ -542,7 +643,9 @@
 "tenemos ahora dos referencias a objetos proxy diferentes, la instancia "
 "subyacente ser&#x00e1; a&#x00fa;n el mismo objeto:"
 
-#: index.docbook:292
+#. Tag: programlisting
+#: performance.xml:315
+#, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
 "System.out.println( dc.getWeight() );  // 11.0]]>"
@@ -550,19 +653,23 @@
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
 "System.out.println( dc.getWeight() );  // 11.0]]>"
 
-#: index.docbook:294
+#. Tag: para
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr ""
 "Tercero, no debes usar un proxy CGLIB para una clase <literal>final</"
 "literal> o una clase con alg&#x00fa;n m&#x00e9;todo <literal>final</literal>."
 
-#: index.docbook:299
+#. Tag: para
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "Finalmente, si tu objeto persistente adquiere cualquier recurso bajo "
@@ -570,12 +677,17 @@
 "defecto), entonces esos recursos ser&#x00e1;n adquiridos tambi&#x00e9;n por "
 "el proxy. La clase del proxy es una subclase real de la clase persistente."
 
-#: index.docbook:305
+#. Tag: para
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "Estos problemas se deben a limitaciones fundamentales en el modelo de "
 "herencia &#x00fa;nica de Java. Si deseas evitar estos problemas cada una de "
@@ -583,7 +695,9 @@
 "m&#x00e9;todos de negocio. Debes especificar estas interfaces en el fichero "
 "de mapeo. Por ejemplo:"
 
-#: index.docbook:311
+#. Tag: programlisting
+#: performance.xml:336
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
 "    ......\n"
@@ -599,23 +713,21 @@
 "    </subclass>\n"
 "</class>]]>"
 
-#: index.docbook:313
+#. Tag: para
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"donde <literal>CatImpl</literal> implementa la interface <literal>Cat</"
-"literal> y <literal>DomesticCatImpl</literal> implementa la interface "
-"<literal>DomesticCat</literal>. Entonces <literal>load()</literal> o "
-"<literal>iterate()</literal> pueden devolver instancias de <literal>Cat</"
-"literal> y <literal>DomesticCat</literal>. (Nota que <literal>list()</"
-"literal> usualmente no devuelve proxies.)"
+"Primero, las instancias de <literal>Cat</literal> nunca ser&#x00e1;n objeto "
+"de un cast a <literal>DomesticCat</literal>, incluso aunque la instancia "
+"subyacente sea instancia de <literal>DomesticCat</literal>:"
 
-#: index.docbook:321
+#. Tag: programlisting
+#: performance.xml:343
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
 "Iterator iter = session.createQuery(\"from CatImpl as cat where cat."
@@ -627,7 +739,21 @@
 "name='fritz'\").iterate();\n"
 "Cat fritz = (Cat) iter.next();]]>"
 
-#: index.docbook:323
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "las consultas de <literal>Criteria</literal>"
+
+#. Tag: para
+#: performance.xml:352
+#, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
 "properties to be of type <literal>Cat</literal>, not <literal>CatImpl</"
@@ -637,34 +763,44 @@
 "significa que debes declarar cualquier propiedad como de tipo <literal>Cat</"
 "literal>, no <literal>CatImpl</literal>."
 
-#: index.docbook:328
+#. Tag: para
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr ""
 "Ciertas operaciones <emphasis>no</emphasis> requieren inicializaci&#x00f3;n "
 "de proxies."
 
-#: index.docbook:334
+#. Tag: para
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal>, si la clase persistente no sobrescribe "
 "<literal>equals()</literal>"
 
-#: index.docbook:340
+#. Tag: para
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal>, si la clase persistente no sobrescribe "
 "<literal>hashCode()</literal>"
 
-#: index.docbook:346
+#. Tag: para
+#: performance.xml:375
+#, no-c-format
 msgid "The identifier getter method"
 msgstr "El m&#x00e9;todo getter del identificador"
 
-#: index.docbook:352
+#. Tag: para
+#: performance.xml:381
+#, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
 "literal> or <literal>hashCode()</literal>."
@@ -672,12 +808,14 @@
 "Hibernate detectar&#x00e1; las clase persistentes que sobrescriban "
 "<literal>equals()</literal> o <literal>hashCode()</literal>."
 
-#: index.docbook:357
+#. Tag: para
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "UNTRANSLATED!!! By choosing <literal>lazy=\"no-proxy\"</literal> instead of "
 "the default <literal>lazy=\"proxy\"</literal>, we can avoid the problems "
@@ -685,16 +823,20 @@
 "instrumentation, and all operations will result in immediate proxy "
 "initialization."
 
-#: index.docbook:367
+#. Tag: title
+#: performance.xml:396
+#, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "Inicializando colecciones y proxies"
 
-#: index.docbook:369
+#. Tag: para
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "Una <literal>LazyInitializationException</literal> ser&#x00e1; lanzada por "
 "Hibernate si una colecci&#x00f3;n o proxy sin inicializar es accedido fuera "
@@ -702,13 +844,15 @@
 "entidad que posee la colecci&#x00f3;n o que tiene la referencia al proxy "
 "est&#x00e9; en el estado separada."
 
-#: index.docbook:375
+#. Tag: para
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "A veces necesitamos asegurarnos que un proxy o colecci&#x00f3;n est&#x00e9; "
 "inicializado antes de cerrar la <literal>Session</literal>. Por supuesto, "
@@ -717,10 +861,12 @@
 "ejemplo. Pero esto es confuso a lectores del c&#x00f3;digo y no es "
 "conveniente para c&#x00f3;digo gen&#x00e9;rico."
 
-#: index.docbook:382
+#. Tag: para
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -736,10 +882,12 @@
 "abierta. <literal>Hibernate.initialize( cat.getKittens() )</literal> tiene "
 "un efecto similar para la colecci&#x00f3;n de gatitos."
 
-#: index.docbook:391
+#. Tag: para
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -756,10 +904,12 @@
 "inicializa una colecci&#x00f3;n. Existen dos formas b&#x00e1;sicas de tratar "
 "este tema:"
 
-#: index.docbook:402
+#. Tag: para
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -784,20 +934,21 @@
 "actual (ver el cap&#x00ed;tulo 1, <xref linkend=\"quickstart-playingwithcats"
 "\"/>, para una implementaci&#x00f3;n de ejemplo)."
 
-#: index.docbook:415
+#. Tag: para
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "En una aplciaci&#x00f3;n con una grada de negocios separada, la l&#x00f3;"
 "gica de negocio debe \"preparar\" todas las colecciones que se vayan a "
@@ -814,13 +965,15 @@
 "patr&#x00f3;n <emphasis>Comando</emphasis> en vez de un <emphasis>Fachada de "
 "Sesi&#x00f3;n</emphasis>."
 
-#: index.docbook:430
+#. Tag: para
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "Puedes tambi&#x00e9;n adjuntar un objeto cargado previamente a una nueva "
 "<literal>Session</literal> con <literal>merge()</literal> o <literal>lock()</"
@@ -829,16 +982,21 @@
 "esto autom&#x00e1;ticamente, ya que introducir&#x00ed;a sem&#x00e1;nticas de "
 "transacci&#x00f3;n ad hoc!"
 
-#: index.docbook:440
+#. Tag: para
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "A veces no quieres inicializar una colecci&#x00f3;n grande, pero necesitas "
 "a&#x00fa;n alguna informacion sobre ella (como su tama&#x00f1;o) o un "
 "subconjunto de los datos."
 
-#: index.docbook:445
+#. Tag: para
+#: performance.xml:474
+#, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
 "initializing it:"
@@ -846,7 +1004,9 @@
 "Puedes usar un filtro de colecciones para obtener el tama&#x00f1;o de una "
 "colecci&#x00f3;n sin inicializarla:"
 
-#: index.docbook:449
+#. Tag: programlisting
+#: performance.xml:478
+#, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
 "().get(0) ).intValue()]]>"
@@ -854,7 +1014,9 @@
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
 "().get(0) ).intValue()]]>"
 
-#: index.docbook:451
+#. Tag: para
+#: performance.xml:480
+#, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
 "retrieve subsets of a collection without needing to initialize the whole "
@@ -864,7 +1026,9 @@
 "para recuperar eficientemente subconjuntos de una colecci&#x00f3;n sin "
 "necesidad de inicializar toda la colecci&#x00f3;n:"
 
-#: index.docbook:456
+#. Tag: programlisting
+#: performance.xml:485
+#, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
 "setMaxResults(10).list();]]>"
@@ -872,17 +1036,20 @@
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
 "setMaxResults(10).list();]]>"
 
-#: index.docbook:461
+#. Tag: title
+#: performance.xml:490
+#, no-c-format
 msgid "Using batch fetching"
 msgstr "Usando recuperaci&#x00f3;n en lotes"
 
-#: index.docbook:463
+#. Tag: para
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "Hibernate puede hacer un uso eficiente de la recuperaci&#x00f3;n en lotes, "
 "esto es, Hibernate puede cargar muchos proxies sin inicializar si se accede "
@@ -891,18 +1058,20 @@
 "selecci&#x00f3;n perezosa. Hay dos formas en que puedes afinar la "
 "recuperaci&#x00f3;n en lotes: a nivel de la clase o de la colecci&#x00f3;n."
 
-#: index.docbook:469
+#. Tag: para
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "La recuperaci&#x00f3;n en lotes para clases/entidades es m&#x00e1;s f&#x00e1;"
 "cil de entender. Imagina que tienes la siguiente situaci&#x00f3;n en tiempo "
@@ -917,22 +1086,28 @@
 "comportamiento especificando un <literal>batch-size</literal> en el mapeo de "
 "<literal>Person</literal>:"
 
-#: index.docbook:479
+#. Tag: programlisting
+#: performance.xml:508
+#, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 
-#: index.docbook:481
+#. Tag: para
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 "Hibernate ahora ejecutar&#x00e1; s&#x00f3;lo tres consultas, el patr&#x00f3;"
 "n es 10, 10, 5."
 
-#: index.docbook:485
+#. Tag: para
+#: performance.xml:514
+#, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
-"and 10 persons are currently loaded in the <literal>Sesssion</literal>, "
+"and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
 "one for every call to <literal>getCats()</literal>. If you enable batch "
 "fetching for the <literal>cats</literal> collection in the mapping of "
@@ -948,7 +1123,9 @@
 "literal> en el mapeo de <literal>Person</literal>, Hibernate puede recuperar "
 "por adelantado las colecciones:"
 
-#: index.docbook:494
+#. Tag: programlisting
+#: performance.xml:523
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <set name=\"cats\" batch-size=\"3\">\n"
@@ -962,7 +1139,9 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:496
+#. Tag: para
+#: performance.xml:525
+#, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
 "collections in four <literal>SELECT</literal>s. Again, the value of the "
@@ -974,12 +1153,14 @@
 "valor del atributo depende del n&#x00fa;mero esperado de colecciones sin "
 "inicializar en una <literal>Session</literal> en particular."
 
-#: index.docbook:502
+#. Tag: para
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "La recuperaci&#x00f3;n de coleccione en lotes es particularmente &#x00fa;til "
 "si tienes un &#x00e1;rbol anidado de &#x00ed;tems, es decir, el t&#x00ed;"
@@ -988,34 +1169,42 @@
 "a ser una mejor opci&#x00f3;n para &#x00e1;rboles que sean de lectura en la "
 "mayor&#x00ed;a de los casos.)"
 
-#: index.docbook:511
+#. Tag: title
+#: performance.xml:540
+#, no-c-format
 msgid "Using subselect fetching"
 msgstr "Usando recuperaci&#x00f3;n por subselecci&#x00f3;n"
 
-#: index.docbook:513
+#. Tag: para
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "Si una colecci&#x00f3;n perezosa o proxy monovaluado tiene que ser "
 "recuperado, Hibernate los carga a todos, volviendo a ejecutar la consulta "
 "original en una subselecci&#x00f3;n. Esto funciona de la misma forma que la "
 "recuperaci&#x00f3;n en lotes, sin carga fragmentaria."
 
-#: index.docbook:524
+#. Tag: title
+#: performance.xml:553
+#, no-c-format
 msgid "Using lazy property fetching"
 msgstr "Usando recuperaci&#x00f3;n perezosa de propiedades"
 
-#: index.docbook:526
+#. Tag: para
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "Hibernate3 soporta la recuperaci&#x00f3;n perezosa de propiedades "
 "individuales. Esta t&#x00e9;cnica de optimizaci&#x00f3;n es tambi&#x00e9;n "
@@ -1027,7 +1216,9 @@
 "podr&#x00ed;a ser &#x00fa;til en casos extremos, cuando tablas heredadas "
 "tienen cientos de columnas y el modelo de datos no puede ser mejorado."
 
-#: index.docbook:535
+#. Tag: para
+#: performance.xml:564
+#, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
 "on your particular property mappings:"
@@ -1035,7 +1226,9 @@
 "Para habilitar la carga perezosa de propiedades, establece el atributo "
 "<literal>lazy</literal> en tus mapeos de propiedades:"
 
-#: index.docbook:540
+#. Tag: programlisting
+#: performance.xml:569
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
 "       <id name=\"id\">\n"
@@ -1059,11 +1252,13 @@
 ">\n"
 "</class>]]>"
 
-#: index.docbook:542
+#. Tag: para
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "&#x00a1;La carga perezosa de propiedades requiere la instrumentaci&#x00f3;n "
 "del bytecode en tiempo de construcci&#x00f3;n! Si tus clases persistentes no "
@@ -1071,12 +1266,16 @@
 "configuraci&#x00f3;n perezosa de propiedades y caer&#x00e1; en "
 "recuperaci&#x00f3;n inmediata."
 
-#: index.docbook:548
+#. Tag: para
+#: performance.xml:577
+#, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr ""
 "Para la instrumentaci&#x00f3;n del bytecode, usa la siguiente tarea Ant:"
 
-#: index.docbook:552
+#. Tag: programlisting
+#: performance.xml:581
+#, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
 "    <taskdef name=\"instrument\" classname=\"org.hibernate.tool.instrument."
@@ -1108,12 +1307,14 @@
 "    </instrument>\n"
 "</target>]]>"
 
-#: index.docbook:554
+#. Tag: para
+#: performance.xml:583
+#, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a prefered solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "Una forma diferente (&#x00bf;mejor?) de evitar lecturas innecesarias de "
 "columnas, al menos para transacciones de s&#x00f3;lo lectura es usar las "
@@ -1121,27 +1322,33 @@
 "la necesidad de procesar el bytecode en tiempo de construcci&#x00f3;n y "
 "ciertamente es una soluci&#x00f3;n preferida."
 
-#: index.docbook:561
+#. Tag: para
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "Puedes forzar la usual recuperaci&#x00f3;n temprana de propiedades usando "
 "<literal>fetch all properties</literal> en HQL."
 
-#: index.docbook:571
+#. Tag: title
+#: performance.xml:600
+#, no-c-format
 msgid "The Second Level Cache"
 msgstr "El Cach&#x00e9; de Segundo Nivel"
 
-#: index.docbook:573
+#. Tag: para
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "Una <literal>Session</literal> de Hibernate es una cach&#x00e9; de datos "
 "persistentes a nivel de transacci&#x00f3;n. Es posible configurar un cluster "
@@ -1152,16 +1359,17 @@
 "aplicaci&#x00f3;n al almac&#x00e9;n persistente (aunque pueden ser "
 "configurados para expirar regularmente los datos en cach&#x00e9;)."
 
-#: index.docbook:581
+#. Tag: para
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "Por defecto, Hibernate usa EHCache para caching a nivel de JVM. (El soporte "
 "a JCS ahora est&#x00e1; despreciado y ser&#x00e1; quitado en una futura "
@@ -1170,110 +1378,182 @@
 "hibernate.cache.CacheProvider</literal> usando la propiedad "
 "<literal>hibernate.cache.provider_class</literal>."
 
-#: index.docbook:592
+#. Tag: title
+#: performance.xml:621
+#, no-c-format
 msgid "Cache Providers"
 msgstr "Proveedores de Cach&#x00e9;"
 
-#: index.docbook:601, index.docbook:774
+#. Tag: entry
+#: performance.xml:630 performance.xml:818
+#, no-c-format
 msgid "Cache"
 msgstr "Cach&#x00e9;"
 
-#: index.docbook:602
+#. Tag: entry
+#: performance.xml:631
+#, no-c-format
 msgid "Provider class"
 msgstr "clase del Provedor"
 
-#: index.docbook:603
+#. Tag: entry
+#: performance.xml:632
+#, no-c-format
 msgid "Type"
 msgstr "Tipo"
 
-#: index.docbook:604
+#. Tag: entry
+#: performance.xml:633
+#, no-c-format
 msgid "Cluster Safe"
 msgstr "Cluster Seguro"
 
-#: index.docbook:605
+#. Tag: entry
+#: performance.xml:634
+#, no-c-format
 msgid "Query Cache Supported"
 msgstr "Cach&#x00e9; de Consultas Soportado"
 
-#: index.docbook:610, index.docbook:783
+#. Tag: entry
+#: performance.xml:639 performance.xml:827
+#, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr "Hashtable (no pensado para uso en producci&#x00f3;n)"
 
-#: index.docbook:611
+#. Tag: literal
+#: performance.xml:640
+#, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
-#: index.docbook:612
+#. Tag: entry
+#: performance.xml:641
+#, no-c-format
 msgid "memory"
 msgstr "memoria"
 
-#: index.docbook:614, index.docbook:621, index.docbook:628, index.docbook:784,
-#: index.docbook:785, index.docbook:786, index.docbook:791, index.docbook:792,
-#: index.docbook:793, index.docbook:798, index.docbook:799, index.docbook:800,
-#: index.docbook:805, index.docbook:806, index.docbook:812, index.docbook:815
+#. Tag: entry
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
+#, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>si</entry>"
 
-#: index.docbook:617, index.docbook:790
+#. Tag: entry
+#: performance.xml:646 performance.xml:834
+#, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
-#: index.docbook:618
+#. Tag: literal
+#: performance.xml:647
+#, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
-#: index.docbook:619, index.docbook:626
+#. Tag: entry
+#: performance.xml:648 performance.xml:655
+#, no-c-format
 msgid "memory, disk"
 msgstr "memoria, disco"
 
-#: index.docbook:624, index.docbook:797
+#. Tag: entry
+#: performance.xml:653 performance.xml:841
+#, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
-#: index.docbook:625
+#. Tag: literal
+#: performance.xml:654
+#, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
-#: index.docbook:631, index.docbook:804
+#. Tag: entry
+#: performance.xml:660 performance.xml:848
+#, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
-#: index.docbook:632
+#. Tag: literal
+#: performance.xml:661
+#, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
-#: index.docbook:633
+#. Tag: entry
+#: performance.xml:662
+#, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "clusterizado (ip multicast)"
 
-#: index.docbook:634
+#. Tag: entry
+#: performance.xml:663
+#, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "s&#x00ed; (invalidaci&#x00f3;n en cluster)"
 
-#: index.docbook:638, index.docbook:811
-msgid "JBoss TreeCache"
+#. Tag: entry
+#: performance.xml:667 performance.xml:855
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "TreeCache de JBoss"
 
-#: index.docbook:639
+#. Tag: literal
+#: performance.xml:668
+#, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
-#: index.docbook:640
+#. Tag: entry
+#: performance.xml:669 performance.xml:676
+#, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "clusterizado (ip multicast), transaccional"
 
-#: index.docbook:641
+#. Tag: entry
+#: performance.xml:670
+#, no-c-format
 msgid "yes (replication)"
 msgstr "s&#x00ed; (replicaci&#x00f3;n)"
 
-#: index.docbook:642
+#. Tag: entry
+#: performance.xml:671 performance.xml:678
+#, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "s&#x00ed; (requiere sincronizaci&#x00f3;n de reloj)"
 
-#: index.docbook:649
+#. Tag: entry
+#: performance.xml:674 performance.xml:862
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "TreeCache de JBoss"
+
+#. Tag: literal
+#: performance.xml:675
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:677
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "s&#x00ed; (invalidaci&#x00f3;n en cluster)"
+
+#. Tag: title
+#: performance.xml:685
+#, no-c-format
 msgid "Cache mappings"
 msgstr "Mapeos de cach&#x00e9;"
 
-#: index.docbook:651
+#. Tag: para
+#: performance.xml:687
+#, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
 "mapping has the following form:"
@@ -1281,7 +1561,9 @@
 "El elemento <literal>&lt;cache&gt;</literal> de una mapeo de clase o "
 "colecci&#x00f3;n tiene la siguiente forma:"
 
-#: index.docbook:662
+#. Tag: programlisting
+#: performance.xml:698
+#, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
 "    usage=\"transactional|read-write|nonstrict-read-write|read-only\"\n"
@@ -1293,7 +1575,9 @@
 "    usage=\"transactional|read-write|nonstrict-read-write|read-only\"\n"
 "/>]]>"
 
-#: index.docbook:665
+#. Tag: para
+#: performance.xml:701
+#, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
 "<literal>transactional</literal>, <literal>read-write</literal>, "
@@ -1303,19 +1587,23 @@
 "<literal>transactional</literal>, <literal>read-write</literal>, "
 "<literal>nonstrict-read-write</literal> o <literal>read-only</literal>"
 
-#: index.docbook:674
+#. Tag: para
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (optional, defaults to the class or collection "
 "role name) specifies the name of the second level cache region"
 
-#: index.docbook:681
+#. Tag: para
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (optional, defaults to <literal>all</literal>) "
@@ -1323,17 +1611,21 @@
 "with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
 "lazy fetching is enabled"
 
-#: index.docbook:691
+#. Tag: para
+#: performance.xml:727
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "Alternativamente (&#x00bf;preferiblemente?), puedes especificar los "
 "elementos <literal>&lt;class-cache&gt;</literal> y <literal>&lt;collection-"
 "cache&gt;</literal> en <literal>hibernate.cfg.xml</literal>."
 
-#: index.docbook:696
+#. Tag: para
+#: performance.xml:732
+#, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
 "concurrency strategy</emphasis>."
@@ -1341,15 +1633,19 @@
 "El atributo <literal>usage</literal> especifica una <emphasis>estrategia de "
 "concurrencia al cach&#x00e9;</emphasis>."
 
-#: index.docbook:703
+#. Tag: title
+#: performance.xml:739
+#, no-c-format
 msgid "Strategy: read only"
 msgstr "Estrategia: s&#x00f3;lo lectura (read only)"
 
-#: index.docbook:705
+#. Tag: para
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "Si tu aplicaci&#x00f3;n necesita leer pero nunca modificar las instancias de "
@@ -1357,7 +1653,9 @@
 "literal>. Esta es la mejor y m&#x00e1;s simple estrategia. Es incluso "
 "perfectamente segura de usar en un cluster."
 
-#: index.docbook:711
+#. Tag: programlisting
+#: performance.xml:747
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
 "    <cache usage=\"read-only\"/>\n"
@@ -1369,23 +1667,27 @@
 "    ....\n"
 "</class>]]>"
 
-#: index.docbook:717
+#. Tag: title
+#: performance.xml:753
+#, no-c-format
 msgid "Strategy: read/write"
 msgstr "Estrategia: lectura/escritura (read/write)"
 
-#: index.docbook:719
+#. Tag: para
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "Si la aplicaci&#x00f3;n necesita actualizar datos, un cach&#x00e9; "
 "<literal>read-write</literal> podr&#x00ed;a ser apropiado. Esta estrategia "
@@ -1401,7 +1703,9 @@
 "provedores de cach&#x00e9; internos predeterminados <emphasis>no</emphasis> "
 "no lo soportan."
 
-#: index.docbook:730
+#. Tag: programlisting
+#: performance.xml:766
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
 "    <cache usage=\"read-write\"/>\n"
@@ -1421,15 +1725,19 @@
 "    </set>\n"
 "</class>]]>"
 
-#: index.docbook:735
+#. Tag: title
+#: performance.xml:771
+#, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "Estrategia: lectura/escritura no estricta (nonstrict read/write)"
 
-#: index.docbook:737
+#. Tag: para
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1446,15 +1754,19 @@
 "transacci&#x00f3;n se haya completado cuando se llame a <literal>Session."
 "close()</literal> o <literal>Session.disconnect()</literal>."
 
-#: index.docbook:749
+#. Tag: title
+#: performance.xml:785
+#, no-c-format
 msgid "Strategy: transactional"
 msgstr "Estrategia: transaccional"
 
-#: index.docbook:751
+#. Tag: para
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "La estrategia de cach&#x00e9; <literal>transactional</literal> brinda "
@@ -1463,9 +1775,26 @@
 "en un entorno JTA y debes especificar <literal>hibernate.transaction."
 "manager_lookup_class</literal>."
 
-#: index.docbook:759
+#. Tag: title
+#: performance.xml:796
+#, fuzzy, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
+msgstr "Soporte a Estrategia de Concurrencia a Cach&#x00e9;"
+
+#. Tag: para
+#: performance.xml:799
+#, fuzzy, no-c-format
 msgid ""
-"None of the cache providers support all of the cache concurrency strategies. "
+"None of the cache providers support all of the cache concurrency strategies."
+msgstr ""
+"Ninguno de los provedores de cach&#x00e9; soporta todas las estrategias de "
+"concurrencia al cach&#x00e9;. La siguiente tabla muestra qu&#x00e9; "
+"provedores son compatibles con qu&#x00e9; estrategias de concurrencia."
+
+#. Tag: para
+#: performance.xml:804
+#, fuzzy, no-c-format
+msgid ""
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 msgstr ""
@@ -1473,34 +1802,48 @@
 "concurrencia al cach&#x00e9;. La siguiente tabla muestra qu&#x00e9; "
 "provedores son compatibles con qu&#x00e9; estrategias de concurrencia."
 
-#: index.docbook:765
+#. Tag: title
+#: performance.xml:809
+#, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "Soporte a Estrategia de Concurrencia a Cach&#x00e9;"
 
-#: index.docbook:775
+#. Tag: entry
+#: performance.xml:819
+#, no-c-format
 msgid "read-only"
 msgstr "read-only"
 
-#: index.docbook:776
+#. Tag: entry
+#: performance.xml:820
+#, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write"
 
-#: index.docbook:777
+#. Tag: entry
+#: performance.xml:821
+#, no-c-format
 msgid "read-write"
 msgstr "read-write"
 
-#: index.docbook:778
+#. Tag: entry
+#: performance.xml:822
+#, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
-#: index.docbook:824
+#. Tag: title
+#: performance.xml:877
+#, no-c-format
 msgid "Managing the caches"
 msgstr "Gestionando los cach&#x00e9;s"
 
-#: index.docbook:826
+#. Tag: para
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1513,13 +1856,15 @@
 "literal>, ese objeto es agregado al cach&#x00e9; interno de la "
 "<literal>Session</literal>."
 
-#: index.docbook:833
+#. Tag: para
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "Cuando subsecuentemente se llame a <literal>flush()</literal>, el estado de "
@@ -1529,7 +1874,9 @@
 "puede usarse el m&#x00e9;todo <literal>evict()</literal> para quitar el "
 "objeto y sus colecciones del cach&#x00e9; de primer nivel."
 
-#: index.docbook:841
+#. Tag: programlisting
+#: performance.xml:894
+#, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
 "(); //a huge result set\n"
@@ -1547,7 +1894,9 @@
 "    sess.evict(cat);\n"
 "}]]>"
 
-#: index.docbook:843
+#. Tag: para
+#: performance.xml:896
+#, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
 "method to determine if an instance belongs to the session cache."
@@ -1556,15 +1905,19 @@
 "<literal>contains()</literal> para determinar si una instancia pertenece al "
 "cach&#x00e9; de la sesi&#x00f3;n."
 
-#: index.docbook:848
+#. Tag: para
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "Para desahuciar (evict) todos los objetos del cach&#x00e9; de sesi&#x00f3;n, "
 "llama a <literal>Session.clear()</literal>."
 
-#: index.docbook:852
+#. Tag: para
+#: performance.xml:905
+#, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
 "<literal>SessionFactory</literal> for evicting the cached state of an "
@@ -1575,7 +1928,9 @@
 "de una instancia, clase entera, instancia de colecci&#x00f3;n o rol enter de "
 "colecci&#x00f3;n."
 
-#: index.docbook:858
+#. Tag: programlisting
+#: performance.xml:911
+#, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
 "sessionFactory.evict(Cat.class);  //evict all Cats\n"
@@ -1591,45 +1946,55 @@
 "sessionFactory.evictCollection(\"Cat.kittens\"); //evict all kitten "
 "collections]]>"
 
-#: index.docbook:860
+#. Tag: para
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "El <literal>CacheMode</literal> controla c&#x00f3;mo una sesi&#x00f3;n en "
 "particular interact&#x00fa;a con el cach&#x00e9; de segundo nivel."
 
-#: index.docbook:867
+#. Tag: para
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr ""
 "<literal>CacheMode.NORMAL</literal> - lee &#x00ed;tems desde y escribe "
 "&#x00ed;tems hacia el cach&#x00e9; de segundo nivel"
 
-#: index.docbook:872
+#. Tag: para
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - lee &#x00ed;tems del cach&#x00e9; de "
 "segundo nivel, pero no escribe al cach&#x00e9; de segundo nivel excepto al "
 "actualizar datos"
 
-#: index.docbook:878
+#. Tag: para
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - escribe &#x00ed;tems al cach&#x00e9; de "
 "segundo nivel, pero no lee del cach&#x00e9; de segundo nivel"
 
-#: index.docbook:884
+#. Tag: para
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - escribe &#x00ed;tems al cach&#x00e9; "
 "de segundo nivel, pero no lee del cach&#x00e9; de segundo nivel, salt&#x00e1;"
@@ -1637,7 +2002,9 @@
 "forzando un refresco del cach&#x00e9; de segundo nivel para todos los "
 "&#x00ed;tems le&#x00ed;dos de la base de datos"
 
-#: index.docbook:892
+#. Tag: para
+#: performance.xml:945
+#, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
 "<literal>Statistics</literal> API:"
@@ -1645,7 +2012,9 @@
 "Para navegar por los contenidos de una regi&#x00f3;n de cach&#x00e9; de "
 "segundo nivel o de consultas, usa la API de <literal>Statistics</literal>:"
 
-#: index.docbook:897
+#. Tag: programlisting
+#: performance.xml:950
+#, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
 "        .getSecondLevelCacheStatistics(regionName)\n"
@@ -1655,16 +2024,20 @@
 "        .getSecondLevelCacheStatistics(regionName)\n"
 "        .getEntries();]]>"
 
-#: index.docbook:899
+#. Tag: para
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "Necesitar&#x00e1;s habilitar las estad&#x00ed;sticas y, opcionalmente, "
 "forzar a Hibernate para que guarde las entradas del cach&#x00e9; en un "
 "formato m&#x00e1;s entendible por humanos:"
 
-#: index.docbook:904
+#. Tag: programlisting
+#: performance.xml:957
+#, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
 "hibernate.cache.use_structured_entries true]]>"
@@ -1672,35 +2045,42 @@
 "<![CDATA[hibernate.generate_statistics true\n"
 "hibernate.cache.use_structured_entries true]]>"
 
-#: index.docbook:909
+#. Tag: title
+#: performance.xml:962
+#, no-c-format
 msgid "The Query Cache"
 msgstr "El Cach&#x00e9; de Consultas"
 
-#: index.docbook:911
+#. Tag: para
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "Los conjuntos resultado de consultas tambi&#x00e9;n pueden tratarse en "
 "cach&#x00e9;. Esto s&#x00f3;lo es &#x00fa;til para consultas que se ejecutan "
 "frecuentemente con los mismos par&#x00e1;metros. Para usar el cach&#x00e9; "
 "de consultas primero debes habilitarlo:"
 
-#: index.docbook:916
+#. Tag: programlisting
+#: performance.xml:969
+#, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr "<![CDATA[hibernate.cache.use_query_cache true]]>"
 
-#: index.docbook:918
+#. Tag: para
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "Esta configuraci&#x00f3;n causa la creaci&#x00f3;n de dos nuevas regiones de "
 "cach&#x00e9; - una teniendo en cach&#x00e9; conjuntos resultado de consulta "
@@ -1713,9 +2093,11 @@
 "que el cach&#x00e9; de consultas siempre debe ser usado en conjunci&#x00f3;n "
 "con el cach&#x00e9; de segundo nivel."
 
-#: index.docbook:928
+#. Tag: para
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1727,10 +2109,12 @@
 "consulta buscar resultados existentes en cach&#x00e9; o agregar sus "
 "resultados al cach&#x00e9; cuando se ejecuta."
 
-#: index.docbook:935
+#. Tag: para
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "Si requieres un control finamente granularizado sobre las pol&#x00ed;ticas "
@@ -1738,7 +2122,9 @@
 "regi&#x00f3;n de cach&#x00e9; con nombre para una consulta en particular "
 "llamando a <literal>Query.setCacheRegion()</literal>."
 
-#: index.docbook:941
+#. Tag: programlisting
+#: performance.xml:994
+#, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
 "= :blogger\")\n"
@@ -1756,7 +2142,9 @@
 "    .setCacheRegion(\"frontpages\")\n"
 "    .list();]]>"
 
-#: index.docbook:943
+#. Tag: para
+#: performance.xml:996
+#, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
 "call <literal>Query.setCacheMode(CacheMode.REFRESH)</literal>. This is "
@@ -1776,41 +2164,54 @@
 "desahuciamiento de una regi&#x00f3;n del cach&#x00e9; de consultas v&#x00ed;"
 "a <literal>SessionFactory.evictQueries()</literal>."
 
-#: index.docbook:955
+#. Tag: title
+#: performance.xml:1008
+#, no-c-format
 msgid "Understanding Collection performance"
 msgstr "Entendiendo el rendimiento de Colecciones"
 
-#: index.docbook:957
+#. Tag: para
+#: performance.xml:1010
+#, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"Ya hemos llevado un buen tiempo hablando sobre colecciones. En esta "
-"secci&#x00f3;n resaltaremos un par de temas m&#x00e1;s sobre c&#x00f3;mo las "
-"colecciones se comportan en tiempo de ejecuci&#x00f3;n."
 
-#: index.docbook:964
+#. Tag: title
+#: performance.xml:1017
+#, no-c-format
 msgid "Taxonomy"
 msgstr "Taxonomia"
 
-#: index.docbook:966
+#. Tag: para
+#: performance.xml:1019
+#, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate define tres tipos b&#x00e1;sicos de colecciones:"
 
-#: index.docbook:970
+#. Tag: para
+#: performance.xml:1023
+#, no-c-format
 msgid "collections of values"
 msgstr "colecciones de valores"
 
-#: index.docbook:973
-msgid "one to many associations"
+#. Tag: para
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "asociaciones uno a muchos"
 
-#: index.docbook:976
-msgid "many to many associations"
+#. Tag: para
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "asociaciones muchos a muchos"
 
-#: index.docbook:980
+#. Tag: para
+#: performance.xml:1033
+#, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
 "relationships but does not tell us quite everything we need to know about "
@@ -1827,24 +2228,32 @@
 "actualizar o borrar filas de colecci&#x00f3;n. Esto sugiere la siguiente "
 "clasificaci&#x00f3;n:"
 
-#: index.docbook:991
+#. Tag: para
+#: performance.xml:1044
+#, no-c-format
 msgid "indexed collections"
 msgstr "colecciones indexadas"
 
-#: index.docbook:994
+#. Tag: para
+#: performance.xml:1047
+#, no-c-format
 msgid "sets"
 msgstr "conjuntos (sets)"
 
-#: index.docbook:997
+#. Tag: para
+#: performance.xml:1050
+#, no-c-format
 msgid "bags"
 msgstr "bolsas (bags)"
 
-#: index.docbook:1001
+#. Tag: para
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "Todas las colecciones indexadas (mapas, listas, arrays) tienen una clave "
@@ -1854,17 +2263,19 @@
 "puede ser indexada f&#x00e1;cilmente y una fila en particular puede ser "
 "localizada cuando Hibernate intenta actualizarla o borrarla."
 
-#: index.docbook:1009
+#. Tag: para
+#: performance.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "Los conjuntos (sets) tienen una clave primaria consistente en <literal>&lt;"
 "key&gt;</literal> y columnas de elemento. Esto puede ser menos eficiente "
@@ -1878,22 +2289,26 @@
 "<literal>&lt;set&gt;</literal> por ti, debes declarar todas las columnas "
 "como <literal>not-null=\"true\"</literal>.)"
 
-#: index.docbook:1020
+#. Tag: para
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "Los mapeos de <literal>&lt;idbag&gt;</literal> definen una clave delegada, "
 "de modo que siempre resulten eficientes de actualizar. De hecho, son el "
 "mejor caso."
 
-#: index.docbook:1025
+#. Tag: para
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "Los bags son el peor caso. Ya que un bag permite valores de elementos "
 "duplicados y no tiene ninguna columna &#x00ed;ndice, no puede definirse "
@@ -1902,12 +2317,14 @@
 "solo <literal>DELETE</literal>) y recreando la colecci&#x00f3;n siempre que "
 "cambia. Esto podr&#x00ed;a ser muy ineficiente."
 
-#: index.docbook:1033
+#. Tag: para
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "Nota que para una asociaci&#x00f3;n uno-a-muchos, la \"clave primaria\" "
 "puede no ser la clave primaria f&#x00ed;sica de la tabla de base de datos; "
@@ -1915,33 +2332,39 @@
 "todav&#x00ed;a. (A&#x00fa;n refleja c&#x00f3;mo Hibernate \"localiza\" filas "
 "individuales de la colecci&#x00f3;n.)"
 
-#: index.docbook:1043
+#. Tag: title
+#: performance.xml:1096
+#, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr ""
 "Las listas, mapas, idbags y conjuntos son las colecciones m&#x00e1;s "
 "eficientes de actualizar"
 
-#: index.docbook:1045
+#. Tag: para
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "Desde la discusi&#x00f3;n anterior, debe quedar claro que las colecciones "
 "indexadas y (usualmente) los conjuntos permiten la operaci&#x00f3;n m&#x00e1;"
 "s eficiente en t&#x00e9;rminos de a&#x00f1;adir, quitar y actualizar "
 "elementos."
 
-#: index.docbook:1051
+#. Tag: para
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "Hay, discutiblemente, una ventaja m&#x00e1;s que las colecciones indexadas "
 "tienen sobre otros conjuntos para las asociaciones muchos a muchos o "
@@ -1952,11 +2375,13 @@
 "literal> (de filas individuales). Una vez m&#x00e1;s, esta "
 "consideraci&#x00f3;n no se aplica a las asociaciones uno a muchos."
 
-#: index.docbook:1060
+#. Tag: para
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -1968,13 +2393,15 @@
 "debido a que la sem&#x00e1;ntica de los sets es la m&#x00e1;s natural en el "
 "modelo relacional."
 
-#: index.docbook:1068
+#. Tag: para
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "Sin embargo, en modelos de dominio de Hibernate bien die&#x00f1;ados, "
 "usualmente vemos que la mayor&#x00ed;a de las colecciones son de hecho "
@@ -1984,22 +2411,25 @@
 "sobre el rendimiento de actualizaci&#x00f3;n de colecciones simplemente no "
 "se aplican."
 
-#: index.docbook:1078
+#. Tag: title
+#: performance.xml:1131
+#, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr ""
 "Los Bags y las listas son las colecciones inversas m&#x00e1;s eficientes"
 
-#: index.docbook:1080
+#. Tag: para
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "Justo antes que tires a la zanja los bags para siempre, hay un caso en "
 "particular en el que los bags son muchos m&#x00e1;s eficientes que los "
@@ -2012,7 +2442,9 @@
 "un <literal>Set</literal>). Esto puede hacer el siguiente c&#x00f3;digo "
 "com&#x00fa;n mucho m&#x00e1;s r&#x00e1;pido."
 
-#: index.docbook:1090
+#. Tag: programlisting
+#: performance.xml:1143
+#, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
 "Child c = new Child();\n"
@@ -2026,17 +2458,20 @@
 "    p.getChildren().add(c);  //no need to fetch the collection!\n"
 "    sess.flush();]]>"
 
-#: index.docbook:1095
+#. Tag: title
+#: performance.xml:1148
+#, no-c-format
 msgid "One shot delete"
 msgstr "Borrado de un solo tiro"
 
-#: index.docbook:1097
+#. Tag: para
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "Ocasionalmente, borrar los elementos de una colecci&#x00f3;n uno a uno puede "
 "ser extremadamente ineficiente. Hibernate no es completamente est&#x00fa;"
@@ -2045,12 +2480,14 @@
 "ejemplo). En este caso, Hibernate publicar&#x00e1; una sola <literal>DELETE</"
 "literal>, &#x00a1;y listo!"
 
-#: index.docbook:1104
+#. Tag: para
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "Sup&#x00f3;n que a&#x00f1;adimos un solo elemento a una colecci&#x00f3;n de "
 "tama&#x00f1;o veinte y luego quitamos dos elementos. Hibernate "
@@ -2058,7 +2495,9 @@
 "<literal>DELETE</literal> (a menos que la colecci&#x00f3;n sea un bag). Esto "
 "es ciertamente deseable."
 
-#: index.docbook:1110
+#. Tag: para
+#: performance.xml:1163
+#, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
 "thee new elements. There are two possible ways to proceed"
@@ -2067,23 +2506,29 @@
 "luego a&#x00f1;adimos tres nuevos elementos. Hay dos formas posibles de "
 "proceder"
 
-#: index.docbook:1117
+#. Tag: para
+#: performance.xml:1170
+#, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "borrar dieciocho filas una a una y luego insertar tres filas"
 
-#: index.docbook:1120
+#. Tag: para
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr ""
 "quitar toda la colecci&#x00f3;n (en un solo <literal>DELETE</literal> de "
 "SQL) e insertar todos los cinco elementos actuales (uno a uno)"
 
-#: index.docbook:1125
+#. Tag: para
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernate no es lo suficientemente inteligente para saber que la segunda "
 "opci&#x00f3;n es probablemente m&#x00e1;s r&#x00e1;pida en este caso. (Y que "
@@ -2091,12 +2536,13 @@
 "este comportamiento podr&#x00ed;a confundir a disparadores de base de datos, "
 "etc.)"
 
-#: index.docbook:1131
+#. Tag: para
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "Afortunadamente, puedes forzar este comportamiento (es decir, la segunda "
 "estrategia) en cualquier momento descartando (es decir, desreferenciando) la "
@@ -2104,19 +2550,25 @@
 "instanciada con todos los elementos actuales. Esto puede ser muy &#x00fa;til "
 "y potente de vez en cuando."
 
-#: index.docbook:1137
+#. Tag: para
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "Por supuesto, el borrado-de-un-solo-tiro no se aplica a colecciones mapeadas "
 "<literal>inverse=\"true\"</literal>."
 
-#: index.docbook:1146
+#. Tag: title
+#: performance.xml:1199
+#, no-c-format
 msgid "Monitoring performance"
 msgstr "Monitoreando el rendimiento"
 
-#: index.docbook:1148
+#. Tag: para
+#: performance.xml:1201
+#, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
 "numbers. Hibernate provides a full range of figures about its internal "
@@ -2128,11 +2580,15 @@
 "sobre sus operaciones internas. Las estad&#x00ed;sticas en Hibernate "
 "est&#x00e1;n disponibles por <literal>SessionFactory</literal>."
 
-#: index.docbook:1155
+#. Tag: title
+#: performance.xml:1208
+#, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "Monitoreando una SessionFactory"
 
-#: index.docbook:1157
+#. Tag: para
+#: performance.xml:1210
+#, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
 "first option is to call <literal>sessionFactory.getStatistics()</literal> "
@@ -2143,10 +2599,12 @@
 "getStatistics()</literal> y leer o mostrar por pantalla la "
 "<literal>Statistics</literal> por ti mismo."
 
-#: index.docbook:1163
+#. Tag: para
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2156,7 +2614,9 @@
 "f&#x00e1;brica. Mira el siguiente c&#x00f3;digo para ejemplos de "
 "configuraci&#x00f3;n minimalistas:"
 
-#: index.docbook:1170
+#. Tag: programlisting
+#: performance.xml:1223
+#, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
 "Hashtable tb = new Hashtable();\n"
@@ -2180,7 +2640,9 @@
 "SessionFactory\n"
 "server.registerMBean(stats, on); // Register the Mbean on the server]]>"
 
-#: index.docbook:1173
+#. Tag: programlisting
+#: performance.xml:1226
+#, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
 "Hashtable tb = new Hashtable();\n"
@@ -2200,26 +2662,18 @@
 "StatisticsService stats = new StatisticsService(); // MBean implementation\n"
 "server.registerMBean(stats, on); // Register the MBean on the server]]>"
 
-#: index.docbook:1175
+#. Tag: para
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"POR HACER: Esto no tiene sentido: En el primer caso, recuperamos y usamos el "
-"MBean directamente. En el segundo, debemos proporcionar el nombre JNDI en el "
-"que se guarda la f&#x00e1;brica de sesiones antes de usarlo. Usa "
-"<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
-"literal>"
-
-#: index.docbook:1180
-msgid ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
 "Puedes (des)activar el monitoreo de una <literal>SessionFactory</literal>"
 
-#: index.docbook:1185
+#. Tag: para
+#: performance.xml:1238
+#, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
 "to <literal>false</literal>"
@@ -2227,7 +2681,9 @@
 "en tiempo de configuraci&#x00f3;n, establece <literal>hibernate."
 "generate_statistics</literal> a <literal>false</literal>"
 
-#: index.docbook:1192
+#. Tag: para
+#: performance.xml:1245
+#, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
 "or <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
@@ -2236,10 +2692,12 @@
 "setStatisticsEnabled(true)</literal> o <literal>hibernateStatsBean."
 "setStatisticsEnabled(true)</literal>"
 
-#: index.docbook:1199
+#. Tag: para
+#: performance.xml:1252
+#, fuzzy, no-c-format
 msgid ""
-"Statistics can be reset programatically using the <literal>clear()</literal> "
-"method. A summary can be sent to a logger (info level) using the "
+"Statistics can be reset programmatically using the <literal>clear()</"
+"literal> method. A summary can be sent to a logger (info level) using the "
 "<literal>logSummary()</literal> method."
 msgstr ""
 "Las estad&#x00ed;sticas pueden ser reajustadas program&#x00e1;ticamente "
@@ -2247,23 +2705,29 @@
 "resumen a un logger (nivel info) usando el m&#x00e9;todo <literal>logSummary"
 "()</literal>."
 
-#: index.docbook:1208
+#. Tag: title
+#: performance.xml:1261
+#, no-c-format
 msgid "Metrics"
 msgstr "M&#x00e9;tricas"
 
-#: index.docbook:1210
+#. Tag: para
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "Hibernate provee un n&#x00fa;mero de m&#x00e9;tricas, desde informaci&#x00f3;"
 "n muy b&#x00e1;sica a la especializada s&#x00f3;lo relevante en ciertos "
 "escenarios. Todos los contadores disponibles se describen en la API de la "
 "interface <literal>Statistics</literal>, en tres categor&#x00ed;as:"
 
-#: index.docbook:1217
+#. Tag: para
+#: performance.xml:1270
+#, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
 "number of open sessions, retrieved JDBC connections, etc."
@@ -2272,16 +2736,20 @@
 "usage, tales como n&#x00fa;mero de sesiones abiertas, conexiones JDBC "
 "recuperadas, etc,"
 
-#: index.docbook:1223
+#. Tag: para
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr ""
 "M&#x00e9;tricas relacionadas a las entidades, colecciones, consultas, y "
 "cach&#x00e9;s como un todo. (tambi&#x00e9;n conocidas como m&#x00e9;tricas "
 "globales)."
 
-#: index.docbook:1229
+#. Tag: para
+#: performance.xml:1282
+#, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
 "region."
@@ -2289,13 +2757,15 @@
 "M&#x00e9;tricas detalladas relacionadas a una entidad, colecci&#x00f3;n, "
 "consulta o regi&#x00f3;n de cach&#x00e9; en particular."
 
-#: index.docbook:1236
+#. Tag: para
+#: performance.xml:1289
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"For example, you can check the cache hit, miss, and put ratio of entities, "
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "Por ejemplo, puedes comprobar el acceso, p&#x00e9;rdida, y radio de "
 "colocaci&#x00f3;n de entidades, colecciones y consultas en el cach&#x00e9;, "
@@ -2305,7 +2775,9 @@
 "algunas plataformas esto podr&#x00ed;a incuso ser tener s&#x00f3;lo una "
 "exactitud de 10 segundos."
 
-#: index.docbook:1243
+#. Tag: para
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2314,7 +2786,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "Se usan getters simples para acceder a las m&#x00e9;tricas globales (es "
@@ -2329,7 +2801,9 @@
 "literal> para m&#x00e1;s informaci&#x00f3;n. El siguiente c&#x00f3;digo "
 "muestra un ejemplo sencillo:"
 
-#: index.docbook:1253
+#. Tag: programlisting
+#: performance.xml:1306
+#, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
 "\n"
@@ -2365,11 +2839,13 @@
 "        + entityStats.getDeleteCount();\n"
 "log.info(Cat.class.getName() + \" changed \" + changes + \"times\"  );]]>"
 
-#: index.docbook:1255
+#. Tag: para
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2380,8 +2856,45 @@
 "literal>, <literal>getCollectionRoleNames()</literal>, y "
 "<literal>getSecondLevelCacheRegionNames()</literal>."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "donde <literal>CatImpl</literal> implementa la interface <literal>Cat</"
+#~ "literal> y <literal>DomesticCatImpl</literal> implementa la interface "
+#~ "<literal>DomesticCat</literal>. Entonces <literal>load()</literal> o "
+#~ "<literal>iterate()</literal> pueden devolver instancias de <literal>Cat</"
+#~ "literal> y <literal>DomesticCat</literal>. (Nota que <literal>list()</"
+#~ "literal> usualmente no devuelve proxies.)"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "Ya hemos llevado un buen tiempo hablando sobre colecciones. En esta "
+#~ "secci&#x00f3;n resaltaremos un par de temas m&#x00e1;s sobre c&#x00f3;mo "
+#~ "las colecciones se comportan en tiempo de ejecuci&#x00f3;n."
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "POR HACER: Esto no tiene sentido: En el primer caso, recuperamos y usamos "
+#~ "el MBean directamente. En el segundo, debemos proporcionar el nombre JNDI "
+#~ "en el que se guarda la f&#x00e1;brica de sesiones antes de usarlo. Usa "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,20 +1,27 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: persistent_classes.xml:29
+#, no-c-format
 msgid "Persistent Classes"
 msgstr "Clases Persistentes"
 
-#: index.docbook:7
+#. Tag: para
+#: persistent_classes.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "Clases presistentes son clases en una aplicaci&#x00f3;n que implementan las "
 "entidades del problema de negocio (por ejemplo, Customer y Order en una "
@@ -22,13 +29,15 @@
 "de una clase persistente se considera que est&#x00e9;n en el estado "
 "persistente, una instancia puede en cambio ser transitoria o estar separada."
 
-#: index.docbook:14
+#. Tag: para
+#: persistent_classes.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "Hibernate funciona mejor si las clases siguen algunas simples reglas, "
 "tambi&#x00e9;n conocidas como el modelo de programaci&#x00f3;n de Viejas "
@@ -38,17 +47,25 @@
 "expresar un modelo de dominio en otras formas: usando &#x00e1;rboles de "
 "instancias de <literal>Map</literal>, por ejemplo."
 
-#: index.docbook:23
+#. Tag: title
+#: persistent_classes.xml:47
+#, no-c-format
 msgid "A simple POJO example"
 msgstr "Un ejemplo simple de POJO"
 
-#: index.docbook:25
-msgid "Most Java applications require a persistent class representing felines."
+#. Tag: para
+#: persistent_classes.xml:49
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr ""
 "La mayor&#x00ed;a de aplicaciones Java requieren una clase representando "
 "felinos."
 
-#: index.docbook:29
+#. Tag: programlisting
+#: persistent_classes.xml:53
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "import java.util.Set;\n"
@@ -208,20 +225,28 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:31
-msgid "There are four main rules to follow here:"
-msgstr "Aqu&#x00ed; hay cuatro reglas principales a seguir:"
+#. Tag: para
+#: persistent_classes.xml:55
+#, no-c-format
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
-#: index.docbook:37
+#. Tag: title
+#: persistent_classes.xml:61
+#, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "Implementa un constructor sin argumentos"
 
-#: index.docbook:39
+#. Tag: para
+#: persistent_classes.xml:63
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -233,19 +258,23 @@
 "emphasis> para la generaci&#x00f3;n de proxies en tiempo de ejecuci&#x00f3;n "
 "en Hibernate."
 
-#: index.docbook:49
+#. Tag: title
+#: persistent_classes.xml:73
+#, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "Provee una propiedad identificadora (opcional)"
 
-#: index.docbook:51
+#. Tag: para
+#: persistent_classes.xml:75
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal> tiene una propiedad llamada <literal>id</literal>. "
 "Esta propiedad mapea a la columna clave primaria de la tabla de base de "
@@ -257,7 +286,9 @@
 "propiedades de estos tipos, ver la secci&#x00f3;n sobre identificadores "
 "compuestos luego.)"
 
-#: index.docbook:60
+#. Tag: para
+#: persistent_classes.xml:84
+#, no-c-format
 msgid ""
 "The identifier property is strictly optional. You can leave them off and let "
 "Hibernate keep track of object identifiers internally. We do not recommend "
@@ -267,15 +298,19 @@
 "dejar que Hibernate siga internamente la pista de los identificadores del "
 "objeto. Sin embargo, no recomendamos esto."
 
-#: index.docbook:65
+#. Tag: para
+#: persistent_classes.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr ""
 "De hecho, alguna funcionalidad est&#x00e1; disponible s&#x00f3;lo para "
 "clases que declaran una propiedad identificadora:"
 
-#: index.docbook:72
+#. Tag: para
+#: persistent_classes.xml:96
+#, no-c-format
 msgid ""
 "Transitive reattachment for detached objects (cascade update or cascade "
 "merge) - see"
@@ -283,29 +318,38 @@
 "Reasociaci&#x00f3;n transitiva de objetos separados (actualizaciones o "
 "fusiones en cascada) - ver"
 
-#: index.docbook:79
+#. Tag: literal
+#: persistent_classes.xml:103
+#, no-c-format
 msgid "Session.saveOrUpdate()"
 msgstr "Session.saveOrUpdate()"
 
-#: index.docbook:84
+#. Tag: literal
+#: persistent_classes.xml:108
+#, no-c-format
 msgid "Session.merge()"
 msgstr "Session.merge()"
 
-#: index.docbook:89
+#. Tag: para
+#: persistent_classes.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "Recomendamos que declares propiedades identificadoras nombradas-"
 "consistentemente en clases persistentes. Mas a&#x00fa;n, recomendamos que "
 "uses un tipo nulable (es decir, no primitivo)."
 
-#: index.docbook:96
+#. Tag: title
+#: persistent_classes.xml:120
+#, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr "Prefiere las clases no finales (opcional)"
 
-#: index.docbook:97
+#. Tag: para
+#: persistent_classes.xml:121
+#, no-c-format
 msgid ""
 "A central feature of Hibernate, <emphasis>proxies</emphasis>, depends upon "
 "the persistent class being either non-final, or the implementation of an "
@@ -316,18 +360,23 @@
 "implementaci&#x00f3;n de una interface que declare todos los m&#x00e9;todos "
 "p&#x00fa;blicos."
 
-#: index.docbook:102
+#. Tag: para
+#: persistent_classes.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "Puedes persistir con Hibernate clases <literal>final</literal> que no "
 "implementen una interface, pero no ser&#x00e1;s capaz de usar proxies para "
 "recuperaci&#x00f3;n perezosa de asociaciones, lo que limitar&#x00e1; tus "
 "opciones para afinar el rendimiento."
 
-#: index.docbook:107
+#. Tag: para
+#: persistent_classes.xml:131
+#, no-c-format
 msgid ""
 "You should also avoid declaring <literal>public final</literal> methods on "
 "the non-final classes. If you want to use a class with a <literal>public "
@@ -339,22 +388,25 @@
 "<literal>public final</literal>, debes deshabilitar expl&#x00ed;citamente el "
 "uso de proxies estableciendo <literal>lazy=\"false\"</literal>."
 
-#: index.docbook:115
+#. Tag: title
+#: persistent_classes.xml:139
+#, no-c-format
 msgid "Declare accessors and mutators for persistent fields (optional)"
 msgstr ""
 "Declara m&#x00e9;todos de acceso y modificaci&#x00f3;n para los campos "
 "persistentes (opcional)"
 
-#: index.docbook:117
+#. Tag: para
+#: persistent_classes.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal> declara m&#x00e9;todos de acceso para todos sus "
 "campos persistente. Muchas otras herramientas ORM persisten directamente "
@@ -365,7 +417,9 @@
 "<literal>isFoo</literal> y <literal>setFoo</literal>. Puedes cambiar a "
 "acceso directo a campos para propiedades en particular, de ser necesario."
 
-#: index.docbook:127
+#. Tag: para
+#: persistent_classes.xml:151
+#, no-c-format
 msgid ""
 "Properties need <emphasis>not</emphasis> be declared public - Hibernate can "
 "persist a property with a default, <literal>protected</literal> or "
@@ -375,19 +429,25 @@
 "blicas. Hibernate puede persistir una propiedad con un par get / set "
 "<literal>protected</literal> o <literal>private</literal>."
 
-#: index.docbook:138
+#. Tag: title
+#: persistent_classes.xml:162
+#, no-c-format
 msgid "Implementing inheritance"
 msgstr "Implementando herencia"
 
-#: index.docbook:140
+#. Tag: para
+#: persistent_classes.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "Una subclase puede a su vez observar la primera y segunda regla. Hereda su "
 "propiedad identificadora de la superclase, <literal>Cat</literal>."
 
-#: index.docbook:145
+#. Tag: programlisting
+#: persistent_classes.xml:169
+#, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
 "\n"
@@ -415,40 +475,50 @@
 "        }\n"
 "}]]>"
 
-#: index.docbook:149
+#. Tag: title
+#: persistent_classes.xml:173
+#, no-c-format
 msgid ""
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
 msgstr ""
 "Implementando <literal>equals()</literal> y <literal>hashCode()</literal>"
 
-#: index.docbook:151
+#. Tag: para
+#: persistent_classes.xml:175
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "Tienes que sobrescribir los m&#x00e9;todos <literal>equals()</literal> y "
 "<literal>hashCode()</literal> si :"
 
-#: index.docbook:157
+#. Tag: para
+#: persistent_classes.xml:181
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "piensas poner instancias de clases persistentes en un <literal>Set</literal> "
 "(la forma recomendada de representar asociaciones multivaluadas) "
 "<emphasis>y</emphasis>"
 
-#: index.docbook:164
+#. Tag: para
+#: persistent_classes.xml:188
+#, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr "piensas usar reasociaci&#x00f3;n de instancias separadas."
 
-#: index.docbook:170
+#. Tag: para
+#: persistent_classes.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernate garantiza la equivalencia de identidad persistente (fila de base "
@@ -458,23 +528,24 @@
 "<literal>equals()</literal> y <literal>hashCode()</literal> si deseamos "
 "tener una sem&#x00e1;ntica significativa de <literal>Set</literal>s."
 
-#: index.docbook:178
+#. Tag: para
+#: persistent_classes.xml:202
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "La forma m&#x00e1;s obvia es implementar <literal>equals()</literal>/"
 "<literal>hashCode()</literal> comparando el valor identificador de ambos "
@@ -494,13 +565,16 @@
 "problema. Observa que esto no es una incidencia de Hibernate, sino la "
 "sem&#x00e1;ntica normal de Java de identidad de objeto e igualdad."
 
-#: index.docbook:192
+#. Tag: para
+#: persistent_classes.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "Recomendamos implementar <literal>equals()</literal> y <literal>hashCode()</"
 "literal> usando <emphasis>igualdad de clave de negocio (Business key "
@@ -510,7 +584,9 @@
 "instancia en el mundo real (una clave candidata <emphasis>natural</"
 "emphasis>):"
 
-#: index.docbook:200
+#. Tag: programlisting
+#: persistent_classes.xml:224
+#, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
 "\n"
@@ -560,37 +636,50 @@
 "\n"
 "}]]>"
 
-#: index.docbook:202
+#. Tag: para
+#: persistent_classes.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "Nota que una clave de negocio no tiene que ser tan s&#x00f3;lida como una "
 "clave primaria candidata de base de datos (ver <xref linkend=\"transactions-"
 "basics-identity\"/>). Las propiedades inmutables o &#x00fa;nicas son "
 "usualmente buenas candidatas para una clave de negocio."
 
-#: index.docbook:212
+#. Tag: title
+#: persistent_classes.xml:236
+#, no-c-format
 msgid "Dynamic models"
 msgstr "Modelos din&#x00e1;micos"
 
-#: index.docbook:215
+#. Tag: title
+#: persistent_classes.xml:239
+#, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: emphasis
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr ""
 "Ten en cuenta que las siguientes funcionalidades est&#x00e1;n consideradas "
 "actualmente experimentales y pueden cambiar en el futuro cercano."
 
-#: index.docbook:219
+#. Tag: para
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "Las entidades persistentes no necesariamente tienen que estar representadas "
 "como clases POJO o como objetos JavaBean en tiempo de ejecuci&#x00f3;n. "
@@ -600,12 +689,14 @@
 "rboles de DOM4J. Con este enfoque no escribes clases persistentes, s&#x00f3;"
 "lo ficheros de mapeo."
 
-#: index.docbook:227
+#. Tag: para
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "Por defecto, Hibernate funciona en modo POJO normal. Puedes establecer una "
 "representaci&#x00f3;n de entidad por defecto para una "
@@ -613,18 +704,22 @@
 "configuraci&#x00f3;n <literal>default_entity_mode</literal> (ver <xref "
 "linkend=\"configuration-optional-properties\"/>)."
 
-#: index.docbook:234
+#. Tag: para
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "Los siguientes ejemplos demuestran la representaci&#x00f3;n usando "
 "<literal>Map</literal>s. Primero, en el fichero de mapeo, tiene que "
 "declararse un <literal>entity-name</literal> en vez de (o como agregado a) "
 "un nombre de clase:"
 
-#: index.docbook:240
+#. Tag: programlisting
+#: persistent_classes.xml:267
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "\n"
@@ -694,20 +789,23 @@
 "    \n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:242
+#. Tag: para
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "Ten en cuenta que aunque las asociaciones se declaran usando nombres de "
 "clase objetivo, el tipo objetivo de una asociaci&#x00f3;n puede ser "
 "adem&#x00e1;s una entidad din&#x00e1;mica en vez de un POJO."
 
-#: index.docbook:249
+#. Tag: para
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "Despu&#x00e9;s de establecer el modo de entidad por defecto a "
@@ -715,7 +813,9 @@
 "podemos trabajar en tiempo de ejecuci&#x00f3;n con <literal>Map</literal>s "
 "de <literal>Map</literal>s:"
 
-#: index.docbook:255
+#. Tag: programlisting
+#: persistent_classes.xml:282
+#, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
 "Transaction tx = s.beginTransaction();\n"
@@ -761,13 +861,15 @@
 "tx.commit();\n"
 "s.close();]]>"
 
-#: index.docbook:257
+#. Tag: para
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "Las ventajas de un mapeo din&#x00e1;mico es r&#x00e1;pido tiempo de ciclo de "
@@ -778,7 +880,9 @@
 "puede estar facilmente sano y normalizado, permitiendo agregar una "
 "implementaci&#x00f3;n apropiada del modelo de dominio m&#x00e1;s tarde."
 
-#: index.docbook:265
+#. Tag: para
+#: persistent_classes.xml:292
+#, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
 "literal> basis:"
@@ -786,7 +890,9 @@
 "Los modos de representaci&#x00f3;n de entidad pueden ser establecidos por "
 "<literal>Session</literal>:"
 
-#: index.docbook:270
+#. Tag: programlisting
+#: persistent_classes.xml:297
+#, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
 "\n"
@@ -814,13 +920,15 @@
 "// Continue on pojoSession\n"
 "]]>"
 
-#: index.docbook:273
+#. Tag: para
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -835,7 +943,9 @@
 "tembi&#x00e9;n dejar el manejo de la transacci&#x00f3;n y de la "
 "conexi&#x00f3;n a la unidad de trabajo primaria."
 
-#: index.docbook:283
+#. Tag: para
+#: persistent_classes.xml:310
+#, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
 "<xref linkend=\"xml\"/>."
@@ -843,26 +953,25 @@
 "Puede encontrarse m&#x00e1;s informaci&#x00f3;n sobre las capacidades de "
 "representaci&#x00f3;n XML en <xref linkend=\"xml\"/>."
 
-#: index.docbook:291
+#. Tag: title
+#: persistent_classes.xml:318
+#, no-c-format
 msgid "Tuplizers"
 msgstr "UNTRANSLATED!!! Tuplizers"
 
-#: index.docbook:293
+#. Tag: para
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
 "responsible for managing a particular representation of a piece of data, "
@@ -879,16 +988,30 @@
 "managing the above mentioned contracts in regards to entities, while "
 "<literal>ComponentTuplizer</literal>s do the same for components."
 
-#: index.docbook:308
+#. Tag: para
+#: persistent_classes.xml:330
+#, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "Users may also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
@@ -899,7 +1022,9 @@
 "component mapping they are meant to manage. Going back to the example of our "
 "customer entity:"
 
-#: index.docbook:317
+#. Tag: programlisting
+#: persistent_classes.xml:347
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    <class entity-name=\"Customer\">\n"
@@ -979,15 +1104,201 @@
 "                    }\n"
 "                    }]]>"
 
-#: index.docbook:322
+#. Tag: title
+#: persistent_classes.xml:354
+#, no-c-format
+msgid "EntityNameResolvers"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:356
+#, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
 msgstr ""
-"PORHACER: Documentar el framework de extensiones del usuario en los paquetes "
-"de propiedad y proxies."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "Aqu&#x00ed; hay cuatro reglas principales a seguir:"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr ""
+#~ "PORHACER: Documentar el framework de extensiones del usuario en los "
+#~ "paquetes de propiedad y proxies."
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,20 +1,26 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:21
+#. Tag: title
+#: preface.xml:29
+#, no-c-format
 msgid "Preface"
 msgstr "Prefacio"
 
-#: index.docbook:23
+#. Tag: para
+#: preface.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -25,12 +31,14 @@
 "t&#x00e9;cnica de mapear una representaci&#x00f3;n de datos desde un modelo "
 "de objetos a un modelo de datos relacional con un esquema basado en SQL."
 
-#: index.docbook:31
+#. Tag: para
+#: preface.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "Hibernate no s&#x00f3;lo se encarga de mapear de clases Java a tablas de "
 "base de datos (y de tipos de datos de Java a tipos de datos SQL), sino que "
@@ -38,9 +46,11 @@
 "y puede reducir significativamente el tiempo de desarrollo que de otra forma "
 "se gasta en el manejo de los datos en SQL y JDBC."
 
-#: index.docbook:38
+#. Tag: para
+#: preface.xml:46
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -60,7 +70,9 @@
 "con la tarea com&#x00fa;n de traducci&#x00f3;n de resultados desde una "
 "representaci&#x00f3;n tabular a un grafo de objetos."
 
-#: index.docbook:48
+#. Tag: para
+#: preface.xml:56
+#, no-c-format
 msgid ""
 "If you are new to Hibernate and Object/Relational Mapping or even Java, "
 "please follow these steps:"
@@ -68,7 +80,9 @@
 "Si eres nuevo en Hibernate y lo del Mapeo Objeto/Relacional o incluso en "
 "Java, sigue por favor estos pasos:"
 
-#: index.docbook:55
+#. Tag: para
+#: preface.xml:63
+#, no-c-format
 msgid ""
 "Read <xref linkend=\"tutorial\"/> for a tutorial with step-by-step "
 "instructions. The source code for the tutorial is included in the "
@@ -77,7 +91,9 @@
 "Lee <xref linkend=\"quickstart\"/> para un tutorial de 30 minutos, usando "
 "Tomcat."
 
-#: index.docbook:63
+#. Tag: para
+#: preface.xml:71
+#, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
 "Hibernate can be used."
@@ -85,14 +101,16 @@
 "Lee <xref linkend=\"architecture\"/> para entender los entornos en los que "
 "puede ser usado Hibernate."
 
-#: index.docbook:69
+#. Tag: para
+#: preface.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "Dale una mirada al directorio <literal>eg/</literal> en la distribuci&#x00f3;"
 "n de Hibernate, contiene una aplicaci&#x00f3;n independiente simple. Copia "
@@ -102,14 +120,16 @@
 "distribuci&#x00f3;n, tipea <literal>ant eg</literal> (usando Ant), o bajo "
 "Windows, tipea <literal>build eg</literal>."
 
-#: index.docbook:80
+#. Tag: para
+#: preface.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr ""
 "Usa esta documentaci&#x00f3;n de referencia como tu fuente de "
 "informaci&#x00f3;n primaria. Ten en consideraci&#x00f3;n leer <emphasis>Java "
@@ -119,19 +139,25 @@
 "org y descarga la aplicaci&#x00f3;n de ejemplo para Java Persistence with "
 "Hibernate."
 
-#: index.docbook:90
+#. Tag: para
+#: preface.xml:98
+#, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr "Los FAQs son respondidos en el sitio web de Hibernate."
 
-#: index.docbook:95
+#. Tag: para
+#: preface.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr ""
 "En el sitio web de Hibernate hay enlaces a demos de terceros, ejemplos y "
 "tutoriales."
 
-#: index.docbook:101
+#. Tag: para
+#: preface.xml:109
+#, no-c-format
 msgid ""
 "The Community Area on the Hibernate website is a good resource for design "
 "patterns and various integration solutions (Tomcat, JBoss AS, Struts, EJB, "
@@ -141,10 +167,12 @@
 "patrones de dise&#x00f1;o y varias soluciones de integraci&#x00f3;n (Tomcat, "
 "JBoss, Struts, EJB, etc.)."
 
-#: index.docbook:109
+#. Tag: para
+#: preface.xml:117
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."
@@ -156,7 +184,9 @@
 "de desarrolladores. Si estas interesado en traducir esta documentaci&#x00f3;"
 "n a tu lenguaje, cont&#x00e1;ctanos en la lista de correo de desarrolladores."
 
-#: index.docbook:117
+#. Tag: para
+#: preface.xml:125
+#, no-c-format
 msgid ""
 "Commercial development support, production support, and training for "
 "Hibernate is available through JBoss Inc. (see http://www.hibernate.org/"
@@ -170,8 +200,8 @@
 "proyecto de la suite de productos de c&#x00f3;digo abierto JBoss "
 "Professional."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,25 +1,35 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: query_criteria.xml:29
+#, no-c-format
 msgid "Criteria Queries"
 msgstr "Consultas por Criterios"
 
-#: index.docbook:7
+#. Tag: para
+#: query_criteria.xml:31
+#, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr ""
 "Acompa&#x00f1;a a Hibernate una API de consultas por criterios intuitiva y "
 "extensible."
 
-#: index.docbook:12
+#. Tag: title
+#: query_criteria.xml:36
+#, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr "Creando una instancia de <literal>Criteria</literal>"
 
-#: index.docbook:14
+#. Tag: para
+#: query_criteria.xml:38
+#, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.Criteria</literal> represents a query "
 "against a particular persistent class. The <literal>Session</literal> is a "
@@ -29,7 +39,9 @@
 "consulta contra una clase persistente en particular. La <literal>Session</"
 "literal> es una f&#x00e1;brica de instancias de <literal>Criteria</literal>."
 
-#: index.docbook:20
+#. Tag: programlisting
+#: query_criteria.xml:44
+#, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = sess.createCriteria(Cat.class);\n"
 "crit.setMaxResults(50);\n"
@@ -39,11 +51,15 @@
 "crit.setMaxResults(50);\n"
 "List cats = crit.list();]]>"
 
-#: index.docbook:25
+#. Tag: title
+#: query_criteria.xml:49
+#, no-c-format
 msgid "Narrowing the result set"
 msgstr "Estrechando el conjunto resultado"
 
-#: index.docbook:27
+#. Tag: para
+#: query_criteria.xml:51
+#, no-c-format
 msgid ""
 "An individual query criterion is an instance of the interface <literal>org."
 "hibernate.criterion.Criterion</literal>. The class <literal>org.hibernate."
@@ -56,7 +72,9 @@
 "brica para obtener ciertos tipos prefabricados de <literal>Criterion</"
 "literal>."
 
-#: index.docbook:35
+#. Tag: programlisting
+#: query_criteria.xml:59
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
@@ -68,11 +86,15 @@
 "    .add( Restrictions.between(\"weight\", minWeight, maxWeight) )\n"
 "    .list();]]>"
 
-#: index.docbook:37
-msgid "Restrictions may be grouped logically."
+#. Tag: para
+#: query_criteria.xml:61
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "Las restricciones pueden ser agrupadas l&#x00f3;gicamente."
 
-#: index.docbook:41
+#. Tag: programlisting
+#: query_criteria.xml:65
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
@@ -90,7 +112,9 @@
 "    ) )\n"
 "    .list();]]>"
 
-#: index.docbook:43
+#. Tag: programlisting
+#: query_criteria.xml:67
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.in( \"name\", new String[] { \"Fritz\", \"Izi\", \"Pk"
@@ -114,17 +138,21 @@
 "    ) )\n"
 "    .list();]]>"
 
-#: index.docbook:45
+#. Tag: para
+#: query_criteria.xml:69
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "Hay un gran rango de tipos de criterio prefabricados (subclases de "
 "<literal>Restrictions</literal>), pero uno que es especialmente útil te deja "
 "especificar SQL directamente."
 
-#: index.docbook:50
+#. Tag: programlisting
+#: query_criteria.xml:74
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.sqlRestriction(\"lower({alias}.name) like lower(?)\", "
@@ -136,7 +164,9 @@
 "\", Hibernate.STRING) )\n"
 "    .list();]]>"
 
-#: index.docbook:52
+#. Tag: para
+#: query_criteria.xml:76
+#, no-c-format
 msgid ""
 "The <literal>{alias}</literal> placeholder with be replaced by the row alias "
 "of the queried entity."
@@ -144,17 +174,21 @@
 "El sitio <literal>{alias}</literal> ser&#x00e1; remplazado por el alias de "
 "fila de la entidad consultada."
 
-#: index.docbook:57
+#. Tag: para
+#: query_criteria.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "Un enfoque alternativo para obtener un criterio es tomarlo de una instancia "
 "de <literal>Property</literal>. Puedes crear una <literal>Property</literal> "
 "llamando a <literal>Property.forName()</literal>."
 
-#: index.docbook:63
+#. Tag: programlisting
+#: query_criteria.xml:87
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "Property age = Property.forName(\"age\");\n"
@@ -182,19 +216,25 @@
 "\"Pk\" } ) )\n"
 "    .list();]]>"
 
-#: index.docbook:68
+#. Tag: title
+#: query_criteria.xml:92
+#, no-c-format
 msgid "Ordering the results"
 msgstr "Ordenando los resultados"
 
-#: index.docbook:70
+#. Tag: para
+#: query_criteria.xml:94
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "Puedes ordenar los resultados usando <literal>org.hibernate.criterion.Order</"
 "literal>."
 
-#: index.docbook:74
+#. Tag: programlisting
+#: query_criteria.xml:98
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.like(\"name\", \"F%\")\n"
@@ -210,7 +250,9 @@
 "    .setMaxResults(50)\n"
 "    .list();]]>"
 
-#: index.docbook:76
+#. Tag: programlisting
+#: query_criteria.xml:100
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Property.forName(\"name\").like(\"F%\") )\n"
@@ -226,20 +268,23 @@
 "    .setMaxResults(50)\n"
 "    .list();]]>"
 
-#: index.docbook:81
+#. Tag: title
+#: query_criteria.xml:105
+#, no-c-format
 msgid "Associations"
 msgstr "Asociaciones"
 
-#: index.docbook:83
+#. Tag: para
+#: query_criteria.xml:107
+#, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"Puedes especificar f&#x00e1;cilmente restricciones sobre las entidades "
-"relacionadas al navegar asociaciones usando <literal>createCriteria()</"
-"literal>."
 
-#: index.docbook:88
+#. Tag: programlisting
+#: query_criteria.xml:112
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.like(\"name\", \"F%\") )\n"
@@ -253,21 +298,28 @@
 "        .add( Restrictions.like(\"name\", \"F%\")\n"
 "    .list();]]>"
 
-#: index.docbook:90
+#. Tag: para
+#: query_criteria.xml:114
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "nota que el segundo <literal>createCriteria()</literal> devuelve una nueva "
 "instancia de <literal>Criteria</literal>, que hace referencia a los "
 "elementos de la colecci&#x00f3;n <literal>kittens</literal>."
 
-#: index.docbook:96
-msgid "The following, alternate form is useful in certain circumstances."
+#. Tag: para
+#: query_criteria.xml:120
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "La siguiente forma alternativa es útil en ciertas circunstancias."
 
-#: index.docbook:100
+#. Tag: programlisting
+#: query_criteria.xml:124
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .createAlias(\"kittens\", \"kt\")\n"
@@ -281,7 +333,9 @@
 "    .add( Restrictions.eqProperty(\"kt.name\", \"mt.name\") )\n"
 "    .list();]]>"
 
-#: index.docbook:102
+#. Tag: para
+#: query_criteria.xml:126
+#, no-c-format
 msgid ""
 "(<literal>createAlias()</literal> does not create a new instance of "
 "<literal>Criteria</literal>.)"
@@ -289,11 +343,13 @@
 "(<literal>createAlias()</literal> no crea una nueva instancia de "
 "<literal>Criteria</literal>.)"
 
-#: index.docbook:107
+#. Tag: para
+#: query_criteria.xml:131
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "&#x00a1;Observa que las colecciones de gatitos tenidas por las instancias de "
@@ -302,7 +358,9 @@
 "s&#x00f3;lo los gatitos que emparejen los criterios, debes usar "
 "<literal>returnMaps()</literal>."
 
-#: index.docbook:114
+#. Tag: programlisting
+#: query_criteria.xml:138
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .createCriteria(\"kittens\", \"kt\")\n"
@@ -328,20 +386,26 @@
 "    Cat kitten = (Cat) map.get(\"kt\");\n"
 "}]]>"
 
-#: index.docbook:119
+#. Tag: title
+#: query_criteria.xml:143
+#, no-c-format
 msgid "Dynamic association fetching"
 msgstr "Recuperaci&#x00f3;n din&#x00e1;mica de asociaciones"
 
-#: index.docbook:121
+#. Tag: para
+#: query_criteria.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "Puedes especificar la sem&#x00e1;ntica de recuperaci&#x00f3;n de "
 "asociaciones en tiempo de ejecuci&#x00f3;n usando <literal>setFetchMode()</"
 "literal>."
 
-#: index.docbook:126
+#. Tag: programlisting
+#: query_criteria.xml:150
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
 "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
@@ -355,7 +419,9 @@
 "    .setFetchMode(\"kittens\", FetchMode.EAGER)\n"
 "    .list();]]>"
 
-#: index.docbook:128
+#. Tag: para
+#: query_criteria.xml:152
+#, no-c-format
 msgid ""
 "This query will fetch both <literal>mate</literal> and <literal>kittens</"
 "literal> by outer join. See <xref linkend=\"performance-fetching\"/> for "
@@ -365,11 +431,15 @@
 "<literal>kittens</literal> por uni&#x00f3;n exterior (outer join). Ver <xref "
 "linkend=\"performance-fetching\"/> para m&#x00e1;s informaci&#x00f3;n."
 
-#: index.docbook:136
+#. Tag: title
+#: query_criteria.xml:160
+#, no-c-format
 msgid "Example queries"
 msgstr "Consultas por ejemplos"
 
-#: index.docbook:138
+#. Tag: para
+#: query_criteria.xml:162
+#, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Example</literal> allows you to "
 "construct a query criterion from a given instance."
@@ -377,7 +447,9 @@
 "La clase <literal>org.hibernate.criterion.Example</literal> te permite "
 "construir un criterio de consulta a partir de una instancia dada."
 
-#: index.docbook:143
+#. Tag: programlisting
+#: query_criteria.xml:167
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
 "cat.setSex('F');\n"
@@ -393,7 +465,9 @@
 "    .add( Example.create(cat) )\n"
 "    .list();]]>"
 
-#: index.docbook:145
+#. Tag: para
+#: query_criteria.xml:169
+#, no-c-format
 msgid ""
 "Version properties, identifiers and associations are ignored. By default, "
 "null valued properties are excluded."
@@ -402,11 +476,15 @@
 "son ignorados. Por defecto, las propiedades valuadas a nulo son exclu&#x00ed;"
 "das."
 
-#: index.docbook:150
+#. Tag: para
+#: query_criteria.xml:174
+#, no-c-format
 msgid "You can adjust how the <literal>Example</literal> is applied."
 msgstr "Puedes ajustar c&#x00f3;mo se aplica el <literal>Example</literal>."
 
-#: index.docbook:154
+#. Tag: programlisting
+#: query_criteria.xml:178
+#, no-c-format
 msgid ""
 "<![CDATA[Example example = Example.create(cat)\n"
 "    .excludeZeroes()           //exclude zero valued properties\n"
@@ -428,12 +506,16 @@
 "    .add(example)\n"
 "    .list();]]>"
 
-#: index.docbook:156
+#. Tag: para
+#: query_criteria.xml:180
+#, no-c-format
 msgid "You can even use examples to place criteria upon associated objects."
 msgstr ""
 "Puedes incluso usar ejemplos para colocar criterios sobre objetos asociados."
 
-#: index.docbook:160
+#. Tag: programlisting
+#: query_criteria.xml:184
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .add( Example.create(cat) )\n"
@@ -447,22 +529,28 @@
 "        .add( Example.create( cat.getMate() ) )\n"
 "    .list();]]>"
 
-#: index.docbook:165
+#. Tag: title
+#: query_criteria.xml:189
+#, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr "Proyecciones, agregaci&#x00f3;n y agrupamiento"
 
-#: index.docbook:166
+#. Tag: para
+#: query_criteria.xml:190
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "La clase <literal>org.hibernate.criterion.Projections</literal> es una "
 "f&#x00e1;brica de instancias de <literal>Projection</literal>. Aplicamos una "
 "proyecci&#x00f3;n a una consulta llamando a <literal>setProjection()</"
 "literal>."
 
-#: index.docbook:172
+#. Tag: programlisting
+#: query_criteria.xml:196
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.rowCount() )\n"
@@ -474,7 +562,9 @@
 "    .add( Restrictions.eq(\"color\", Color.BLACK) )\n"
 "    .list();]]>"
 
-#: index.docbook:174
+#. Tag: programlisting
+#: query_criteria.xml:198
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.projectionList()\n"
@@ -494,7 +584,9 @@
 "    )\n"
 "    .list();]]>"
 
-#: index.docbook:176
+#. Tag: para
+#: query_criteria.xml:200
+#, no-c-format
 msgid ""
 "There is no explicit \"group by\" necessary in a criteria query. Certain "
 "projection types are defined to be <emphasis>grouping projections</"
@@ -505,17 +597,21 @@
 "<emphasis>proyecciones agrupadas</emphasis>, que adem&#x00e1;s aparecen en "
 "la cl&#x00e1;usula SQL <literal>group by</literal>."
 
-#: index.docbook:182
+#. Tag: para
+#: query_criteria.xml:206
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "Puede opcionalmente asignarse un alias a una proyecci&#x00f3;n, de modo que "
 "el valor proyectado pueda ser referido en restricciones u ordenamientos. "
 "Aqu&#x00ed; hay dos formas diferentes de hacer esto:"
 
-#: index.docbook:188
+#. Tag: programlisting
+#: query_criteria.xml:212
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.alias( Projections.groupProperty(\"color\"), "
@@ -529,7 +625,9 @@
 "    .addOrder( Order.asc(\"colr\") )\n"
 "    .list();]]>"
 
-#: index.docbook:190
+#. Tag: programlisting
+#: query_criteria.xml:214
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.groupProperty(\"color\").as(\"colr\") )\n"
@@ -541,7 +639,9 @@
 "    .addOrder( Order.asc(\"colr\") )\n"
 "    .list();]]>"
 
-#: index.docbook:192
+#. Tag: para
+#: query_criteria.xml:216
+#, no-c-format
 msgid ""
 "The <literal>alias()</literal> and <literal>as()</literal> methods simply "
 "wrap a projection instance in another, aliased, instance of "
@@ -553,7 +653,9 @@
 "de <literal>Projection</literal> con alias. Como un atajo, puedes asignar un "
 "alias cuando agregas la proyecci&#x00f3;n a una lista de proyecciones:"
 
-#: index.docbook:199
+#. Tag: programlisting
+#: query_criteria.xml:223
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.projectionList()\n"
@@ -577,7 +679,9 @@
 "    .addOrder( Order.desc(\"avgWeight\") )\n"
 "    .list();]]>"
 
-#: index.docbook:201
+#. Tag: programlisting
+#: query_criteria.xml:225
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Domestic.class, \"cat\")\n"
 "    .createAlias(\"kittens\", \"kit\")\n"
@@ -599,7 +703,9 @@
 "    .addOrder( Order.asc(\"kitName\") )\n"
 "    .list();]]>"
 
-#: index.docbook:203
+#. Tag: para
+#: query_criteria.xml:227
+#, no-c-format
 msgid ""
 "You can also use <literal>Property.forName()</literal> to express "
 "projections:"
@@ -607,7 +713,9 @@
 "Puedes tambi&#x00e9;n usar <literal>Property.forName()</literal> para "
 "expresar proyecciones:"
 
-#: index.docbook:207
+#. Tag: programlisting
+#: query_criteria.xml:231
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Property.forName(\"name\") )\n"
@@ -619,7 +727,9 @@
 "    .add( Property.forName(\"color\").eq(Color.BLACK) )\n"
 "    .list();]]>"
 
-#: index.docbook:209
+#. Tag: programlisting
+#: query_criteria.xml:233
+#, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
 "    .setProjection( Projections.projectionList()\n"
@@ -643,21 +753,27 @@
 "    .addOrder( Order.desc(\"avgWeight\") )\n"
 "    .list();]]>"
 
-#: index.docbook:214
+#. Tag: title
+#: query_criteria.xml:238
+#, no-c-format
 msgid "Detached queries and subqueries"
 msgstr "Consultas y subconsultas separadas"
 
-#: index.docbook:215
+#. Tag: para
+#: query_criteria.xml:239
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "La clase <literal>DetachedCriteria</literal> te deja crear una consulta "
 "fuera del &#x00e1;mbito de una sesi&#x00f3;n, y entonces ejecutarla luego "
 "usando alguna <literal>Session</literal> arbitraria."
 
-#: index.docbook:220
+#. Tag: programlisting
+#: query_criteria.xml:244
+#, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria query = DetachedCriteria.forClass(Cat.class)\n"
 "    .add( Property.forName(\"sex\").eq('F') );\n"
@@ -679,10 +795,12 @@
 "txn.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:222
+#. Tag: para
+#: query_criteria.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "Tambi&#x00e9;n una <literal>DetachedCriteria</literal> puede usarse para "
@@ -690,7 +808,9 @@
 "subconsultas pueden obtenerse v&#x00ed;a <literal>Subqueries</literal> o "
 "<literal>Property</literal>."
 
-#: index.docbook:228
+#. Tag: programlisting
+#: query_criteria.xml:252
+#, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)\n"
 "    .setProjection( Property.forName(\"weight\").avg() );\n"
@@ -704,7 +824,9 @@
 "    .add( Property.forName(\"weight\").gt(avgWeight) )\n"
 "    .list();]]>"
 
-#: index.docbook:230
+#. Tag: programlisting
+#: query_criteria.xml:254
+#, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
 "    .setProjection( Property.forName(\"weight\") );\n"
@@ -718,11 +840,15 @@
 "    .add( Subqueries.geAll(\"weight\", weights) )\n"
 "    .list();]]>"
 
-#: index.docbook:232
-msgid "Even correlated subqueries are possible:"
+#. Tag: para
+#: query_criteria.xml:256
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "Incluso son posibles las subconsultas correlacionadas:"
 
-#: index.docbook:236
+#. Tag: programlisting
+#: query_criteria.xml:260
+#, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
 "class, \"cat2\")\n"
@@ -740,15 +866,19 @@
 "    .add( Property.forName(\"weight\").gt(avgWeightForSex) )\n"
 "    .list();]]>"
 
-#: index.docbook:245
+#. Tag: title
+#: query_criteria.xml:269
+#, no-c-format
 msgid "Queries by natural identifier"
 msgstr "Consultas por identificador natural"
 
-#: index.docbook:247
+#. Tag: para
+#: query_criteria.xml:271
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -762,16 +892,20 @@
 "ocurre frecuentemente. La API de criterios brinda especial provisi&#x00f3;n "
 "para este caso de uso."
 
-#: index.docbook:255
+#. Tag: para
+#: query_criteria.xml:279
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "Primero, debes mapear la clave natural de tu entidad usando <literal>&lt;"
 "natural-id&gt;</literal>, y habilitar el uso del cach&#x00e9; de segundo "
 "nivel."
 
-#: index.docbook:260
+#. Tag: programlisting
+#: query_criteria.xml:284
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
 "    <cache usage=\"read-write\"/>\n"
@@ -797,27 +931,30 @@
 "    <property name=\"password\"/>\n"
 "</class>]]>"
 
-#: index.docbook:262
+#. Tag: para
+#: query_criteria.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr ""
 "Nota que esta funcionalidad no est&#x00e1; pensada para uso con entidades "
 "con claves naturales <emphasis>mutable</emphasis>."
 
-#: index.docbook:267
-msgid "Next, enable the Hibernate query cache."
-msgstr "Seguido, habilita el cach&#x00e9; de consulta de Hibernate."
-
-#: index.docbook:271
+#. Tag: para
+#: query_criteria.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "Ahora, <literal>Restrictions.naturalId()</literal> nos permite hacer uso de "
 "el algoritmo de cach&#x00e9; m&#x00e1;s eficiente."
 
-#: index.docbook:276
+#. Tag: programlisting
+#: query_criteria.xml:297
+#, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
 "    .add( Restrictions.naturalId()\n"
@@ -833,8 +970,19 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "Puedes especificar f&#x00e1;cilmente restricciones sobre las entidades "
+#~ "relacionadas al navegar asociaciones usando <literal>createCriteria()</"
+#~ "literal>."
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "Seguido, habilita el cach&#x00e9; de consulta de Hibernate."
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,20 +1,25 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: query_hql.xml:29
+#, no-c-format
 msgid "HQL: The Hibernate Query Language"
 msgstr "HQL: El Lenguaje de Consulta de Hibernate"
 
-#: index.docbook:7
+#. Tag: para
+#: query_hql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "Hibernate est&#x00e1; equipado con un lenguaje de consulta extremadamente "
 "potente que (intencionalmente en absoluto) se parece much&#x00ed;simo a SQL. "
@@ -22,17 +27,21 @@
 "objetos, entendiendo nociones como herencia, polimorfismo y asociaci&#x00f3;"
 "n."
 
-#: index.docbook:14
+#. Tag: title
+#: query_hql.xml:38
+#, no-c-format
 msgid "Case Sensitivity"
 msgstr "Sensibilidad a May&#x00fa;sculas"
 
-#: index.docbook:16
+#. Tag: para
+#: query_hql.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "Las consultas son insensibles a may&#x00fa;sculas, excepto para nombres de "
 "clases Java y propiedades. De modo que <literal>SeLeCT</literal> es lo mismo "
@@ -41,93 +50,117 @@
 "Foo</literal> y <literal>foo.barSet</literal> no es igual a <literal>foo."
 "BARSET</literal>."
 
-#: index.docbook:27
+#. Tag: para
+#: query_hql.xml:51
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "Este manual usa palabras clave HQL en min&#x00fa;sculas. Algunos usuarios "
 "encuentran las consultas con palabras clave en may&#x00fa;sculas m&#x00e1;s "
 "le&#x00ed;bles, pero encontramos esta convenci&#x00f3;n fea cuando se encaja "
 "en c&#x00f3;digo Java."
 
-#: index.docbook:35
+#. Tag: title
+#: query_hql.xml:59
+#, no-c-format
 msgid "The from clause"
 msgstr "La cl&#x00e1;usula from"
 
-#: index.docbook:37
+#. Tag: para
+#: query_hql.xml:61
+#, no-c-format
 msgid "The simplest possible Hibernate query is of the form:"
 msgstr "La consulta m&#x00e1;s simple posible de Hibernate es de la forma:"
 
-#: index.docbook:41
+#. Tag: programlisting
+#: query_hql.xml:65
+#, no-c-format
 msgid "<![CDATA[from eg.Cat]]>"
 msgstr "<![CDATA[from eg.Cat]]>"
 
-#: index.docbook:43
+#. Tag: para
+#: query_hql.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "que simplemente devuelve todas las instancias de la clase <literal>eg.Cat</"
 "literal>. Usualmente no necesitamos cualificar el nombre de la clase, ya que "
 "<literal>auto-import</literal> est&#x00e1; por defecto. De modo que casi "
 "siempre escribimos solamente:"
 
-#: index.docbook:49
+#. Tag: programlisting
+#: query_hql.xml:73
+#, no-c-format
 msgid "<![CDATA[from Cat]]>"
 msgstr "<![CDATA[from Cat]]>"
 
-#: index.docbook:51
+#. Tag: para
+#: query_hql.xml:75
+#, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"La mayor&#x00ed;a del tiempo, necesitar&#x00e1;s asignar un <emphasis>alias</"
-"emphasis>, ya que querr&#x00e1;s referirte al <literal>Cat</literal> en "
-"otras partes de la consulta."
 
-#: index.docbook:57, index.docbook:372
+#. Tag: programlisting
+#: query_hql.xml:81 query_hql.xml:396
+#, no-c-format
 msgid "<![CDATA[from Cat as cat]]>"
 msgstr "<![CDATA[from Cat as cat]]>"
 
-#: index.docbook:59
+#. Tag: para
+#: query_hql.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "Esta consulta asigna el alias <literal>cat</literal> a las instancias de "
 "<literal>Cat</literal>, de modo que podr&#x00ed;amos usar ese alias luego en "
 "la consulta. La palabra clave <literal>as</literal> es opcional; "
 "tambi&#x00e9;n podr&#x00ed;amos escribir:"
 
-#: index.docbook:65
+#. Tag: programlisting
+#: query_hql.xml:89
+#, no-c-format
 msgid "<![CDATA[from Cat cat]]>"
 msgstr "<![CDATA[from Cat cat]]>"
 
-#: index.docbook:67
+#. Tag: para
+#: query_hql.xml:91
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr ""
 "Pueden aparecer m&#x00fa;ltiples clases, resultando en un producto "
 "cartesiano o uni&#x00f3;n \"cruzada\" (cross join)."
 
-#: index.docbook:71
+#. Tag: programlisting
+#: query_hql.xml:95
+#, no-c-format
 msgid "<![CDATA[from Formula, Parameter]]>"
 msgstr "<![CDATA[from Formula, Parameter]]>"
 
-#: index.docbook:72
+#. Tag: programlisting
+#: query_hql.xml:96
+#, no-c-format
 msgid "<![CDATA[from Formula as form, Parameter as param]]>"
 msgstr "<![CDATA[from Formula as form, Parameter as param]]>"
 
-#: index.docbook:74
+#. Tag: para
+#: query_hql.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "Se considera buena pr&#x00e1;ctica el nombrar los alias de consulta usando "
@@ -135,20 +168,26 @@
 "nombrado de Java para variables locales (por ejemplo, <literal>domesticCat</"
 "literal>)."
 
-#: index.docbook:83
+#. Tag: title
+#: query_hql.xml:107
+#, no-c-format
 msgid "Associations and joins"
 msgstr "Asociaciones y uniones (joins)"
 
-#: index.docbook:85
+#. Tag: para
+#: query_hql.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "Podemos tambi&#x00e9;n asignar aliases a entidades asociadas, e incluso a "
 "elementos de una colecci&#x00f3;n de valores, usando una <literal>join</"
 "literal>."
 
-#: index.docbook:90
+#. Tag: programlisting
+#: query_hql.xml:114
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "    inner join cat.mate as mate\n"
@@ -158,35 +197,51 @@
 "    inner join cat.mate as mate\n"
 "    left outer join cat.kittens as kitten]]>"
 
-#: index.docbook:92
+#. Tag: programlisting
+#: query_hql.xml:116
+#, no-c-format
 msgid "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
 msgstr "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
 
-#: index.docbook:94
+#. Tag: programlisting
+#: query_hql.xml:118
+#, no-c-format
 msgid "<![CDATA[from Formula form full join form.parameter param]]>"
 msgstr "<![CDATA[from Formula form full join form.parameter param]]>"
 
-#: index.docbook:96
-msgid "The supported join types are borrowed from ANSI SQL"
+#. Tag: para
+#: query_hql.xml:120
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "Los tipos de join soportados son prestados de ANSI SQL"
 
-#: index.docbook:103
+#. Tag: literal
+#: query_hql.xml:127
+#, no-c-format
 msgid "inner join"
 msgstr "inner join"
 
-#: index.docbook:108
+#. Tag: literal
+#: query_hql.xml:132
+#, no-c-format
 msgid "left outer join"
 msgstr "left outer join"
 
-#: index.docbook:113
+#. Tag: literal
+#: query_hql.xml:137
+#, no-c-format
 msgid "right outer join"
 msgstr "right outer join"
 
-#: index.docbook:117
+#. Tag: para
+#: query_hql.xml:141
+#, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr "<literal>full join</literal> (no &#x00fa;til usualmente)"
 
-#: index.docbook:123
+#. Tag: para
+#: query_hql.xml:147
+#, no-c-format
 msgid ""
 "The <literal>inner join</literal>, <literal>left outer join</literal> and "
 "<literal>right outer join</literal> constructs may be abbreviated."
@@ -194,7 +249,9 @@
 "Las construcciones <literal>inner join</literal>, <literal>left outer join</"
 "literal> y <literal>right outer join</literal> pueden ser abreviadas."
 
-#: index.docbook:128
+#. Tag: programlisting
+#: query_hql.xml:152
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "    join cat.mate as mate\n"
@@ -204,7 +261,9 @@
 "    join cat.mate as mate\n"
 "    left join cat.kittens as kitten]]>"
 
-#: index.docbook:130
+#. Tag: para
+#: query_hql.xml:154
+#, no-c-format
 msgid ""
 "You may supply extra join conditions using the HQL <literal>with</literal> "
 "keyword."
@@ -212,7 +271,9 @@
 "Puedes proveer condiciones de uni&#x00f3;n extra usando la palabra clave "
 "<literal>with</literal> de HQL."
 
-#: index.docbook:135
+#. Tag: programlisting
+#: query_hql.xml:159
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "    left join cat.kittens as kitten\n"
@@ -222,14 +283,16 @@
 "    left join cat.kittens as kitten \n"
 "        with kitten.bodyWeight > 10.0]]>"
 
-#: index.docbook:137
+#. Tag: para
+#: query_hql.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "En adici&#x00f3;n, un \"fetch\" join permite a las asociaciones o "
 "colecciones de valores ser inicializadas junto a sus objetos padres, usando "
@@ -239,7 +302,9 @@
 "colecciones. Ver <xref linkend=\"performance-fetching\"/> para m&#x00e1;s "
 "informaci&#x00f3;n."
 
-#: index.docbook:145
+#. Tag: programlisting
+#: query_hql.xml:169
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "    inner join fetch cat.mate\n"
@@ -249,13 +314,15 @@
 "    inner join fetch cat.mate\n"
 "    left join fetch cat.kittens]]>"
 
-#: index.docbook:147
+#. Tag: para
+#: query_hql.xml:171
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "Usualmente a un fetch join no se necesita asign&#x00e1;rsele un alias, "
@@ -266,7 +333,9 @@
 "&#x00fa;nica raz&#x00f3;n por la que necesitar&#x00ed;amos un alias es "
 "estamos uniendo recursivamente otra colecci&#x00f3;n:"
 
-#: index.docbook:155
+#. Tag: programlisting
+#: query_hql.xml:179
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "    inner join fetch cat.mate\n"
@@ -278,22 +347,24 @@
 "    left join fetch cat.kittens child\n"
 "    left join fetch child.kittens]]>"
 
-#: index.docbook:157
+#. Tag: para
+#: query_hql.xml:181
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "Nota que la construcci&#x00f3;n <literal>fetch</literal> no puede usarse en "
 "consultas llamadas usando <literal>scroll()</literal> o <literal>iterate()</"
@@ -308,11 +379,13 @@
 "formular tus consultas en este caso. Finalmente, nota que <literal>full join "
 "fetch</literal> y <literal>right join fetch</literal> no son significativos."
 
-#: index.docbook:172
+#. Tag: para
+#: query_hql.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "Si est&#x00e1;s usando recuperaci&#x00f3;n perezosa a nivel de propiedad "
@@ -320,11 +393,15 @@
 "traer las propiedades perezosas inmediatamente (en la primera consulta) "
 "usando <literal>fetch all properties</literal>."
 
-#: index.docbook:178
+#. Tag: programlisting
+#: query_hql.xml:202
+#, no-c-format
 msgid "<![CDATA[from Document fetch all properties order by name]]>"
 msgstr "<![CDATA[from Document fetch all properties order by name]]>"
 
-#: index.docbook:179
+#. Tag: programlisting
+#: query_hql.xml:203
+#, no-c-format
 msgid ""
 "<![CDATA[from Document doc fetch all properties where lower(doc.name) like '%"
 "cats%']]>"
@@ -332,11 +409,15 @@
 "<![CDATA[from Document doc fetch all properties where lower(doc.name) like '%"
 "cats%']]>"
 
-#: index.docbook:184
+#. Tag: title
+#: query_hql.xml:208
+#, no-c-format
 msgid "Forms of join syntax"
 msgstr "UNTRANSLATED!!! Forms of join syntax"
 
-#: index.docbook:186
+#. Tag: para
+#: query_hql.xml:210
+#, no-c-format
 msgid ""
 "HQL supports two forms of association joining: <literal>implicit</literal> "
 "and <literal>explicit</literal>."
@@ -344,17 +425,21 @@
 "HQL supports two forms of association joining: <literal>implicit</literal> "
 "and <literal>explicit</literal>."
 
-#: index.docbook:190
+#. Tag: para
+#: query_hql.xml:214
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "The queries shown in the previous section all use the <literal>explicit</"
 "literal> form where the join keyword is explicitly used in the from clause. "
 "This is the recommended form."
 
-#: index.docbook:195
+#. Tag: para
+#: query_hql.xml:219
+#, no-c-format
 msgid ""
 "The <literal>implicit</literal> form does not use the join keyword. Instead, "
 "the associations are \"dereferenced\" using dot-notation. <literal>implicit</"
@@ -366,46 +451,56 @@
 "literal> joins can appear in any of the HQL clauses. <literal>implicit</"
 "literal> join result in inner joins in the resulting SQL statement."
 
-#: index.docbook:202
+#. Tag: programlisting
+#: query_hql.xml:226
+#, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
 msgstr "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
 
-#: index.docbook:206
-msgid "Refering to identifier property"
+#. Tag: title
+#: query_hql.xml:230
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "Refering to identifier property"
 
-#: index.docbook:208
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#. Tag: para
+#: query_hql.xml:232
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
 "property:"
 
-#: index.docbook:213
+#. Tag: para
+#: query_hql.xml:237
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "The special property (lowercase) <literal>id</literal> may be used to "
 "reference the identifier property of an entity <emphasis>provided that "
 "entity does not define a non-identifier property named id</emphasis>."
 
-#: index.docbook:220
+#. Tag: para
+#: query_hql.xml:244
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "If the entity defines a named identifier property, you may use that property "
 "name."
 
-#: index.docbook:226
+#. Tag: para
+#: query_hql.xml:250
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "References to composite identifier properties follow the same naming rules. "
@@ -414,13 +509,15 @@
 "the special <literal>id</literal> property can be used to rerference the "
 "identifier property."
 
-#: index.docbook:233
+#. Tag: para
+#: query_hql.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
 "versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
@@ -428,19 +525,25 @@
 "decision was that non-identifier properties named <literal>id</literal> "
 "could never be referenced in Hibernate queries."
 
-#: index.docbook:242
+#. Tag: title
+#: query_hql.xml:269
+#, no-c-format
 msgid "The select clause"
 msgstr "La cl&#x00e1;usula select"
 
-#: index.docbook:244
+#. Tag: para
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "La cl&#x00e1;usula <literal>select</literal> escoge qu&#x00e9; objetos y "
 "propiedades devolver in el conjunto resultado de la consulta. Considera:"
 
-#: index.docbook:249
+#. Tag: programlisting
+#: query_hql.xml:276
+#, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
 "from Cat as cat\n"
@@ -450,28 +553,36 @@
 "from Cat as cat \n"
 "    inner join cat.mate as mate]]>"
 
-#: index.docbook:251
+#. Tag: para
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "La consulta seleccionar&#x00e1; <literal>mate</literal>s de otros "
 "<literal>Cat</literal>s. Realmente, puedes expresar esta consulta en un "
 "forma m&#x00e1;s compacta como:"
 
-#: index.docbook:256
+#. Tag: programlisting
+#: query_hql.xml:283
+#, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr "<![CDATA[select cat.mate from Cat cat]]>"
 
-#: index.docbook:258
+#. Tag: para
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "Las consultas pueden devolver propiedades de cualquier tipo de valor "
 "incluyendo propiedades de tipo componente:"
 
-#: index.docbook:262
+#. Tag: programlisting
+#: query_hql.xml:289
+#, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
 "where cat.name like 'fri%']]>"
@@ -479,19 +590,25 @@
 "<![CDATA[select cat.name from DomesticCat cat\n"
 "where cat.name like 'fri%']]>"
 
-#: index.docbook:264
+#. Tag: programlisting
+#: query_hql.xml:291
+#, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 
-#: index.docbook:266
+#. Tag: para
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "Las consultas pueden devolver m&#x00fa;ltiples objetos y/o propiedades como "
 "un array de tipo <literal>Object[]</literal>,"
 
-#: index.docbook:271
+#. Tag: programlisting
+#: query_hql.xml:298
+#, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
 "from DomesticCat as mother\n"
@@ -503,11 +620,15 @@
 "    inner join mother.mate as mate\n"
 "    left outer join mother.kittens as offspr]]>"
 
-#: index.docbook:273
-msgid "or as a <literal>List</literal>,"
+#. Tag: para
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "o como una <literal>List</literal>,"
 
-#: index.docbook:277
+#. Tag: programlisting
+#: query_hql.xml:304
+#, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
 "from DomesticCat as mother\n"
@@ -519,11 +640,19 @@
 "    inner join mother.mate as mate\n"
 "    left outer join mother.kittens as offspr]]>"
 
-#: index.docbook:279
-msgid "or as an actual typesafe Java object,"
-msgstr "o como un objeto real Java de tipo seguro,"
+#. Tag: para
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr ""
+"asumiendo que la clase <literal>Family</literal> tiene un constructor "
+"apropiado."
 
-#: index.docbook:283
+#. Tag: programlisting
+#: query_hql.xml:310
+#, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
 "from DomesticCat as mother\n"
@@ -535,22 +664,18 @@
 "    join mother.mate as mate\n"
 "    left join mother.kittens as offspr]]>"
 
-#: index.docbook:285
+#. Tag: para
+#: query_hql.xml:313
+#, fuzzy, no-c-format
 msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr ""
-"asumiendo que la clase <literal>Family</literal> tiene un constructor "
-"apropiado."
-
-#: index.docbook:289
-msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
-msgstr ""
 "Puedes asignar aliases para seleccionar expresiones usando <literal>as</"
 "literal>:"
 
-#: index.docbook:293
+#. Tag: programlisting
+#: query_hql.xml:317
+#, no-c-format
 msgid ""
 "<![CDATA[select max(bodyWeight) as max, min(bodyWeight) as min, count(*) as "
 "n\n"
@@ -560,7 +685,9 @@
 "n\n"
 "from Cat cat]]>"
 
-#: index.docbook:295
+#. Tag: para
+#: query_hql.xml:319
+#, no-c-format
 msgid ""
 "This is most useful when used together with <literal>select new map</"
 "literal>:"
@@ -568,7 +695,9 @@
 "Esto es lo m&#x00e1;s &#x00fa;til cuando se usa junto con <literal>select "
 "new map</literal>:"
 
-#: index.docbook:299
+#. Tag: programlisting
+#: query_hql.xml:323
+#, no-c-format
 msgid ""
 "<![CDATA[select new map( max(bodyWeight) as max, min(bodyWeight) as min, "
 "count(*) as n )\n"
@@ -578,25 +707,33 @@
 "count(*) as n )\n"
 "from Cat cat]]>"
 
-#: index.docbook:301
+#. Tag: para
+#: query_hql.xml:325
+#, no-c-format
 msgid ""
 "This query returns a <literal>Map</literal> from aliases to selected values."
 msgstr ""
 "Esta consulta devuelve un <literal>Map</literal> de aliases a valores "
 "seleccionados."
 
-#: index.docbook:308
+#. Tag: title
+#: query_hql.xml:332
+#, no-c-format
 msgid "Aggregate functions"
 msgstr "Funciones de agregaci&#x00f3;n"
 
-#: index.docbook:310
+#. Tag: para
+#: query_hql.xml:334
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr ""
 "Las consultas HQL pueden incluso devolver resultados de funciones de "
 "agregaci&#x00f3;n sobre propiedades:"
 
-#: index.docbook:314
+#. Tag: programlisting
+#: query_hql.xml:338
+#, no-c-format
 msgid ""
 "<![CDATA[select avg(cat.weight), sum(cat.weight), max(cat.weight), count"
 "(cat)\n"
@@ -606,31 +743,43 @@
 "(cat)\n"
 "from Cat cat]]>"
 
-#: index.docbook:325
-msgid "The supported aggregate functions are"
+#. Tag: para
+#: query_hql.xml:349
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "Las funciones de agregaci&#x00f3;n soportadas son"
 
-#: index.docbook:332
+#. Tag: literal
+#: query_hql.xml:356
+#, no-c-format
 msgid "avg(...), sum(...), min(...), max(...)"
 msgstr "avg(...), sum(...), min(...), max(...)"
 
-#: index.docbook:337
+#. Tag: literal
+#: query_hql.xml:361
+#, no-c-format
 msgid "count(*)"
 msgstr "count(*)"
 
-#: index.docbook:342
+#. Tag: literal
+#: query_hql.xml:366
+#, no-c-format
 msgid "count(...), count(distinct ...), count(all...)"
 msgstr "count(...), count(distinct ...), count(all...)"
 
-#: index.docbook:347
+#. Tag: para
+#: query_hql.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr ""
 "Puedes usar operadores aritm&#x00e9;ticos, concatenaci&#x00f3;n, y funciones "
 "SQL reconocidas en la cl&#x00e1;usula select:"
 
-#: index.docbook:352
+#. Tag: programlisting
+#: query_hql.xml:376
+#, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
 "from Cat cat\n"
@@ -642,21 +791,27 @@
 "    join cat.kittens kitten\n"
 "group by cat.id, cat.weight]]>"
 
-#: index.docbook:354
+#. Tag: programlisting
+#: query_hql.xml:378
+#, no-c-format
 msgid ""
 "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from Person]]>"
 msgstr ""
 "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from Person]]>"
 
-#: index.docbook:356
+#. Tag: para
+#: query_hql.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "Las palabras clave <literal>distinct</literal> y <literal>all</literal> "
 "pueden ser usadas y tienen las misma sem&#x00e1;ntica que en SQL."
 
-#: index.docbook:361
+#. Tag: programlisting
+#: query_hql.xml:385
+#, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
 "\n"
@@ -666,18 +821,24 @@
 "\n"
 "select count(distinct cat.name), count(cat) from Cat cat]]>"
 
-#: index.docbook:366
+#. Tag: title
+#: query_hql.xml:390
+#, no-c-format
 msgid "Polymorphic queries"
 msgstr "Consultas polim&#x00f3;rficas"
 
-#: index.docbook:368
+#. Tag: para
+#: query_hql.xml:392
+#, no-c-format
 msgid "A query like:"
 msgstr "Una consulta como:"
 
-#: index.docbook:374
+#. Tag: para
+#: query_hql.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -691,11 +852,15 @@
 "esa clase o implementen la interface. La siguiente consulta devolver&#x00ed;"
 "a todos los objetos persistentes."
 
-#: index.docbook:382
+#. Tag: programlisting
+#: query_hql.xml:406
+#, no-c-format
 msgid "<![CDATA[from java.lang.Object o]]>"
 msgstr "<![CDATA[from java.lang.Object o]]>"
 
-#: index.docbook:384
+#. Tag: para
+#: query_hql.xml:408
+#, no-c-format
 msgid ""
 "The interface <literal>Named</literal> might be implemented by various "
 "persistent classes:"
@@ -703,16 +868,20 @@
 "La interface <literal>Named</literal> podr&#x00ed;a ser implementada por "
 "varias clases persistentes:"
 
-#: index.docbook:389
+#. Tag: programlisting
+#: query_hql.xml:413
+#, no-c-format
 msgid "<![CDATA[from Named n, Named m where n.name = m.name]]>"
 msgstr "<![CDATA[from Named n, Named m where n.name = m.name]]>"
 
-#: index.docbook:391
+#. Tag: para
+#: query_hql.xml:415
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "Nota que estas dos &#x00fa;ltimas consultas requerir&#x00e1;n m&#x00e1;s de "
 "un <literal>SELECT</literal> SQL. Esto significa que la cl&#x00e1;usula "
@@ -720,36 +889,56 @@
 "conjunto resultado. (Significa adem&#x00e1;s que no puedes llamar estas "
 "consulta usando <literal>Query.scroll()</literal>.)"
 
-#: index.docbook:400
+#. Tag: title
+#: query_hql.xml:424
+#, no-c-format
 msgid "The where clause"
 msgstr "La cl&#x00e1;usula where"
 
-#: index.docbook:402
+#. Tag: para
+#: query_hql.xml:426
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "La cl&#x00e1;usula where te permite estrechar la lista de instancias "
 "devueltas. Si no existe ning&#x00fa;n alias. puedes referirte a las "
 "propiedades por nombre:"
 
-#: index.docbook:407
+#. Tag: programlisting
+#: query_hql.xml:431
+#, no-c-format
 msgid "<![CDATA[from Cat where name='Fritz']]>"
 msgstr "<![CDATA[from Cat where name='Fritz']]>"
 
-#: index.docbook:409
+#. Tag: para
+#: query_hql.xml:433
+#, no-c-format
 msgid "If there is an alias, use a qualified property name:"
 msgstr "Si existe un alias, usan un nombre cualificado de propiedad:"
 
-#: index.docbook:413
+#. Tag: programlisting
+#: query_hql.xml:437
+#, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.name='Fritz']]>"
 msgstr "<![CDATA[from Cat as cat where cat.name='Fritz']]>"
 
-#: index.docbook:415
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#. Tag: para
+#: query_hql.xml:439
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "devuelve las instancias de <literal>Cat</literal> llamadas 'Fritz'."
 
-#: index.docbook:419
+#. Tag: para
+#: query_hql.xml:443
+#, no-c-format
+msgid "The following query:"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:446
+#, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
 "from Foo foo, Bar bar\n"
@@ -759,13 +948,15 @@
 "from Foo foo, Bar bar\n"
 "where foo.startDate = bar.date]]>"
 
-#: index.docbook:421
+#. Tag: para
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "devolver&#x00e1; todas las instancias de <literal>Foo</literal> para las "
 "cuales exista una instancia de <literal>bar</literal> con una propiedad "
@@ -773,19 +964,24 @@
 "del <literal>Foo</literal>. Las expresiones de ruta compuestas hacen la "
 "cl&#x00e1;usula <literal>where</literal> extremadamente potente. Considera:"
 
-#: index.docbook:430
+#. Tag: programlisting
+#: query_hql.xml:457
+#, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 
-#: index.docbook:432
+#. Tag: para
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "Esta consulta se traduce en una consulta SQL con una uni&#x00f3;n de tabla "
 "(interna). Si fueses a escribir algo como"
 
-#: index.docbook:437
+#. Tag: programlisting
+#: query_hql.xml:464
+#, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
 "where foo.bar.baz.customer.address.city is not null]]>"
@@ -793,26 +989,33 @@
 "<![CDATA[from Foo foo  \n"
 "where foo.bar.baz.customer.address.city is not null]]>"
 
-#: index.docbook:439
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#. Tag: para
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 "terminar&#x00ed;as con una consulta que requerir&#x00ed;a cuatro uniones de "
 "tablas en SQL."
 
-#: index.docbook:443
+#. Tag: para
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "El operador <literal>=</literal> puede ser usado para comparar no s&#x00f3;"
 "lo propiedades, sino tambi&#x00e9;n instancias:"
 
-#: index.docbook:448
+#. Tag: programlisting
+#: query_hql.xml:475
+#, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 
-#: index.docbook:450
+#. Tag: programlisting
+#: query_hql.xml:477
+#, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
 "from Cat cat, Cat mate\n"
@@ -822,9 +1025,11 @@
 "from Cat cat, Cat mate\n"
 "where cat.mate = mate]]>"
 
-#: index.docbook:452
+#. Tag: para
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -832,7 +1037,9 @@
 "usada para referenciar el identificador &#x00fa;nico de un objeto. "
 "(Tambi&#x00e9;n puedes usar su nombre de propiedad.)"
 
-#: index.docbook:458
+#. Tag: programlisting
+#: query_hql.xml:485
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
 "\n"
@@ -842,26 +1049,30 @@
 "\n"
 "from Cat as cat where cat.mate.id = 69]]>"
 
-#: index.docbook:460
-msgid "The second query is efficient. No table join is required!"
+#. Tag: para
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr ""
 "La segunda consulta es eficiente. &#x00a1;No se requiere ninguna uni&#x00f3;"
 "n de tablas!"
 
-#: index.docbook:464
+#. Tag: para
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "Tambi&#x00e9;n pueden ser usadas las propiedades de identificadores "
 "compuestos. Sup&#x00f3;n que <literal>Person</literal> tiene un "
 "identificador compuesto consistente en <literal>country</literal> y "
 "<literal>medicareNumber</literal>."
 
-#: index.docbook:471
+#. Tag: programlisting
+#: query_hql.xml:497
+#, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
 "where person.id.country = 'AU'\n"
@@ -871,7 +1082,9 @@
 "where person.id.country = 'AU' \n"
 "    and person.id.medicareNumber = 123456]]>"
 
-#: index.docbook:473
+#. Tag: programlisting
+#: query_hql.xml:499
+#, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
 "where account.owner.id.country = 'AU'\n"
@@ -881,51 +1094,71 @@
 "where account.owner.id.country = 'AU' \n"
 "    and account.owner.id.medicareNumber = 123456]]>"
 
-#: index.docbook:475
-msgid "Once again, the second query requires no table join."
+#. Tag: para
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr ""
 "Una vez m&#x00e1;s, la segunda consulta no requiere ninguna uni&#x00f3;n de "
 "tablas."
 
-#: index.docbook:479
+#. Tag: para
+#: query_hql.xml:505
+#, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "Asimismo, la propiedad especial <literal>class</literal> acccede al valor "
 "discriminador de una instancia en el caso de persistencia polim&#x00f3;"
 "rfica. Un nombre de clase Java embebido en la cl&#x00e1;usula where "
 "ser&#x00e1; traducido a su valor discriminador."
 
-#: index.docbook:485
+#. Tag: programlisting
+#: query_hql.xml:516
+#, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 
-#: index.docbook:487
+#. Tag: para
+#: query_hql.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "You may also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
 "details."
 
-#: index.docbook:492
+#. Tag: para
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "Un tipo \"any\" tiene las propiedades especiales <literal>id</literal> y "
 "<literal>class</literal>, permit&#x00e9;ndonos expresar un join en la "
 "siguiente forma (donde <literal>AuditLog.item</literal> es una propiedad "
 "mapeada con <literal>&lt;any&gt;</literal>)."
 
-#: index.docbook:498
+#. Tag: programlisting
+#: query_hql.xml:529
+#, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
 "where log.item.class = 'Payment' and log.item.id = payment.id]]>"
@@ -933,50 +1166,66 @@
 "<![CDATA[from AuditLog log, Payment payment \n"
 "where log.item.class = 'Payment' and log.item.id = payment.id]]>"
 
-#: index.docbook:500
+#. Tag: para
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "Nota que <literal>log.item.class</literal> y <literal>payment.class</"
 "literal> har&#x00ed;an referencia a los valores de columnas de base de datos "
 "completamente diferentes en la consulta anterior."
 
-#: index.docbook:508
+#. Tag: title
+#: query_hql.xml:539
+#, no-c-format
 msgid "Expressions"
 msgstr "Expresiones"
 
-#: index.docbook:510
+#. Tag: para
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "Las expresiones permitidas en la cl&#x00e1;usula <literal>where</literal> "
 "incluyen la mayor&#x00ed;a del tipo de cosas que podr&#x00ed;as escribir en "
 "SQL:"
 
-#: index.docbook:517
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#. Tag: para
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "operadores matem&#x00e1;ticos <literal>+, -, *, /</literal>"
 
-#: index.docbook:522
+#. Tag: para
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr ""
 "operadores de comparaci&#x00f3;n binarios <literal>=, &gt;=, &lt;=, &lt;"
 "&gt;, !=, like</literal>"
 
-#: index.docbook:527
+#. Tag: para
+#: query_hql.xml:558
+#, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "operadores l&#x00f3;gicos <literal>and, or, not</literal>"
 
-#: index.docbook:532
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#. Tag: para
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "Par&#x00e9;ntesis <literal>( )</literal>, indicando agrupaci&#x00f3;n"
 
-#: index.docbook:537
+#. Tag: para
+#: query_hql.xml:568
+#, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
 "literal>, <literal>is null</literal>, <literal>is not null</literal>, "
@@ -988,7 +1237,9 @@
 "<literal>is empty</literal>, <literal>is not empty</literal>, "
 "<literal>member of</literal> y <literal>not member of</literal>"
 
-#: index.docbook:550
+#. Tag: para
+#: query_hql.xml:581
+#, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
 "and \"searched\" case, <literal>case when ... then ... else ... end</literal>"
@@ -996,7 +1247,9 @@
 "Caso \"simple\", <literal>case ... when ... then ... else ... end</literal>, "
 "y caso \"buscado\", <literal>case when ... then ... else ... end</literal>"
 
-#: index.docbook:556
+#. Tag: para
+#: query_hql.xml:587
+#, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
 "</literal>"
@@ -1004,25 +1257,31 @@
 "concatenaci&#x00f3;n de cadenas <literal>...||...</literal> o <literal>concat"
 "(...,...)</literal>"
 
-#: index.docbook:561
+#. Tag: para
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
-#: index.docbook:567
+#. Tag: para
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
-#: index.docbook:574
+#. Tag: para
+#: query_hql.xml:605
+#, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
 "(), lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(), mod()"
@@ -1032,11 +1291,15 @@
 "<literal>substring(), trim(), lower(), upper(), length(), locate(), abs(), "
 "sqrt(), bit_length(), mod()</literal>"
 
-#: index.docbook:580
+#. Tag: para
+#: query_hql.xml:611
+#, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> y <literal>nullif()</literal>"
 
-#: index.docbook:585
+#. Tag: para
+#: query_hql.xml:616
+#, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
 "readable string"
@@ -1044,7 +1307,9 @@
 "<literal>str()</literal> para convertir valores num&#x00e9;ricos o "
 "temporales a una cadena legible."
 
-#: index.docbook:591
+#. Tag: para
+#: query_hql.xml:622
+#, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
 "of a Hibernate type, and <literal>extract(... from ...)</literal> if ANSI "
@@ -1056,7 +1321,9 @@
 "<literal>cast()</literal> y <literal>extract()</literal> fuesen soportados "
 "por la base de datos subyacente."
 
-#: index.docbook:599
+#. Tag: para
+#: query_hql.xml:630
+#, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
 "joined indexed collection"
@@ -1064,12 +1331,14 @@
 "la funci&#x00f3;n <literal>index()</literal> de HQL, que se aplica a alias "
 "de una colecci&#x00f3;n indexada unida."
 
-#: index.docbook:605
+#. Tag: para
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "funciones de HQL que tomen expresiones de ruta valuadas en colecciones: "
@@ -1078,29 +1347,37 @@
 "<literal>indices</literal> que pueden ser cuantificadas usando "
 "<literal>some, all, exists, any, in</literal>."
 
-#: index.docbook:613
+#. Tag: para
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "Cualquier funci&#x00f3;n escalar SQL soportada por la base de datos como "
 "<literal>sign()</literal>, <literal>trunc()</literal>, <literal>rtrim()</"
 "literal>, <literal>sin()</literal>"
 
-#: index.docbook:619
+#. Tag: para
+#: query_hql.xml:650
+#, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "par&#x00e1;metros posicionales JDBC <literal>?</literal>"
 
-#: index.docbook:624
+#. Tag: para
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "par&#x00e1;metros con nombre <literal>:name</literal>, <literal>:start_date</"
 "literal>, <literal>:x1</literal>"
 
-#: index.docbook:629
+#. Tag: para
+#: query_hql.xml:660
+#, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
@@ -1108,7 +1385,9 @@
 "literales SQL <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
-#: index.docbook:635
+#. Tag: para
+#: query_hql.xml:666
+#, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
 "TABBY</literal>"
@@ -1116,32 +1395,44 @@
 "constantes Java <literal>public static final</literal> <literal>eg.Color."
 "TABBY</literal>"
 
-#: index.docbook:641
+#. Tag: para
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "<literal>in</literal> y <literal>between</literal> pueden usarse como sigue:"
 
-#: index.docbook:645
+#. Tag: programlisting
+#: query_hql.xml:676
+#, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 
-#: index.docbook:647
+#. Tag: programlisting
+#: query_hql.xml:678
+#, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 
-#: index.docbook:649
-msgid "and the negated forms may be written"
+#. Tag: para
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "y pueden escribirse las formas negadas"
 
-#: index.docbook:653
+#. Tag: programlisting
+#: query_hql.xml:684
+#, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 
-#: index.docbook:655
+#. Tag: programlisting
+#: query_hql.xml:686
+#, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
 ">"
@@ -1149,23 +1440,29 @@
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
 ">"
 
-#: index.docbook:657
+#. Tag: para
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "Asimismo, <literal>is null</literal> y <literal>is not null</literal> pueden "
 "ser usadas para comprobar valores nulos."
 
-#: index.docbook:662
+#. Tag: para
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "Los booleanos pueden ser f&#x00e1;cilmente usados en expresiones declarando "
 "substituciones de consulta HQL en la configuraci&#x00f3;n de Hibernate:"
 
-#: index.docbook:667
+#. Tag: programlisting
+#: query_hql.xml:698
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
 "property>]]>"
@@ -1173,7 +1470,9 @@
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
 "property>]]>"
 
-#: index.docbook:669
+#. Tag: para
+#: query_hql.xml:700
+#, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
 "literal> with the literals <literal>1</literal> and <literal>0</literal> in "
@@ -1183,34 +1482,44 @@
 "<literal>false</literal> con los literales <literal>1</literal> y "
 "<literal>0</literal> en el SQL traducido de este HQL:"
 
-#: index.docbook:674
+#. Tag: programlisting
+#: query_hql.xml:705
+#, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr "<![CDATA[from Cat cat where cat.alive = true]]>"
 
-#: index.docbook:676
+#. Tag: para
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "Puedes comprobar el tama&#x00f1;o de una colecci&#x00f3;n con la propiedad "
 "especial <literal>size</literal>, o la funci&#x00f3;n especial <literal>size"
 "()</literal>."
 
-#: index.docbook:681
+#. Tag: programlisting
+#: query_hql.xml:712
+#, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 
-#: index.docbook:683
+#. Tag: programlisting
+#: query_hql.xml:714
+#, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 
-#: index.docbook:685
+#. Tag: para
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "Para colecciones indexadas, puedes referirte a los &#x00ed;ndices m&#x00e1;"
 "ximo y m&#x00ed;nimo usando las funciones <literal>minindex</literal> y "
@@ -1219,33 +1528,43 @@
 "usando las funciones <literal>minelement</literal> y <literal>maxelement</"
 "literal>."
 
-#: index.docbook:693
+#. Tag: programlisting
+#: query_hql.xml:724
+#, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 
-#: index.docbook:695
+#. Tag: programlisting
+#: query_hql.xml:726
+#, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 
-#: index.docbook:697
+#. Tag: programlisting
+#: query_hql.xml:728
+#, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 
-#: index.docbook:699
+#. Tag: para
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "Las funciones SQL <literal>any, some, all, exists, in</literal> est&#x00e1;n "
 "soportadas cuando se les pasa el conjunto de elementos o &#x00ed;ndices de "
 "una colecci&#x00f3;n (funciones <literal>elements</literal> y "
 "<literal>indices</literal>) o el resultado de una subconsulta (ver debajo)."
 
-#: index.docbook:705
+#. Tag: programlisting
+#: query_hql.xml:736
+#, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
 "where kit in elements(foo.kittens)]]>"
@@ -1253,7 +1572,9 @@
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
 "where kit in elements(foo.kittens)]]>"
 
-#: index.docbook:707
+#. Tag: programlisting
+#: query_hql.xml:738
+#, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
 "where p.name = some elements(list.names)]]>"
@@ -1261,24 +1582,32 @@
 "<![CDATA[select p from NameList list, Person p\n"
 "where p.name = some elements(list.names)]]>"
 
-#: index.docbook:709
+#. Tag: programlisting
+#: query_hql.xml:740
+#, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 
-#: index.docbook:711
+#. Tag: programlisting
+#: query_hql.xml:742
+#, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 
-#: index.docbook:713
+#. Tag: programlisting
+#: query_hql.xml:744
+#, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 
-#: index.docbook:715
+#. Tag: para
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "Nota que estas construcciones - <literal>size</literal>, <literal>elements</"
@@ -1287,19 +1616,25 @@
 "<literal>maxelement</literal> - pueden ser usadas solamente en la cl&#x00e1;"
 "usula where en Hibernate3."
 
-#: index.docbook:722
+#. Tag: para
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "Los elementos de colecciones indexadas (arrays, listas, mapas) pueden ser "
 "referidos por &#x00ed;ndice (en una cl&#x00e1;usula where solamente):"
 
-#: index.docbook:727
+#. Tag: programlisting
+#: query_hql.xml:758
+#, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 
-#: index.docbook:729
+#. Tag: programlisting
+#: query_hql.xml:760
+#, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
 "where calendar.holidays['national day'] = person.birthDay\n"
@@ -1309,7 +1644,9 @@
 "where calendar.holidays['national day'] = person.birthDay\n"
 "    and person.nationality.calendar = calendar]]>"
 
-#: index.docbook:731
+#. Tag: programlisting
+#: query_hql.xml:762
+#, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
 "where order.items[ order.deliveredItemIndices[0] ] = item and order.id = 11]]"
@@ -1319,7 +1656,9 @@
 "where order.items[ order.deliveredItemIndices[0] ] = item and order.id = 11]]"
 ">"
 
-#: index.docbook:733
+#. Tag: programlisting
+#: query_hql.xml:764
+#, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
 "where order.items[ maxindex(order.items) ] = item and order.id = 11]]>"
@@ -1327,15 +1666,19 @@
 "<![CDATA[select item from Item item, Order order\n"
 "where order.items[ maxindex(order.items) ] = item and order.id = 11]]>"
 
-#: index.docbook:735
+#. Tag: para
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr ""
 "La expresi&#x00f3;n dentro de <literal>[]</literal> puede incluso ser una "
 "expresi&#x00f3;n aritm&#x00e9;tica."
 
-#: index.docbook:739
+#. Tag: programlisting
+#: query_hql.xml:770
+#, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
 "where order.items[ size(order.items) - 1 ] = item]]>"
@@ -1343,16 +1686,20 @@
 "<![CDATA[select item from Item item, Order order\n"
 "where order.items[ size(order.items) - 1 ] = item]]>"
 
-#: index.docbook:741
+#. Tag: para
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "HQL provee adem&#x00e1;s el funci&#x00f3;n prefabricada <literal>index()</"
 "literal>, para elementos de una asociaci&#x00f3;n uno-a-muchos o "
 "colecci&#x00f3;n de valores."
 
-#: index.docbook:746
+#. Tag: programlisting
+#: query_hql.xml:777
+#, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
 "    join order.items item\n"
@@ -1362,26 +1709,34 @@
 "    join order.items item\n"
 "where index(item) < 5]]>"
 
-#: index.docbook:748
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#. Tag: para
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr ""
 "Pueden usarse las funciones SQL escalares soportadas por la base de datos "
 "subyacente"
 
-#: index.docbook:752
+#. Tag: programlisting
+#: query_hql.xml:783
+#, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 
-#: index.docbook:754
+#. Tag: para
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "Si a&#x00fa;n no est&#x00e1;s convencido de todo esto, piensa cu&#x00e1;nto "
 "m&#x00e1;s largo y menos le&#x00ed;ble ser&#x00ed;a la siguiente consulta en "
 "SQL:"
 
-#: index.docbook:759
+#. Tag: programlisting
+#: query_hql.xml:790
+#, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
 "from Product prod,\n"
@@ -1399,11 +1754,15 @@
 "    and store.location.name in ( 'Melbourne', 'Sydney' )\n"
 "    and prod = all elements(cust.currentOrder.lineItems)]]>"
 
-#: index.docbook:761
+#. Tag: para
+#: query_hql.xml:792
+#, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>Ayuda:</emphasis> algo como"
 
-#: index.docbook:765
+#. Tag: programlisting
+#: query_hql.xml:796
+#, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
 "current_order\n"
@@ -1443,19 +1802,25 @@
 "            AND cust.current_order = o.id\n"
 "    )]]>"
 
-#: index.docbook:770
+#. Tag: title
+#: query_hql.xml:801
+#, no-c-format
 msgid "The order by clause"
 msgstr "La cl&#x00e1;usula order by"
 
-#: index.docbook:772
+#. Tag: para
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "La lista devuelta por una consulta puede ser ordenada por cualquier "
 "propiedad de una clase devuelta o componentes:"
 
-#: index.docbook:776
+#. Tag: programlisting
+#: query_hql.xml:807
+#, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
 "order by cat.name asc, cat.weight desc, cat.birthdate]]>"
@@ -1463,7 +1828,9 @@
 "<![CDATA[from DomesticCat cat\n"
 "order by cat.name asc, cat.weight desc, cat.birthdate]]>"
 
-#: index.docbook:778
+#. Tag: para
+#: query_hql.xml:809
+#, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
 "ascending or descending order respectively."
@@ -1471,19 +1838,25 @@
 "Los <literal>asc</literal> o <literal>desc</literal> opcionales indican "
 "ordenamiento ascendente o descendente respectivamente."
 
-#: index.docbook:785
+#. Tag: title
+#: query_hql.xml:816
+#, no-c-format
 msgid "The group by clause"
 msgstr "La cl&#x00e1;usula group by"
 
-#: index.docbook:787
+#. Tag: para
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "Una consulta que devuelve valores agregados puede ser agrupada por cualquier "
 "propiedad de una clase devuelta o componentes:"
 
-#: index.docbook:791
+#. Tag: programlisting
+#: query_hql.xml:822
+#, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
 "from Cat cat\n"
@@ -1493,7 +1866,9 @@
 "from Cat cat\n"
 "group by cat.color]]>"
 
-#: index.docbook:793
+#. Tag: programlisting
+#: query_hql.xml:824
+#, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
 "from Foo foo join foo.names name\n"
@@ -1503,12 +1878,16 @@
 "from Foo foo join foo.names name\n"
 "group by foo.id]]>"
 
-#: index.docbook:795
+#. Tag: para
+#: query_hql.xml:826
+#, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr ""
 "Se permite tambi&#x00e9;n una cl&#x00e1;usula <literal>having</literal>."
 
-#: index.docbook:799
+#. Tag: programlisting
+#: query_hql.xml:830
+#, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
 "from Cat cat\n"
@@ -1520,18 +1899,22 @@
 "group by cat.color \n"
 "having cat.color in (eg.Color.TABBY, eg.Color.BLACK)]]>"
 
-#: index.docbook:801
+#. Tag: para
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "Las funciones y funciones de agregaci&#x00f3;n SQL est&#x00e1;n permitidas "
 "en las cl&#x00e1;usulas <literal>having</literal> y <literal>order by</"
 "literal>, si est&#x00e1;n soportadas por la base de datos subyacente (por "
 "ejemplo, no en MySQL)."
 
-#: index.docbook:807
+#. Tag: programlisting
+#: query_hql.xml:838
+#, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
 "from Cat cat\n"
@@ -1547,24 +1930,29 @@
 "having avg(kitten.weight) > 100\n"
 "order by count(kitten) asc, sum(kitten.weight) desc]]>"
 
-#: index.docbook:809
+#. Tag: para
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "Nota que ni la cl&#x00e1;usula <literal>group by</literal> ni la cl&#x00e1;"
 "usula <literal>order by</literal> pueden contener expresiones aritm&#x00e9;"
 "ticas."
 
-#: index.docbook:821
+#. Tag: title
+#: query_hql.xml:852
+#, no-c-format
 msgid "Subqueries"
 msgstr "Subconsultas"
 
-#: index.docbook:823
+#. Tag: para
+#: query_hql.xml:854
+#, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
 "queries. A subquery must be surrounded by parentheses (often by an SQL "
@@ -1577,7 +1965,9 @@
 "agregaci&#x00f3;n SQL). Incluso se permiten subconsultas correlacionadas "
 "(subconsultas que hacen referencia a un alias en la consulta exterior)."
 
-#: index.docbook:829
+#. Tag: programlisting
+#: query_hql.xml:860
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
 "where fatcat.weight > (\n"
@@ -1589,7 +1979,9 @@
 "                select avg(cat.weight) from DomesticCat cat\n"
 "                )]]>"
 
-#: index.docbook:831
+#. Tag: programlisting
+#: query_hql.xml:862
+#, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
 "where cat.name = some (\n"
@@ -1602,7 +1994,9 @@
 "name\n"
 "                                      )]]>"
 
-#: index.docbook:833
+#. Tag: programlisting
+#: query_hql.xml:864
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "where not exists (\n"
@@ -1615,7 +2009,9 @@
 "cat\n"
 "                                      )]]>"
 
-#: index.docbook:835
+#. Tag: programlisting
+#: query_hql.xml:866
+#, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
 "where cat.name not in (\n"
@@ -1628,7 +2024,9 @@
 "name\n"
 "                                      )]]>"
 
-#: index.docbook:837
+#. Tag: programlisting
+#: query_hql.xml:868
+#, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
 "from Cat as cat]]>"
@@ -1636,29 +2034,38 @@
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
 "                                        from Cat as cat]]>"
 
-#: index.docbook:839
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#. Tag: para
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 "Note that HQL subqueries may occur only in the select or where clauses."
 
-#: index.docbook:843
+#. Tag: para
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "Note that subqueries can also utilize <literal>row value constructor</"
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
-#: index.docbook:851
+#. Tag: title
+#: query_hql.xml:882
+#, no-c-format
 msgid "HQL examples"
 msgstr "Ejemplos de HQL"
 
-#: index.docbook:853
+#. Tag: para
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "Las consultas de Hibernate pueden ser abolutamente potentes y complejas, De "
 "hecho, el poder del lenguaje de consulta es uno de los puntos principales de "
@@ -1667,15 +2074,17 @@
 "la mayor&#x00ed;a de las consultas que escribir&#x00e1;s som mucho m&#x00e1;"
 "s simples que estas!"
 
-#: index.docbook:859
+#. Tag: para
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "La siguiente consulta devuelve el order id, n&#x00fa;mero de items y valor "
 "total de la orden para todas las ordenes inpagas de un cliente en particular "
@@ -1686,7 +2095,9 @@
 "<literal>PRICE</literal> tiene cuatro joins interiores y una subselect (no "
 "correlacionada)."
 
-#: index.docbook:868
+#. Tag: programlisting
+#: query_hql.xml:899
+#, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
 "from Order as order\n"
@@ -1726,7 +2137,9 @@
 "having sum(price.amount) > :minAmount\n"
 "order by sum(price.amount) desc]]>"
 
-#: index.docbook:870
+#. Tag: para
+#: query_hql.xml:901
+#, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
 "my query was really more like this:"
@@ -1735,7 +2148,9 @@
 "afilado en subconsultas, de modo que mi consulta fue realmente algo como "
 "esto:"
 
-#: index.docbook:875
+#. Tag: programlisting
+#: query_hql.xml:906
+#, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
 "from Order as order\n"
@@ -1765,7 +2180,9 @@
 "having sum(price.amount) > :minAmount\n"
 "order by sum(price.amount) desc]]>"
 
-#: index.docbook:877
+#. Tag: para
+#: query_hql.xml:908
+#, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
 "payments in the <literal>AWAITING_APPROVAL</literal> status where the most "
@@ -1781,7 +2198,9 @@
 "correlacionada contra las tablas <literal>PAYMENT</literal>, "
 "<literal>PAYMENT_STATUS</literal> y <literal>PAYMENT_STATUS_CHANGE</literal>."
 
-#: index.docbook:885
+#. Tag: programlisting
+#: query_hql.xml:916
+#, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
 "from Payment as payment\n"
@@ -1815,16 +2234,20 @@
 "group by status.name, status.sortOrder\n"
 "order by status.sortOrder]]>"
 
-#: index.docbook:887
+#. Tag: para
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "Si hubiese mapeado la colecci&#x00f3;n <literal>statusChanges</literal> como "
 "una lista, en vez de un conjunto, la consulta habr&#x00ed;a sido mucho "
 "m&#x00e1;s simple de escribir."
 
-#: index.docbook:892
+#. Tag: programlisting
+#: query_hql.xml:923
+#, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
 "from Payment as payment\n"
@@ -1844,7 +2267,9 @@
 "group by status.name, status.sortOrder\n"
 "order by status.sortOrder]]>"
 
-#: index.docbook:894
+#. Tag: para
+#: query_hql.xml:925
+#, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
 "to return all the accounts and unpaid payments for the organization to which "
@@ -1862,7 +2287,9 @@
 "<literal>PAYMENT_STATUS</literal>, <literal>ACCOUNT_TYPE</literal>, "
 "<literal>ORGANIZATION</literal> y <literal>ORG_USER</literal>."
 
-#: index.docbook:903
+#. Tag: programlisting
+#: query_hql.xml:934
+#, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
 "from Account as account\n"
@@ -1880,14 +2307,18 @@
 "PaymentStatus.UNPAID)\n"
 "order by account.type.sortOrder, account.accountNumber, payment.dueDate]]>"
 
-#: index.docbook:905
+#. Tag: para
+#: query_hql.xml:936
+#, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
 msgstr ""
 "Para algunas bases de datos, necesitar&#x00ed;amos eliminar la subselect "
 "(correlacionada)."
 
-#: index.docbook:909
+#. Tag: programlisting
+#: query_hql.xml:940
+#, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
 "from Account as account\n"
@@ -1907,31 +2338,40 @@
 "PaymentStatus.UNPAID)\n"
 "order by account.type.sortOrder, account.accountNumber, payment.dueDate]]>"
 
-#: index.docbook:914
+#. Tag: title
+#: query_hql.xml:945
+#, no-c-format
 msgid "Bulk update and delete"
 msgstr "Sentencias UPDATE y DELETE masivas"
 
-#: index.docbook:916
+#. Tag: para
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "HQL soporta ahora sentencias UPDATE y DELETE en HQL. Ver <xref linkend="
 "\"batch-direct\"/> para detalles."
 
-#: index.docbook:924
+#. Tag: title
+#: query_hql.xml:955
+#, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "Consejos y Trucos"
 
-#: index.docbook:926
-msgid ""
-"You can count the number of query results without actually returning them:"
+#. Tag: para
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr ""
 "Puedes contar el n&#x00fa;mero de resultados de una consulta sin devolverlos "
 "realmente:"
 
-#: index.docbook:930
+#. Tag: programlisting
+#: query_hql.xml:961
+#, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
 "iterate().next() ).intValue()]]>"
@@ -1939,13 +2379,17 @@
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
 "iterate().next() ).intValue()]]>"
 
-#: index.docbook:932
+#. Tag: para
+#: query_hql.xml:963
+#, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
 "Para ordenar un resultado por el tama&#x00f1;o de una colecci&#x00f3;n, usa "
 "la siguiente consulta:"
 
-#: index.docbook:936
+#. Tag: programlisting
+#: query_hql.xml:967
+#, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
 "from User as usr\n"
@@ -1959,7 +2403,9 @@
 "group by usr.id, usr.name\n"
 "order by count(msg)]]>"
 
-#: index.docbook:938
+#. Tag: para
+#: query_hql.xml:969
+#, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
 "selection size in the where clause of your query:"
@@ -1968,15 +2414,21 @@
 "sobre el tama&#x00f1;o de selecci&#x00f3;n en la cl&#x00e1;usula where de tu "
 "consulta:"
 
-#: index.docbook:943
+#. Tag: programlisting
+#: query_hql.xml:974
+#, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 
-#: index.docbook:945
-msgid "If your database doesn't support subselects, use the following query:"
+#. Tag: para
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr "Si tu base de datos no soporta subselects, usa la siguiente consulta:"
 
-#: index.docbook:949
+#. Tag: programlisting
+#: query_hql.xml:980
+#, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
 "from User usr.name\n"
@@ -1990,16 +2442,20 @@
 "group by usr.id, usr.name\n"
 "having count(msg) >= 1]]>"
 
-#: index.docbook:951
+#. Tag: para
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "Como esta soluci&#x00f3;n no puede devolver un <literal>User</literal> con "
 "cero mensajes debido a la uni&#x00f3;n interior, la siguiente forma es "
 "tambi&#x00e9;n &#x00fa;til:"
 
-#: index.docbook:956
+#. Tag: programlisting
+#: query_hql.xml:988
+#, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
 "from User as usr\n"
@@ -2013,13 +2469,17 @@
 "group by usr.id, usr.name\n"
 "having count(msg) = 0]]>"
 
-#: index.docbook:958
+#. Tag: para
+#: query_hql.xml:990
+#, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
 "Las propiedades de un JavaBean pueden ser ligadas al par&#x00e1;metros de "
 "consulta con nombre:"
 
-#: index.docbook:962
+#. Tag: programlisting
+#: query_hql.xml:994
+#, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
 "and foo.size=:size\");\n"
@@ -2031,7 +2491,9 @@
 "q.setProperties(fooBean); // fooBean has getName() and getSize()\n"
 "List foos = q.list();]]>"
 
-#: index.docbook:964
+#. Tag: para
+#: query_hql.xml:996
+#, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
 "with a filter:"
@@ -2039,7 +2501,9 @@
 "Las colecciones son paginables usando la interface <literal>Query</literal> "
 "con un filtro:"
 
-#: index.docbook:968
+#. Tag: programlisting
+#: query_hql.xml:1000
+#, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
 "filter\n"
@@ -2053,13 +2517,17 @@
 "q.setFirstResult(PAGE_SIZE * pageNumber);\n"
 "List page = q.list();]]>"
 
-#: index.docbook:970
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#. Tag: para
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "Los elementos de colecci&#x00f3;n pueden ser ordenados o agrupados usando un "
 "filtro de consulta:"
 
-#: index.docbook:974
+#. Tag: programlisting
+#: query_hql.xml:1006
+#, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
 "this.amount\" );\n"
@@ -2071,12 +2539,16 @@
 "Collection counts = s.filter( collection, \"select this.type, count(this) "
 "group by this.type\" );]]>"
 
-#: index.docbook:976
+#. Tag: para
+#: query_hql.xml:1008
+#, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr ""
 "Puedes hallar el tama&#x00f1;o de una colecci&#x00f3;n sin inicializarla:"
 
-#: index.docbook:980
+#. Tag: programlisting
+#: query_hql.xml:1012
+#, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
 "iterate().next() ).intValue();]]>"
@@ -2084,29 +2556,39 @@
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
 "iterate().next() ).intValue();]]>"
 
-#: index.docbook:985
+#. Tag: title
+#: query_hql.xml:1017
+#, no-c-format
 msgid "Components"
 msgstr "UNTRANSLATED! Components"
 
-#: index.docbook:987
+#. Tag: para
+#: query_hql.xml:1019
+#, fuzzy, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 "Components might be used in just about every way that simple value types can "
 "be used in HQL queries. They can appear in the <literal>select</literal> "
 "clause:"
 
-#: index.docbook:992, index.docbook:1038
+#. Tag: programlisting
+#: query_hql.xml:1024 query_hql.xml:1070
+#, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr "<![CDATA[select p.name from Person p]]>"
 
-#: index.docbook:993
+#. Tag: programlisting
+#: query_hql.xml:1025
+#, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr "<![CDATA[select p.name.first from Person p]]>"
 
-#: index.docbook:995
+#. Tag: para
+#: query_hql.xml:1027
+#, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
 "in the <literal>where</literal> clause:"
@@ -2114,27 +2596,39 @@
 "where the Person's name property is a component. Components can also be used "
 "in the <literal>where</literal> clause:"
 
-#: index.docbook:1000
+#. Tag: programlisting
+#: query_hql.xml:1032
+#, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr "<![CDATA[from Person p where p.name = :name]]>"
 
-#: index.docbook:1001
+#. Tag: programlisting
+#: query_hql.xml:1033
+#, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr "<![CDATA[from Person p where p.name.first = :firstName]]>"
 
-#: index.docbook:1003
+#. Tag: para
+#: query_hql.xml:1035
+#, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr "Components can also be used in the <literal>order by</literal> clause:"
 
-#: index.docbook:1007
+#. Tag: programlisting
+#: query_hql.xml:1039
+#, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr "<![CDATA[from Person p order by p.name]]>"
 
-#: index.docbook:1008
+#. Tag: programlisting
+#: query_hql.xml:1040
+#, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr "<![CDATA[from Person p order by p.name.first]]>"
 
-#: index.docbook:1010
+#. Tag: para
+#: query_hql.xml:1042
+#, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
 "value constructors</link>."
@@ -2142,17 +2636,21 @@
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
 "value constructors</link>."
 
-#: index.docbook:1016
+#. Tag: title
+#: query_hql.xml:1048
+#, no-c-format
 msgid "Row value constructor syntax"
 msgstr "Row value constructor syntax"
 
-#: index.docbook:1018
+#. Tag: para
+#: query_hql.xml:1050
+#, fuzzy, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
 "syntax (sometimes called <literal>tuple</literal> syntax), even though the "
@@ -2160,7 +2658,9 @@
 "referring to multi-valued comparisons, typically associated with components. "
 "Consider an entity Person which defines a name component:"
 
-#: index.docbook:1025
+#. Tag: programlisting
+#: query_hql.xml:1057
+#, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
 "last='Jingleheimer-Schmidt']]>"
@@ -2168,20 +2668,26 @@
 "<![CDATA[from Person p where p.name.first='John' and p.name."
 "last='Jingleheimer-Schmidt']]>"
 
-#: index.docbook:1027
+#. Tag: para
+#: query_hql.xml:1059
+#, fuzzy, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 "That's valid syntax, although a little verbose. It be nice to make this a "
 "bit more concise and use <literal>row value constructor</literal> syntax:"
 
-#: index.docbook:1032
+#. Tag: programlisting
+#: query_hql.xml:1064
+#, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 
-#: index.docbook:1034
+#. Tag: para
+#: query_hql.xml:1066
+#, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
 "clause:"
@@ -2189,17 +2695,20 @@
 "It can also be useful to specify this in the <literal>select</literal> "
 "clause:"
 
-#: index.docbook:1040
+#. Tag: para
+#: query_hql.xml:1072
+#, fuzzy, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 "Another time using <literal>row value constructor</literal> syntax can be "
 "beneficial is when using subqueries needing to compare against multiple "
 "values:"
 
-#: index.docbook:1045
+#. Tag: programlisting
+#: query_hql.xml:1077
+#, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
 "where not ( cat.name, cat.color ) in (\n"
@@ -2213,9 +2722,11 @@
 "DomesticCat cat\n"
 "                                          )]]>"
 
-#: index.docbook:1047
+#. Tag: para
+#: query_hql.xml:1079
+#, fuzzy, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
@@ -2223,8 +2734,20 @@
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "La mayor&#x00ed;a del tiempo, necesitar&#x00e1;s asignar un "
+#~ "<emphasis>alias</emphasis>, ya que querr&#x00e1;s referirte al "
+#~ "<literal>Cat</literal> en otras partes de la consulta."
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "o como un objeto real Java de tipo seguro,"
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,18 +1,24 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: query_sql.xml:29
+#, no-c-format
 msgid "Native SQL"
 msgstr "SQL Nativo"
 
-#: index.docbook:7
+#. Tag: para
+#: query_sql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -24,40 +30,52 @@
 "ruta de migraci&#x00f3;n desde una aplicaci&#x00f3;n basada en SQL/JDBC "
 "directo a Hibernate."
 
-#: index.docbook:13
+#. Tag: para
+#: query_sql.xml:37
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3 te permite especificar SQL escrito a mano (incluyendo "
 "procedimientos almacenados) para todas las operaciones de creaci&#x00f3;n, "
 "actualizaci&#x00f3;n, borrado y carga."
 
-#: index.docbook:17
+#. Tag: title
+#: query_sql.xml:41
+#, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "Using a <literal>SQLQuery</literal>"
 
-#: index.docbook:19
+#. Tag: para
+#: query_sql.xml:43
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
 "createSQLQuery()</literal>. The following describes how to use this API for "
 "querying."
 
-#: index.docbook:25
+#. Tag: title
+#: query_sql.xml:49
+#, no-c-format
 msgid "Scalar queries"
 msgstr "Scalar queries"
 
-#: index.docbook:27
+#. Tag: para
+#: query_sql.xml:51
+#, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr "The most basic SQL query is to get a list of scalars (values)."
 
-#: index.docbook:30
+#. Tag: programlisting
+#: query_sql.xml:54
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
 "sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE FROM CATS\").list();\n"
@@ -68,27 +86,33 @@
 "createSQLQuery(\"SELECT ID, NAME, BIRTHDATE FROM CATS\").list();\n"
 "                                                                         ]]>"
 
-#: index.docbook:32
+#. Tag: para
+#: query_sql.xml:56
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "These will both return a List of Object arrays (Object[]) with scalar values "
 "for each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 
-#: index.docbook:37
+#. Tag: para
+#: query_sql.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
 "simply to be more explicit in what is returned one can use <literal>addScalar"
 "()</literal>."
 
-#: index.docbook:41
+#. Tag: programlisting
+#: query_sql.xml:65
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
 " .addScalar(\"ID\", Hibernate.LONG)\n"
@@ -105,22 +129,30 @@
 "addScalar(\"BIRTHDATE\", Hibernate.DATE)\n"
 "                                                                         ]]>"
 
-#: index.docbook:43, index.docbook:89, index.docbook:170, index.docbook:321
+#. Tag: para
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
+#, no-c-format
 msgid "This query specified:"
 msgstr "This query specified:"
 
-#: index.docbook:47, index.docbook:93, index.docbook:325
+#. Tag: para
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
+#, no-c-format
 msgid "the SQL query string"
 msgstr "the SQL query string"
 
-#: index.docbook:51
+#. Tag: para
+#: query_sql.xml:75
+#, no-c-format
 msgid "the columns and types to return"
 msgstr "the columns and types to return"
 
-#: index.docbook:55
+#. Tag: para
+#: query_sql.xml:79
+#, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
-"<literal>ResultSetMetdata</literal> but will instead explicitly get the ID, "
+"This will return Object arrays, but now it will not use "
+"<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
 "be returned, even though the query is using <literal>*</literal> and could "
@@ -133,7 +165,9 @@
 "be returned, even though the query is using <literal>*</literal> and could "
 "return more than the three listed columns."
 
-#: index.docbook:63
+#. Tag: para
+#: query_sql.xml:87
+#, no-c-format
 msgid ""
 "It is possible to leave out the type information for all or some of the "
 "scalars."
@@ -141,7 +175,9 @@
 "It is possible to leave out the type information for all or some of the "
 "scalars."
 
-#: index.docbook:66
+#. Tag: programlisting
+#: query_sql.xml:90
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
 " .addScalar(\"ID\", Hibernate.LONG)\n"
@@ -158,21 +194,25 @@
 "addScalar(\"BIRTHDATE\")\n"
 "                                                                         ]]>"
 
-#: index.docbook:68
+#. Tag: para
+#: query_sql.xml:92
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "This is essentially the same query as before, but now "
 "<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
 "BIRTHDATE where as the type of ID is explicitly specified."
 
-#: index.docbook:72
+#. Tag: para
+#: query_sql.xml:96
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
@@ -180,11 +220,15 @@
 "mapped or does not result in the expected type it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 
-#: index.docbook:80
+#. Tag: title
+#: query_sql.xml:104
+#, no-c-format
 msgid "Entity queries"
 msgstr "Entity queries"
 
-#: index.docbook:82
+#. Tag: para
+#: query_sql.xml:106
+#, no-c-format
 msgid ""
 "The above queries were all about returning scalar values, basically "
 "returning the \"raw\" values from the resultset. The following shows how to "
@@ -196,7 +240,9 @@
 "get entity objects from a native sql query via <literal>addEntity()</"
 "literal>."
 
-#: index.docbook:87
+#. Tag: programlisting
+#: query_sql.xml:111
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.class);\n"
 "sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE FROM CATS\").addEntity(Cat."
@@ -209,11 +255,15 @@
 "class);\n"
 "                                                                         ]]>"
 
-#: index.docbook:97
+#. Tag: para
+#: query_sql.xml:121
+#, no-c-format
 msgid "the entity returned by the query"
 msgstr "the entity returned by the query"
 
-#: index.docbook:101
+#. Tag: para
+#: query_sql.xml:125
+#, no-c-format
 msgid ""
 "Assuming that Cat is mapped as a class with the columns ID, NAME and "
 "BIRTHDATE the above queries will both return a List where each element is a "
@@ -223,7 +273,9 @@
 "BIRTHDATE the above queries will both return a List where each element is a "
 "Cat entity."
 
-#: index.docbook:105
+#. Tag: para
+#: query_sql.xml:129
+#, no-c-format
 msgid ""
 "If the entity is mapped with a <literal>many-to-one</literal> to another "
 "entity it is required to also return this when performing the native query, "
@@ -239,7 +291,9 @@
 "but we prefer to be explicit as in the following example for a <literal>many-"
 "to-one</literal> to a <literal>Dog</literal>:"
 
-#: index.docbook:113
+#. Tag: programlisting
+#: query_sql.xml:137
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID FROM CATS"
 "\").addEntity(Cat.class);\n"
@@ -249,15 +303,21 @@
 "\").addEntity(Cat.class);\n"
 "                                                                         ]]>"
 
-#: index.docbook:115
+#. Tag: para
+#: query_sql.xml:139
+#, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr "This will allow cat.getDog() to function properly."
 
-#: index.docbook:119
+#. Tag: title
+#: query_sql.xml:143
+#, no-c-format
 msgid "Handling associations and collections"
 msgstr "Handling associations and collections"
 
-#: index.docbook:121
+#. Tag: para
+#: query_sql.xml:145
+#, no-c-format
 msgid ""
 "It is possible to eagerly join in the <literal>Dog</literal> to avoid the "
 "possible extra roundtrip for initializing the proxy. This is done via the "
@@ -269,7 +329,9 @@
 "<literal>addJoin()</literal> method, which allows you to join in an "
 "association or collection."
 
-#: index.docbook:126
+#. Tag: programlisting
+#: query_sql.xml:150
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID, D_ID, "
 "D_NAME FROM CATS c, DOGS d WHERE c.DOG_ID = d.D_ID\")\n"
@@ -285,14 +347,16 @@
 "addJoin(\"cat.dog\");\n"
 "                                                                         ]]>"
 
-#: index.docbook:128
+#. Tag: para
+#: query_sql.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "In this example the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
@@ -301,7 +365,9 @@
 "the same eager joining for collections, e.g. if the <literal>Cat</literal> "
 "had a one-to-many to <literal>Dog</literal> instead."
 
-#: index.docbook:136
+#. Tag: programlisting
+#: query_sql.xml:160
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_NAME, "
 "CAT_ID FROM CATS c, DOGS d WHERE c.ID = d.CAT_ID\")\n"
@@ -317,27 +383,33 @@
 "addJoin(\"cat.dogs\");\n"
 "                                                                         ]]>"
 
-#: index.docbook:138
+#. Tag: para
+#: query_sql.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "At this stage we are reaching the limits of what is possible with native "
 "queries without starting to enhance the sql queries to make them usable in "
 "Hibernate; the problems starts to arise when returning multiple entities of "
 "the same type or when the default alias/column names are not enough."
 
-#: index.docbook:146
+#. Tag: title
+#: query_sql.xml:170
+#, no-c-format
 msgid "Returning multiple entities"
 msgstr "Returning multiple entities"
 
-#: index.docbook:148
+#. Tag: para
+#: query_sql.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "Until now the result set column names are assumed to be the same as the "
@@ -345,7 +417,9 @@
 "SQL queries which join multiple tables, since the same column names may "
 "appear in more than one table."
 
-#: index.docbook:153
+#. Tag: para
+#: query_sql.xml:177
+#, no-c-format
 msgid ""
 "Column alias injection is needed in the following query (which most likely "
 "will fail):"
@@ -353,7 +427,9 @@
 "Column alias injection is needed in the following query (which most likely "
 "will fail):"
 
-#: index.docbook:156
+#. Tag: programlisting
+#: query_sql.xml:180
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m WHERE c."
 "MOTHER_ID = c.ID\")\n"
@@ -369,14 +445,16 @@
 "addEntity(\"mother\", Cat.class)\n"
 "                                                                         ]]>"
 
-#: index.docbook:158
+#. Tag: para
+#: query_sql.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specificed in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "The intention for this query is to return two Cat instances per row, a cat "
 "and its mother. This will fail since there is a conflict of names since they "
@@ -385,11 +463,15 @@
 "which are not equal to the columns specificed in the mappings (\"ID\" and "
 "\"NAME\")."
 
-#: index.docbook:165
+#. Tag: para
+#: query_sql.xml:193
+#, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "The following form is not vulnerable to column name duplication:"
 
-#: index.docbook:168
+#. Tag: programlisting
+#: query_sql.xml:196
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
 "m WHERE c.MOTHER_ID = c.ID\")\n"
@@ -405,7 +487,9 @@
 "addEntity(\"mother\", Cat.class)\n"
 "                                                                         ]]>"
 
-#: index.docbook:174
+#. Tag: para
+#: query_sql.xml:202
+#, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
 "aliases"
@@ -413,20 +497,23 @@
 "the SQL query string, with placeholders for Hibernate to inject column "
 "aliases"
 
-#: index.docbook:179
+#. Tag: para
+#: query_sql.xml:207
+#, no-c-format
 msgid "the entities returned by the query"
 msgstr "the entities returned by the query"
 
-#: index.docbook:183
+#. Tag: para
+#: query_sql.xml:211
+#, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicity, but even in "
-"this case we let Hibernate inject the SQL column aliases for each property. "
-"The placeholder for a column alias is just the property name qualified by "
-"the table alias. In the following example, we retrieve Cats and their "
-"mothers from a different table (cat_log) to the one declared in the mapping "
-"metadata. Notice that we may even use the property aliases in the where "
-"clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
 "properties\". Alternatively, you may list the columns explicity, but even in "
@@ -437,7 +524,9 @@
 "metadata. Notice that we may even use the property aliases in the where "
 "clause if we like."
 
-#: index.docbook:192
+#. Tag: programlisting
+#: query_sql.xml:220
+#, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
 "         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
@@ -463,177 +552,256 @@
 "Cat.class).list()\n"
 "                                                    ]]>"
 
-#: index.docbook:195
+#. Tag: title
+#: query_sql.xml:223
+#, no-c-format
 msgid "Alias and property references"
 msgstr "Alias and property references"
 
-#: index.docbook:197
+#. Tag: para
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "For most cases the above alias injection is needed, but for queries relating "
 "to more complex mappings like composite properties, inheritance "
 "discriminators, collections etc. there are some specific aliases to use to "
 "allow Hibernate to inject the proper aliases."
 
-#: index.docbook:202
+#. Tag: para
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "The following table shows the different possibilities of using the alias "
 "injection. Note: the alias names in the result are examples, each alias will "
 "have a unique and probably different name when used."
 
-#: index.docbook:208
+#. Tag: title
+#: query_sql.xml:236
+#, no-c-format
 msgid "Alias injection names"
 msgstr "Alias injection names"
 
-#: index.docbook:219
+#. Tag: entry
+#: query_sql.xml:247
+#, no-c-format
 msgid "Description"
 msgstr "Description"
 
-#: index.docbook:221
+#. Tag: entry
+#: query_sql.xml:249
+#, no-c-format
 msgid "Syntax"
 msgstr "Syntax"
 
-#: index.docbook:223
+#. Tag: entry
+#: query_sql.xml:251
+#, no-c-format
 msgid "Example"
 msgstr "Example"
 
-#: index.docbook:229
+#. Tag: entry
+#: query_sql.xml:257
+#, no-c-format
 msgid "A simple property"
 msgstr "A simple property"
 
-#: index.docbook:231
+#. Tag: literal
+#: query_sql.xml:259
+#, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
-#: index.docbook:233
+#. Tag: literal
+#: query_sql.xml:261
+#, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
-#: index.docbook:237
+#. Tag: entry
+#: query_sql.xml:265
+#, no-c-format
 msgid "A composite property"
 msgstr "A composite property"
 
-#: index.docbook:239
+#. Tag: literal
+#: query_sql.xml:267
+#, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
-#: index.docbook:241
+#. Tag: literal
+#: query_sql.xml:269
+#, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
-#: index.docbook:246
+#. Tag: entry
+#: query_sql.xml:274
+#, no-c-format
 msgid "Discriminator of an entity"
 msgstr "Discriminator of an entity"
 
-#: index.docbook:248
+#. Tag: literal
+#: query_sql.xml:276
+#, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
-#: index.docbook:250
+#. Tag: literal
+#: query_sql.xml:278
+#, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
-#: index.docbook:254
+#. Tag: entry
+#: query_sql.xml:282
+#, no-c-format
 msgid "All properties of an entity"
 msgstr "All properties of an entity"
 
-#: index.docbook:256, index.docbook:304
+#. Tag: literal
+#: query_sql.xml:284 query_sql.xml:332
+#, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
-#: index.docbook:258
+#. Tag: literal
+#: query_sql.xml:286
+#, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
-#: index.docbook:262
+#. Tag: entry
+#: query_sql.xml:290
+#, no-c-format
 msgid "A collection key"
 msgstr "A collection key"
 
-#: index.docbook:264
+#. Tag: literal
+#: query_sql.xml:292
+#, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
-#: index.docbook:266
+#. Tag: literal
+#: query_sql.xml:294
+#, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
-#: index.docbook:270
+#. Tag: entry
+#: query_sql.xml:298
+#, no-c-format
 msgid "The id of an collection"
 msgstr "The id of an collection"
 
-#: index.docbook:272
+#. Tag: literal
+#: query_sql.xml:300
+#, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
-#: index.docbook:274
+#. Tag: literal
+#: query_sql.xml:302
+#, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
-#: index.docbook:278
+#. Tag: entry
+#: query_sql.xml:306
+#, no-c-format
 msgid "The element of an collection"
 msgstr "The element of an collection"
 
-#: index.docbook:280
+#. Tag: literal
+#: query_sql.xml:308
+#, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
-#: index.docbook:282
+#. Tag: literal
+#: query_sql.xml:310
+#, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
-#: index.docbook:286
-msgid "roperty of the element in the collection"
+#. Tag: entry
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "roperty of the element in the collection"
 
-#: index.docbook:288
+#. Tag: literal
+#: query_sql.xml:316
+#, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
-#: index.docbook:290
+#. Tag: literal
+#: query_sql.xml:318
+#, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
-#: index.docbook:294
+#. Tag: entry
+#: query_sql.xml:322
+#, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "All properties of the element in the collection"
 
-#: index.docbook:296
+#. Tag: literal
+#: query_sql.xml:324
+#, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
-#: index.docbook:298
+#. Tag: literal
+#: query_sql.xml:326
+#, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
-#: index.docbook:302
+#. Tag: entry
+#: query_sql.xml:330
+#, no-c-format
 msgid "All properties of the the collection"
 msgstr "All properties of the the collection"
 
-#: index.docbook:306
+#. Tag: literal
+#: query_sql.xml:334
+#, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
-#: index.docbook:315
+#. Tag: title
+#: query_sql.xml:343
+#, no-c-format
 msgid "Returning non-managed entities"
 msgstr "Returning non-managed entities"
 
-#: index.docbook:317
+#. Tag: para
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "It is possible to apply a ResultTransformer to native sql queries. Allowing "
 "it to e.g. return non-managed entities."
 
-#: index.docbook:319
+#. Tag: programlisting
+#: query_sql.xml:347
+#, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
 "        .setResultTransformer(Transformers.aliasToBean(CatDTO.class))]]>"
@@ -642,11 +810,15 @@
 "                                                                         ."
 "setResultTransformer(Transformers.aliasToBean(CatDTO.class))]]>"
 
-#: index.docbook:329
+#. Tag: para
+#: query_sql.xml:357
+#, no-c-format
 msgid "a result transformer"
 msgstr "a result transformer"
 
-#: index.docbook:333
+#. Tag: para
+#: query_sql.xml:361
+#, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
 "been instantiated and injected the values of NAME and BIRTHNAME into its "
@@ -656,29 +828,39 @@
 "been instantiated and injected the values of NAME and BIRTHNAME into its "
 "corresponding properties or fields."
 
-#: index.docbook:340
+#. Tag: title
+#: query_sql.xml:368
+#, no-c-format
 msgid "Handling inheritance"
 msgstr "Handling inheritance"
 
-#: index.docbook:342
+#. Tag: para
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "Native sql queries which query for entities that is mapped as part of an "
 "inheritance must include all properties for the baseclass and all it "
 "subclasses."
 
-#: index.docbook:348
+#. Tag: title
+#: query_sql.xml:376
+#, no-c-format
 msgid "Parameters"
 msgstr "Parameters"
 
-#: index.docbook:350
-msgid "Native sql queries support positional as well as named parameters:"
+#. Tag: para
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr "Native sql queries support positional as well as named parameters:"
 
-#: index.docbook:353
+#. Tag: programlisting
+#: query_sql.xml:381
+#, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
 "like ?\").addEntity(Cat.class);\n"
@@ -699,14 +881,18 @@
 "                                                   List pusList = query."
 "setString(\"name\", \"Pus%\").list();          ]]>"
 
-#: index.docbook:361
+#. Tag: title
+#: query_sql.xml:389
+#, no-c-format
 msgid "Named SQL queries"
 msgstr "Consultas SQL con nombre"
 
-#: index.docbook:363
+#. Tag: para
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "Las consultas SQL con nombre pueden definirse en el documento de mapeo y "
@@ -714,7 +900,9 @@
 "En este caso, <emphasis>no</emphasis> necesitamos llamar a <literal>addEntity"
 "()</literal>."
 
-#: index.docbook:368
+#. Tag: programlisting
+#: query_sql.xml:396
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
 "    <return alias=\"person\" class=\"eg.Person\"/>\n"
@@ -734,7 +922,9 @@
 "    WHERE person.NAME LIKE :namePattern\n"
 "</sql-query>]]>"
 
-#: index.docbook:370
+#. Tag: programlisting
+#: query_sql.xml:398
+#, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
 "    .setString(\"namePattern\", namePattern)\n"
@@ -746,17 +936,21 @@
 "    .setMaxResults(50)\n"
 "    .list();]]>"
 
-#: index.docbook:372
+#. Tag: para
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "Los elementos <literal>&lt;return-join&gt;</literal> y <literal>&lt;load-"
 "collection&gt;</literal> se usan para unir asociaciones y definir consultas "
 "que inicialicen colecciones, respectivamente."
 
-#: index.docbook:377
+#. Tag: programlisting
+#: query_sql.xml:404
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
 "    <return alias=\"person\" class=\"eg.Person\"/>\n"
@@ -790,7 +984,9 @@
 "    WHERE person.NAME LIKE :namePattern\n"
 "</sql-query>]]>"
 
-#: index.docbook:379
+#. Tag: para
+#: query_sql.xml:406
+#, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
 "alias and Hibernate type using the <literal>&lt;return-scalar&gt;</literal> "
@@ -800,7 +996,9 @@
 "especificar el alias de columna y tipo Hibernate usando el elementp "
 "<literal>&lt;return-scalar&gt;</literal>:"
 
-#: index.docbook:383
+#. Tag: programlisting
+#: query_sql.xml:410
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
 "    <return-scalar column=\"name\" type=\"string\"/>\n"
@@ -818,17 +1016,22 @@
 "    FROM PERSON p WHERE p.NAME LIKE 'Hiber%'\n"
 "</sql-query>]]>"
 
-#: index.docbook:385
+#. Tag: para
+#: query_sql.xml:412
+#, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them accross several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "You can externalize the resultset mapping informations in a <literal>&lt;"
 "resultset&gt;</literal> element to either reuse them accross several named "
 "queries or through the <literal>setResultSetMapping()</literal> API."
 
-#: index.docbook:390
+#. Tag: programlisting
+#: query_sql.xml:417
+#, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
 "    <return alias=\"person\" class=\"eg.Person\"/>\n"
@@ -869,15 +1072,19 @@
 "                WHERE person.NAME LIKE :namePattern\n"
 "        </sql-query>]]>"
 
-#: index.docbook:392
+#. Tag: para
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr ""
 "You can alternatively use the resultset mapping information in your hbm "
 "files directly in java code."
 
-#: index.docbook:395
+#. Tag: programlisting
+#: query_sql.xml:422
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
 "        \"select {cat.*}, {kitten.*} from cats cat, cats kitten where kitten."
@@ -893,24 +1100,30 @@
 "                              .setResultSetMapping(\"catAndKitten\")\n"
 "    .list();]]>"
 
-#: index.docbook:398
+#. Tag: title
+#: query_sql.xml:425
+#, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr ""
 "Usando return-property para especificar expl&#x00ed;citamente nombres de "
 "columna/alias"
 
-#: index.docbook:401
+#. Tag: para
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "Con <literal>&lt;return-property&gt;</literal> puedes decirle expl&#x00ed;"
 "citamente a Hibernate qu&#x00e9; alias de columna usar, en vez de usar la "
 "sint&#x00e1;xis <literal>{}</literal> para dejar que Hibernate inyecte sus "
 "propios alias."
 
-#: index.docbook:406
+#. Tag: programlisting
+#: query_sql.xml:433
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
 "    <return alias=\"person\" class=\"eg.Person\">\n"
@@ -938,10 +1151,12 @@
 "</sql-query>\n"
 "]]>"
 
-#: index.docbook:408
+#. Tag: para
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal> tambi&#x00e9;n trabaja con "
@@ -949,7 +1164,9 @@
 "sint&#x00e1;xis <literal>{}</literal>, la cual no puede permitir un control "
 "fino de propiedades multi-columna."
 
-#: index.docbook:413
+#. Tag: programlisting
+#: query_sql.xml:440
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
 "    <return alias=\"emp\" class=\"Employment\">\n"
@@ -983,18 +1200,22 @@
 "        ORDER BY STARTDATE ASC\n"
 "</sql-query>]]>"
 
-#: index.docbook:415
+#. Tag: para
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "Nota que en este ejemplo hemos usado <literal>&lt;return-property&gt;</"
 "literal> en combinaci&#x00f3;n con la sint&#x00e1;xis <literal>{}</literal> "
 "para inyecci&#x00f3;n, permitiendo a los usuarios elejir c&#x00f3;mo quieren "
 "referirse a las columnas y propiedades."
 
-#: index.docbook:420
+#. Tag: para
+#: query_sql.xml:447
+#, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
 "discriminator&gt;</literal> to specify the discriminator column."
@@ -1002,17 +1223,21 @@
 "Si tu mapeo tiene un discriminador debes usar <literal>&lt;return-"
 "discriminator&gt;</literal> para especificar la columna discriminadora."
 
-#: index.docbook:426
+#. Tag: title
+#: query_sql.xml:453
+#, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "Usando procedimientos almacenados para consultar"
 
-#: index.docbook:428
+#. Tag: para
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernate3 introduce soporte para consultas v&#x00ed;a procedimientos "
 "almacenados. Los procedimientos almacenados deben devolver un conjunto "
@@ -1020,7 +1245,9 @@
 "funcionar con Hibernate. Un ejemplo de uno procedimiento almacenado en "
 "Oracle 9 o superior es as&#x00ed;:"
 
-#: index.docbook:434
+#. Tag: programlisting
+#: query_sql.xml:461
+#, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
 "    RETURN SYS_REFCURSOR\n"
@@ -1048,13 +1275,17 @@
 "      RETURN  st_cursor; \n"
 " END;]]>"
 
-#: index.docbook:436
+#. Tag: para
+#: query_sql.xml:463
+#, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
 "Para usar esta consulta en Hibernate necesitas mapearla por medio de una "
 "consulta con nombre."
 
-#: index.docbook:439
+#. Tag: programlisting
+#: query_sql.xml:466
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
 "    <return alias=\"emp\" class=\"Employment\">\n"
@@ -1091,25 +1322,31 @@
 "    { ? = call selectAllEmployments() }\n"
 "</sql-query>]]>"
 
-#: index.docbook:441
+#. Tag: para
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "Nota que los procedimientos almacenados s&#x00f3;lo devuelven escalares y "
 "entidades. No est&#x00e1;n soportados <literal>&lt;return-join&gt;</literal> "
 "y <literal>&lt;load-collection&gt;</literal>."
 
-#: index.docbook:446
+#. Tag: title
+#: query_sql.xml:473
+#, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "Reglas/limitaciones para usar procedimientos almacenados"
 
-#: index.docbook:448
+#. Tag: para
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1122,50 +1359,62 @@
 "de datos tienen diferentes sem&#x00e1;nticas/sint&#x00e1;xis de "
 "procedimientos almacenados."
 
-#: index.docbook:455
+#. Tag: para
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "Las consultas de procedimientos almacenados no pueden ser paginadas con "
 "<literal>setFirstResult()/setMaxResults()</literal>."
 
-#: index.docbook:458
+#. Tag: para
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr "Para Oracle se aplican las siguientes reglas:"
 
-#: index.docbook:463
+#. Tag: para
+#: query_sql.xml:490
+#, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr ""
 "El procedimiento debe devolver un conjunto resultado. Esto se hace "
 "devolviendo un <literal>SYS_REFCURSOR</literal> en Oracle 9 o 10. En Oracle "
 "necesitas definir un tipo <literal>REF CURSOR</literal>."
 
-#: index.docbook:467
+#. Tag: para
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "La forma recomendada es <literal>{ ? = call procName(&lt;parameters&gt;) }</"
 "literal> o <literal>{ ? = call procName }</literal> (esto es m&#x00e1;s una "
 "regla de Oracle que una regla de Hibernate)."
 
-#: index.docbook:476
+#. Tag: para
+#: query_sql.xml:503
+#, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "Para Sybase o MS SQL server se aplican las siguientes reglas:"
 
-#: index.docbook:480
+#. Tag: para
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "El procedimiento debe devolver un conjunto resultado. Nota que ya que estos "
 "servidores pueden y devolver&#x00e1;n m&#x00fa;ltiples conjuntos resultados "
@@ -1173,7 +1422,9 @@
 "tomar&#x00e1; el primer resultado que sea un conjunto resultado como su "
 "valor a devolver. Todo lo dem&#x00e1;s ser&#x00e1; descartado."
 
-#: index.docbook:488
+#. Tag: para
+#: query_sql.xml:515
+#, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
 "will probably be more efficient, but this is not a requirement."
@@ -1182,11 +1433,15 @@
 "ser&#x00e1; probablemente m&#x00e1;s eficiente, pero esto no es un "
 "requerimiento."
 
-#: index.docbook:498
+#. Tag: title
+#: query_sql.xml:525
+#, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "SQL personalizado para crear, actualizar y borrar"
 
-#: index.docbook:500
+#. Tag: para
+#: query_sql.xml:527
+#, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
 "operations. The class and collection persisters in Hibernate already contain "
@@ -1202,7 +1457,9 @@
 "de mapeo <literal>&lt;sql-insert&gt;</literal>, <literal>&lt;sql-delete&gt;</"
 "literal>, y <literal>&lt;sql-update&gt;</literal> sobrescriben estas cadenas:"
 
-#: index.docbook:508
+#. Tag: programlisting
+#: query_sql.xml:535
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\">\n"
@@ -1226,18 +1483,22 @@
 "    <sql-delete>DELETE FROM PERSON WHERE ID=?</sql-delete>\n"
 "</class>]]>"
 
-#: index.docbook:510
+#. Tag: para
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "El SQL se ejecuta directamente en tu base de datos, de modo que eres libre "
 "de usar cualquier dialecto que quieras. Esto reducir&#x00e1;, por supuesto, "
 "la portabilidad de tu mapeo si usas SQL espec&#x00ed;fico de la base de "
 "datos."
 
-#: index.docbook:514
+#. Tag: para
+#: query_sql.xml:541
+#, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
 "is set:"
@@ -1245,7 +1506,9 @@
 "Los procedimientos almacenados son soportados si est&#x00e1; establecido el "
 "atributo <literal>callable</literal>:"
 
-#: index.docbook:517
+#. Tag: programlisting
+#: query_sql.xml:544
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\">\n"
@@ -1269,22 +1532,26 @@
 "update>\n"
 "</class>]]>"
 
-#: index.docbook:519
+#. Tag: para
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr ""
 "El orden de los par&#x00e1;metros posicionales son actualmente vitales, ya "
 "que deben estar en la misma secuencia en que las espera Hibernate."
 
-#: index.docbook:522
+#. Tag: para
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "Puedes ver el orden esperado habilitando el registro de depuraci&#x00f3;n "
 "para el nivel <literal>org.hibernate.persister.entity</literal>. Con este "
@@ -1294,13 +1561,14 @@
 "de mapeo ya que sobrescribir&#x00e1;n el sql est&#x00e1;tico generado por "
 "Hibernate.)"
 
-#: index.docbook:529
+#. Tag: para
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "Los procedimientos almacenados son, en la mayor&#x00ed;a de los casos "
 "(l&#x00e9;ase, mejor hacerlo que no hacerlo), obligados a devolver el "
@@ -1310,7 +1578,9 @@
 "sentencia como un par&#x00e1;metro de salida num&#x00e9;rico para las "
 "operaciones CUD:"
 
-#: index.docbook:535
+#. Tag: programlisting
+#: query_sql.xml:562
+#, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
 "VARCHAR2)\n"
@@ -1342,17 +1612,23 @@
 "\n"
 "END updatePerson;]]>"
 
-#: index.docbook:539
+#. Tag: title
+#: query_sql.xml:566
+#, no-c-format
 msgid "Custom SQL for loading"
 msgstr "SQL personalizado para carga"
 
-#: index.docbook:541
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#. Tag: para
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 "Puedes tambi&#x00e9;n declarar tu propias consultas SQL (o HQL) para cargar "
 "entidades:"
 
-#: index.docbook:544
+#. Tag: programlisting
+#: query_sql.xml:571
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
 "    <return alias=\"pers\" class=\"Person\" lock-mode=\"upgrade\"/>\n"
@@ -1370,16 +1646,20 @@
 "    FOR UPDATE\n"
 "</sql-query>]]>"
 
-#: index.docbook:546
+#. Tag: para
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr ""
 "Esto es s&#x00f3;lo una declaraci&#x00f3;n de consulta con nombrem como se "
 "ha discutido anteriormente. Puedes hacer referencia a esta consulta con "
 "nombre en un mapeo de clase:"
 
-#: index.docbook:549
+#. Tag: programlisting
+#: query_sql.xml:576
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\">\n"
@@ -1397,15 +1677,21 @@
 "    <loader query-ref=\"person\"/>\n"
 "</class>]]>"
 
-#: index.docbook:551
+#. Tag: para
+#: query_sql.xml:578
+#, no-c-format
 msgid "This even works with stored procedures."
 msgstr "Esto incluso funciona con procedimientos almacenados."
 
-#: index.docbook:553
-msgid "You may even define a query for collection loading:"
+#. Tag: para
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr "Puedes incluso definit una consulta para la carga de colecciones:"
 
-#: index.docbook:555
+#. Tag: programlisting
+#: query_sql.xml:582
+#, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
 "    <key/>\n"
@@ -1419,7 +1705,9 @@
 "    <loader query-ref=\"employments\"/>\n"
 "</set>]]>"
 
-#: index.docbook:557
+#. Tag: programlisting
+#: query_sql.xml:584
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
 "    <load-collection alias=\"emp\" role=\"Person.employments\"/>\n"
@@ -1437,15 +1725,19 @@
 "    ORDER BY STARTDATE ASC, EMPLOYEE ASC\n"
 "</sql-query>]]>"
 
-#: index.docbook:559
+#. Tag: para
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr ""
 "Podr&#x00ed;as incluso definir un cargador de entidades que cargue una "
 "colecci&#x00f3;n por recuperaci&#x00f3;n por uni&#x00f3;n (join fetching):"
 
-#: index.docbook:562
+#. Tag: programlisting
+#: query_sql.xml:589
+#, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
 "    <return alias=\"pers\" class=\"Person\"/>\n"
@@ -1467,8 +1759,8 @@
 "    WHERE ID=?\n"
 "</sql-query>]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,22 +1,28 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: session_api.xml:29
+#, no-c-format
 msgid "Working with objects"
 msgstr "Trabajando con objetos"
 
-#: index.docbook:7
+#. Tag: para
+#: session_api.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "Hibernate es una soluci&#x00f3;n completa de mapeo objeto/relacional que no "
 "s&#x00f3;lo abstrae al desarrollador de los detalles del sistema de manejo "
@@ -26,7 +32,9 @@
 "una vista de la persistencia en aplicaciones Java muy natural y orientada a "
 "objetos."
 
-#: index.docbook:16
+#. Tag: para
+#: session_api.xml:40
+#, no-c-format
 msgid ""
 "In other words, Hibernate application developers should always think about "
 "the <emphasis>state</emphasis> of their objects, and not necessarily about "
@@ -40,22 +48,28 @@
 "cuidada por Hibernate y es s&#x00f3;lo relevante para el desarrollador de la "
 "aplicaci&#x00f3;n al afinar el rendimiento del sistema."
 
-#: index.docbook:24
+#. Tag: title
+#: session_api.xml:48
+#, no-c-format
 msgid "Hibernate object states"
 msgstr "Estados de objeto de Hibernate"
 
-#: index.docbook:26
+#. Tag: para
+#: session_api.xml:50
+#, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr "Hibernate define y soporta los siguientes estados de objeto:"
 
-#: index.docbook:32
+#. Tag: para
+#: session_api.xml:56
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -70,14 +84,16 @@
 "Hibernate para hacer un objeto persistente (y deja que Hibernate cuide de "
 "las sentencias SQL que necesitan ejecutarse para esta transici&#x00f3;n)."
 
-#: index.docbook:44
+#. Tag: para
+#: session_api.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -91,7 +107,9 @@
 "<literal>UPDATE</literal> manuales, o sentencias <literal>DELETE</literal> "
 "cuando un objeto debe ser hecho transitorio."
 
-#: index.docbook:55
+#. Tag: para
+#: session_api.xml:79
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -100,8 +118,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>Separado (detached)</emphasis> - una instancia separada es un "
 "objeto que ha sido hecho persistente, pero su <literal>Session</literal> ha "
@@ -115,19 +133,25 @@
 "llamamos <emphasis>transaccciones de aplicaci&#x00f3;n</emphasis>, es decir, "
 "una unidad de trabajo desde el punto de vista del usuario."
 
-#: index.docbook:69
+#. Tag: para
+#: session_api.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "Discutiremos ahora los estados y transiciones de estados (y los m&#x00e9;"
 "todos de Hibernate que disparan una transici&#x00f3;n) en m&#x00e1;s detalle:"
 
-#: index.docbook:77
+#. Tag: title
+#: session_api.xml:101
+#, no-c-format
 msgid "Making objects persistent"
 msgstr "Haciendo los objetos persistentes"
 
-#: index.docbook:79
+#. Tag: para
+#: session_api.xml:103
+#, no-c-format
 msgid ""
 "Newly instantiated instances of a a persistent class are considered "
 "<emphasis>transient</emphasis> by Hibernate. We can make a transient "
@@ -138,7 +162,9 @@
 "una instancia transitoria <emphasis>persistente</emphasis> asoci&#x00e1;"
 "ndola con una sesi&#x00f3;n:"
 
-#: index.docbook:86
+#. Tag: programlisting
+#: session_api.xml:110
+#, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
 "fritz.setColor(Color.GINGER);\n"
@@ -152,14 +178,16 @@
 "fritz.setName(\"Fritz\");\n"
 "Long generatedId = (Long) sess.save(fritz);]]>"
 
-#: index.docbook:88
+#. Tag: para
+#: session_api.xml:112
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -172,10 +200,12 @@
 "literal> en vez de <literal>save()</literal>, con la sem&#x00e1;ntica "
 "definida en el temprano borrador de EJB3."
 
-#: index.docbook:100
+#. Tag: para
+#: session_api.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -190,7 +220,9 @@
 "transaction boundaries. This is useful in long-running conversations with an "
 "extended Session/persistence context."
 
-#: index.docbook:111
+#. Tag: para
+#: session_api.xml:135
+#, no-c-format
 msgid ""
 "<literal>save()</literal> does guarantee to return an identifier. If an "
 "INSERT has to be executed to get the identifier ( e.g. \"identity\" "
@@ -204,15 +236,19 @@
 "you are inside or outside of a transaction. This is problematic in a long-"
 "running conversation with an extended Session/persistence context."
 
-#: index.docbook:121
+#. Tag: para
+#: session_api.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr ""
 "Alternativamente, puedes asignar el identificador usando una versi&#x00f3;n "
 "sobrecargada de <literal>save()</literal>."
 
-#: index.docbook:126
+#. Tag: programlisting
+#: session_api.xml:150
+#, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
 "pk.setColor(Color.TABBY);\n"
@@ -230,11 +266,13 @@
 "pk.addKitten(fritz);\n"
 "sess.save( pk, new Long(1234) );]]>"
 
-#: index.docbook:128
+#. Tag: para
+#: session_api.xml:152
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -249,12 +287,14 @@
 "restricci&#x00f3;n <literal>NOT NULL</literal> si llamas a <literal>save()</"
 "literal> sobre objetos en orden err&#x00f3;neo."
 
-#: index.docbook:138
+#. Tag: para
+#: session_api.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "Usualmente no te preocupas con este detalle, pues muy probablemente "
@@ -265,16 +305,20 @@
 "persistencia transitiva se discute m&#x00e1;s adelante en este cap&#x00ed;"
 "tulo."
 
-#: index.docbook:149
+#. Tag: title
+#: session_api.xml:173
+#, no-c-format
 msgid "Loading an object"
 msgstr "Cargando un objeto"
 
-#: index.docbook:151
+#. Tag: para
+#: session_api.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "Los m&#x00e9;todos <literal>load()</literal> de <literal>Session</literal> "
 "te brindan una forma de traer una instancia persistente si ya saves su "
@@ -282,11 +326,15 @@
 "cargar&#x00e1; el estado dentro de una instancia reci&#x00e9;n instanciada "
 "de esta clase, en estado persistente."
 
-#: index.docbook:158
+#. Tag: programlisting
+#: session_api.xml:182
+#, no-c-format
 msgid "<![CDATA[Cat fritz = (Cat) sess.load(Cat.class, generatedId);]]>"
 msgstr "<![CDATA[Cat fritz = (Cat) sess.load(Cat.class, generatedId);]]>"
 
-#: index.docbook:160
+#. Tag: programlisting
+#: session_api.xml:184
+#, no-c-format
 msgid ""
 "<![CDATA[// you need to wrap primitive identifiers\n"
 "long id = 1234;\n"
@@ -298,11 +346,15 @@
 "DomesticCat pk = (DomesticCat) sess.load( DomesticCat.class, new Long"
 "(id) );]]>"
 
-#: index.docbook:162
+#. Tag: para
+#: session_api.xml:186
+#, no-c-format
 msgid "Alternatively, you can load state into a given instance:"
 msgstr "Alternativamente, puedes cargar estado dentro de una instancia dada:"
 
-#: index.docbook:166
+#. Tag: programlisting
+#: session_api.xml:190
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
 "// load pk's state into cat\n"
@@ -314,16 +366,18 @@
 "sess.load( cat, new Long(pkId) );\n"
 "Set kittens = cat.getKittens();]]>"
 
-#: index.docbook:168
+#. Tag: para
+#: session_api.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "Nota que <literal>load()</literal> lanzar&#x00e1; una excepci&#x00f3;n "
 "irrecuperable si no hay una fila correspondiente en base de datos. Si la "
@@ -335,17 +389,21 @@
 "ltiples instancias sean cargadas como un lote si se define <literal>batch-"
 "size</literal> para el mapeo de la clase."
 
-#: index.docbook:179
+#. Tag: para
+#: session_api.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "Si no tienes certeza que exista una fila correspondiente, debes usar el "
 "m&#x00e9;todo <literal>get()</literal>, que llama a la base de datos "
 "inmediatamente y devuelve nulo si no existe una fila correspondiente."
 
-#: index.docbook:185
+#. Tag: programlisting
+#: session_api.xml:209
+#, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id);\n"
 "if (cat==null) {\n"
@@ -361,9 +419,11 @@
 "}\n"
 "return cat;]]>"
 
-#: index.docbook:187
+#. Tag: para
+#: session_api.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -371,23 +431,29 @@
 "literal> de SQL, usando un <literal>LockMode</literal>. Ver la "
 "documentaci&#x00f3;n de la API para m&#x00e1;s informaci&#x00f3;n."
 
-#: index.docbook:192
+#. Tag: programlisting
+#: session_api.xml:216
+#, no-c-format
 msgid "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id, LockMode.UPGRADE);]]>"
 msgstr "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id, LockMode.UPGRADE);]]>"
 
-#: index.docbook:194
+#. Tag: para
+#: session_api.xml:218
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "Ten en cuenta que <emphasis>ninguna</emphasis> instancia asociada o "
 "colecci&#x00f3;n contenida es selecciona <literal>FOR UPDATE</literal>, a "
 "menos que decidas especificar <literal>lock</literal> o <literal>all</"
 "literal> como un estilo de cascada para la asociaci&#x00f3;n."
 
-#: index.docbook:201
+#. Tag: para
+#: session_api.xml:225
+#, no-c-format
 msgid ""
 "It is possible to re-load an object and all its collections at any time, "
 "using the <literal>refresh()</literal> method. This is useful when database "
@@ -398,7 +464,9 @@
 "&#x00fa;til cuando se usan disparadores de base de datos para inicializar "
 "algunas de las propiedades del objeto."
 
-#: index.docbook:207
+#. Tag: programlisting
+#: session_api.xml:231
+#, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
 "sess.flush(); //force the SQL INSERT\n"
@@ -408,12 +476,14 @@
 "sess.flush(); //force the SQL INSERT\n"
 "sess.refresh(cat); //re-read the state (after the trigger executes)]]>"
 
-#: index.docbook:209
+#. Tag: para
+#: session_api.xml:233
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "Una cuesti&#x00f3;n importante aparece usualmente en este punto: ¿Cu&#x00e1;"
 "nto carga Hibernate de la base de datos y cu&#x00e1;ntos <literal>SELECT</"
@@ -421,16 +491,20 @@
 "recuperaci&#x00f3;n</emphasis> y se explica en <xref linkend=\"performance-"
 "fetching\"/>."
 
-#: index.docbook:219
+#. Tag: title
+#: session_api.xml:243
+#, no-c-format
 msgid "Querying"
 msgstr "Consultando"
 
-#: index.docbook:221
+#. Tag: para
+#: session_api.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -443,11 +517,15 @@
 "soporte opcional de Hibernate para la conversi&#x00f3;n del conjunto "
 "resultado en objetos."
 
-#: index.docbook:231
+#. Tag: title
+#: session_api.xml:255
+#, no-c-format
 msgid "Executing queries"
 msgstr "Ejecutando consultas"
 
-#: index.docbook:233
+#. Tag: para
+#: session_api.xml:257
+#, no-c-format
 msgid ""
 "HQL and native SQL queries are represented with an instance of <literal>org."
 "hibernate.Query</literal>. This interface offers methods for parameter "
@@ -461,7 +539,9 @@
 "y para la ejecuci&#x00f3;n de la consulta real. Siempre obtienes una "
 "<literal>Query</literal> usando la <literal>Session</literal> actual:"
 
-#: index.docbook:240
+#. Tag: programlisting
+#: session_api.xml:264
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
 "    \"from Cat as cat where cat.birthdate < ?\")\n"
@@ -509,16 +589,18 @@
 "    .setEntity(0, izi)\n"
 "    .uniqueResult();]]>"
 
-#: index.docbook:242
+#. Tag: para
+#: session_api.xml:266
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "Una consulta se ejecuta usualmente invocando a <literal>list()</literal>, el "
 "resultado de la consulta ser&#x00e1; cargado completamente dentro de una "
@@ -527,17 +609,21 @@
 "<literal>uniqueResult()</literal> ofrece un atajo si sabes que tu consulta "
 "devolver&#x00e1; s&#x00f3;lo un objeto."
 
-#: index.docbook:254
+#. Tag: title
+#: session_api.xml:278
+#, no-c-format
 msgid "Iterating results"
 msgstr "Iterando los resultados"
 
-#: index.docbook:256
+#. Tag: para
+#: session_api.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -555,7 +641,9 @@
 "devuelve identificadores, y <emphasis>n</emphasis> selecciones adicionales "
 "para inicializar las instancias reales."
 
-#: index.docbook:268
+#. Tag: programlisting
+#: session_api.xml:292
+#, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
 "Iterator iter = sess.createQuery(\"from eg.Qux q order by q.likeliness\")."
@@ -585,19 +673,25 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:272
+#. Tag: title
+#: session_api.xml:296
+#, no-c-format
 msgid "Queries that return tuples"
 msgstr "Consultas que devuelven tuplas"
 
-#: index.docbook:274
+#. Tag: para
+#: session_api.xml:298
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "Las consultas de Hibernate a veces devuelven tuplas de objetos, en cuyo caso "
 "cada tupla se devuelve como un array:"
 
-#: index.docbook:279
+#. Tag: programlisting
+#: session_api.xml:303
+#, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
 "            \"select kitten, mother from Cat kitten join kitten.mother mother"
@@ -625,22 +719,28 @@
 "    ....\n"
 "}]]>"
 
-#: index.docbook:284
+#. Tag: title
+#: session_api.xml:308
+#, no-c-format
 msgid "Scalar results"
 msgstr "Resultados escalares"
 
-#: index.docbook:286
+#. Tag: para
+#: session_api.xml:310
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "Las consultas pueden especificar una propiedad de una clase en la cl&#x00e1;"
 "usula <literal>select</literal>. Pueden incluso llamar a funciones de "
 "agregaci&#x00f3;n SQL. Las propiedades o agregaciones son considerados "
 "resultados \"escalares\" (y no entidades en estado persistente)."
 
-#: index.docbook:292
+#. Tag: programlisting
+#: session_api.xml:316
+#, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
 "        \"select cat.color, min(cat.birthdate), count(cat) from Cat cat \" "
@@ -672,17 +772,21 @@
 "    .....\n"
 "}]]>"
 
-#: index.docbook:297
+#. Tag: title
+#: session_api.xml:321
+#, no-c-format
 msgid "Bind parameters"
 msgstr "Ligaci&#x00f3;n de par&#x00e1;metros"
 
-#: index.docbook:299
+#. Tag: para
+#: session_api.xml:323
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "Se proveen m&#x00e9;todos en <literal>Query</literal> para ligar valores a "
 "par&#x00e1;metros con nombre o par&#x00e1;metros <literal>?</literal> de "
@@ -691,22 +795,30 @@
 "identificadores de la forma <literal>:name</literal> en la cadena de la "
 "consulta. Las ventajas de los par&#x00e1;metros con nombre son:"
 
-#: index.docbook:309
+#. Tag: para
+#: session_api.xml:333
+#, no-c-format
 msgid ""
 "named parameters are insensitive to the order they occur in the query string"
 msgstr ""
 "los par&#x00e1;metros con nombre son insensibles al orden en que aparecen en "
 "la cadena de consulta"
 
-#: index.docbook:315
-msgid "they may occur multiple times in the same query"
+#. Tag: para
+#: session_api.xml:339
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "pueden aparecer m&#x00fa;ltiples veces en la misma consulta"
 
-#: index.docbook:320
+#. Tag: para
+#: session_api.xml:344
+#, no-c-format
 msgid "they are self-documenting"
 msgstr "son auto-documentados"
 
-#: index.docbook:326
+#. Tag: programlisting
+#: session_api.xml:350
+#, no-c-format
 msgid ""
 "<![CDATA[//named parameter (preferred)\n"
 "Query q = sess.createQuery(\"from DomesticCat cat where cat.name = :name"
@@ -720,7 +832,9 @@
 "q.setString(\"name\", \"Fritz\");\n"
 "Iterator cats = q.iterate();]]>"
 
-#: index.docbook:328
+#. Tag: programlisting
+#: session_api.xml:352
+#, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
 "Query q = sess.createQuery(\"from DomesticCat cat where cat.name = ?\");\n"
@@ -732,7 +846,9 @@
 "q.setString(0, \"Izi\");\n"
 "Iterator cats = q.iterate();]]>"
 
-#: index.docbook:330
+#. Tag: programlisting
+#: session_api.xml:354
+#, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
 "List names = new ArrayList();\n"
@@ -752,22 +868,28 @@
 "q.setParameterList(\"namesList\", names);\n"
 "List cats = q.list();]]>"
 
-#: index.docbook:335
+#. Tag: title
+#: session_api.xml:359
+#, no-c-format
 msgid "Pagination"
 msgstr "Paginaci&#x00f3;n"
 
-#: index.docbook:337
+#. Tag: para
+#: session_api.xml:361
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "Si necesitas especificar l&#x00ed;mites sobre tu conjunto resultado (el "
 "n&#x00fa;mero m&#x00e1;ximo de filas que quieras traer y/o la primera fila "
 "que quieras traer) debes usar los m&#x00e9;todos de la interface "
 "<literal>Query</literal>:"
 
-#: index.docbook:343
+#. Tag: programlisting
+#: session_api.xml:367
+#, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"from DomesticCat cat\");\n"
 "q.setFirstResult(20);\n"
@@ -779,7 +901,9 @@
 "q.setMaxResults(10);\n"
 "List cats = q.list();]]>"
 
-#: index.docbook:345
+#. Tag: para
+#: session_api.xml:369
+#, no-c-format
 msgid ""
 "Hibernate knows how to translate this limit query into the native SQL of "
 "your DBMS."
@@ -787,23 +911,29 @@
 "Hibernate sabe c&#x00f3;mo traducir este l&#x00ed;mite de consulta al SQL "
 "nativo de tu DBMS."
 
-#: index.docbook:353
+#. Tag: title
+#: session_api.xml:377
+#, no-c-format
 msgid "Scrollable iteration"
 msgstr "Iteraci&#x00f3;n scrollable"
 
-#: index.docbook:355
+#. Tag: para
+#: session_api.xml:379
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "Si tu driver JDBC soporta <literal>ResultSet</literal>s scrollables, la "
 "interface <literal>Query</literal> puede ser usada para obtener un objeto "
 "<literal>ScrollableResults</literal>, que permite una navegaci&#x00f3;n "
 "flexible de los resultados de consulta."
 
-#: index.docbook:362
+#. Tag: programlisting
+#: session_api.xml:386
+#, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"select cat.name, cat from DomesticCat "
 "cat \" +\n"
@@ -855,10 +985,12 @@
 "}\n"
 "cats.close()]]>"
 
-#: index.docbook:364
+#. Tag: para
+#: session_api.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "Nota que se requiere una conexi&#x00f3;n de base de datos abierta (y cursor) "
@@ -866,21 +998,27 @@
 "<literal>setFirstResult()</literal> si necesitas la funcionalidad de "
 "paginaci&#x00f3;n fuera de l&#x00ed;nea."
 
-#: index.docbook:373
+#. Tag: title
+#: session_api.xml:397
+#, no-c-format
 msgid "Externalizing named queries"
 msgstr "Externalizando consultas con nombre"
 
-#: index.docbook:375
+#. Tag: para
+#: session_api.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "Puedes adem&#x00e1;s definir consultas con nombre en el documento de mapeo. "
 "(Recuerda usar una secci&#x00f3;n <literal>CDATA</literal> si tu consulta "
 "contiene caracteres que puedan ser interpretados como etiquetado.)"
 
-#: index.docbook:381
+#. Tag: programlisting
+#: session_api.xml:405
+#, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
 "    from eg.DomesticCat as cat\n"
@@ -895,13 +1033,17 @@
 "        and cat.weight > ?\n"
 "] ]></query>]]>"
 
-#: index.docbook:383
+#. Tag: para
+#: session_api.xml:407
+#, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr ""
 "La ligaci&#x00f3;n de par&#x00e1;metros y ejecuci&#x00f3;n se hace "
 "program&#x00e1;ticamente:"
 
-#: index.docbook:387
+#. Tag: programlisting
+#: session_api.xml:411
+#, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
 "q.setString(0, name);\n"
@@ -914,24 +1056,28 @@
 "q.setInt(1, minWeight);\n"
 "List cats = q.list();]]>"
 
-#: index.docbook:389
+#. Tag: para
+#: session_api.xml:413
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "Nota que el c&#x00f3;digo real del programa es independiente del lenguaje de "
 "consulta usado; puedes adem&#x00e1;s definir consultas SQL nativas en "
 "metadatos, o migrar consultas existentes a Hibernate coloc&#x00e1;ndolas en "
 "ficheros de mapeo."
 
-#: index.docbook:395
+#. Tag: para
+#: session_api.xml:419
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "UNTRANSLATED! Also note that a query declaration inside a <literal>&lt;"
 "hibernate-mapping&gt;</literal> element requires a global unique name for "
@@ -940,14 +1086,18 @@
 "qualified name of the class, for example <literal>eg.Cat."
 "ByNameAndMaximumWeight</literal>."
 
-#: index.docbook:408
+#. Tag: title
+#: session_api.xml:432
+#, no-c-format
 msgid "Filtering collections"
 msgstr "Filtrando colecciones"
 
-#: index.docbook:409
+#. Tag: para
+#: session_api.xml:433
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "Un <emphasis>filtro</emphasis> de colecci&#x00f3;n es un tipo especial de "
@@ -955,7 +1105,9 @@
 "La cadena de consulta puede referirse a <literal>this</literal>, "
 "significando el elemento de colecci&#x00f3;n actual."
 
-#: index.docbook:415
+#. Tag: programlisting
+#: session_api.xml:439
+#, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
 "    pk.getKittens(), \n"
@@ -971,29 +1123,35 @@
 "    .list()\n"
 ");]]>"
 
-#: index.docbook:417
+#. Tag: para
+#: session_api.xml:441
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "La colecci&#x00f3;n devuelta es considerada un bag, y es una copia de la "
 "colecci&#x00f3;n dada. La colecci&#x00f3;n original no es modificada (esto "
 "es contrario a la implicaci&#x00f3;n del nombre \"filtro\", pero consistente "
 "con el comportamiento esperado)."
 
-#: index.docbook:423
+#. Tag: para
+#: session_api.xml:447
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "Observa que los filtros no requieren una cl&#x00e1;usula <literal>from</"
 "literal> (aunque pueden tener uno si se requiere). Los filtros no est&#x00e1;"
 "n limitados a devolver los elementos de colecci&#x00f3;n por s&#x00ed; "
 "mismos."
 
-#: index.docbook:428
+#. Tag: programlisting
+#: session_api.xml:452
+#, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
 "    pk.getKittens(), \n"
@@ -1005,15 +1163,19 @@
 "    \"select this.mate where this.color = eg.Color.BLACK.intValue\")\n"
 "    .list();]]>"
 
-#: index.docbook:430
+#. Tag: para
+#: session_api.xml:454
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "Incluso una consulta de filtro vac&#x00ed;o es &#x00fa;til, por ejemplo, "
 "para cargar un subconjunto de elementos en una colecci&#x00f3;n enorme:"
 
-#: index.docbook:435
+#. Tag: programlisting
+#: session_api.xml:459
+#, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
 "    mother.getKittens(), \"\")\n"
@@ -1025,14 +1187,18 @@
 "    .setFirstResult(0).setMaxResults(10)\n"
 "    .list();]]>"
 
-#: index.docbook:440
+#. Tag: title
+#: session_api.xml:464
+#, no-c-format
 msgid "Criteria queries"
 msgstr "Consultas de criterios"
 
-#: index.docbook:442
+#. Tag: para
+#: session_api.xml:466
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1041,7 +1207,9 @@
 "en vez construir cadenas de consulta. Hibernate provee una API intuitiva de "
 "consulta <literal>Criteria</literal> para estos casos:"
 
-#: index.docbook:448
+#. Tag: programlisting
+#: session_api.xml:472
+#, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = session.createCriteria(Cat.class);\n"
 "crit.add( Restrictions.eq( \"color\", eg.Color.BLACK ) );\n"
@@ -1053,7 +1221,9 @@
 "crit.setMaxResults(10);\n"
 "List cats = crit.list();]]>"
 
-#: index.docbook:450
+#. Tag: para
+#: session_api.xml:474
+#, no-c-format
 msgid ""
 "The <literal>Criteria</literal> and the associated <literal>Example</"
 "literal> API are discussed in more detail in <xref linkend=\"querycriteria\"/"
@@ -1063,17 +1233,21 @@
 "literal> son discutidas en m&#x00e1;s detalle en <xref linkend="
 "\"querycriteria\"/>."
 
-#: index.docbook:458
+#. Tag: title
+#: session_api.xml:482
+#, no-c-format
 msgid "Queries in native SQL"
 msgstr "Consultas en SQL nativo"
 
-#: index.docbook:460
+#. Tag: para
+#: session_api.xml:484
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "Puedes expresar una consulta en SQL, usando <literal>createSQLQuery()</"
 "literal> y dejando que Hibernate cuide del mapeo de los conjuntos resultado "
@@ -1082,7 +1256,9 @@
 "directamente. Si eliges usar la API de Hibernate, debes encerrar los alias "
 "de SQL entre llaves:"
 
-#: index.docbook:468
+#. Tag: programlisting
+#: session_api.xml:492
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
 "WHERE ROWNUM<10\")\n"
@@ -1094,7 +1270,9 @@
 "    .addEntity(\"cat\", Cat.class)\n"
 ".list();]]>"
 
-#: index.docbook:470
+#. Tag: programlisting
+#: session_api.xml:494
+#, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
 "    \"SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, \" +\n"
@@ -1112,9 +1290,11 @@
 "    .addEntity(\"cat\", Cat.class)\n"
 ".list()]]>"
 
-#: index.docbook:472
+#. Tag: para
+#: session_api.xml:496
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1123,21 +1303,25 @@
 "m&#x00e1;s informaci&#x00f3;n sobre consultas en SQL nativo en <xref linkend="
 "\"querysql\"/>."
 
-#: index.docbook:483
+#. Tag: title
+#: session_api.xml:507
+#, no-c-format
 msgid "Modifying persistent objects"
 msgstr "Modificando objetos persistentes"
 
-#: index.docbook:485
+#. Tag: para
+#: session_api.xml:509
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "Las <emphasis>instancias persistentes transaccionales</emphasis> (es decir, "
 "objetos cargados, creados o consultados por la <literal>Session</literal>) "
@@ -1151,7 +1335,9 @@
 "<literal>load()</literal>, y entonces manipularlo directamente, mientras la "
 "<literal>Session</literal> est&#x00e1; abierta:"
 
-#: index.docbook:496
+#. Tag: programlisting
+#: session_api.xml:520
+#, no-c-format
 msgid ""
 "<![CDATA[DomesticCat cat = (DomesticCat) sess.load( Cat.class, new Long"
 "(69) );\n"
@@ -1163,13 +1349,14 @@
 "cat.setName(\"PK\");\n"
 "sess.flush();  // changes to cat are automatically detected and persisted]]>"
 
-#: index.docbook:498
+#. Tag: para
+#: session_api.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "A veces este modelo de programaci&#x00f3;n es ineficiente pues podr&#x00ed;a "
 "requerir una <literal>SELECT</literal> de SQL (para cargar un objeto) y un "
@@ -1177,17 +1364,19 @@
 "actualizados) en la misma sesi&#x00f3;n. Por lo tanto, Hibernate ofrece un "
 "enfoque alternativo, usando instancias separadas (detached)."
 
-#: index.docbook:506
+#. Tag: para
+#: session_api.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "Nota que Hibernate no ofreve su propia API para ejecuci&#x00f3;n directa de "
@@ -1203,11 +1392,15 @@
 "operaci&#x00f3;n masiva especiales. Ver <xref linkend=\"batch\"/> por "
 "algunos trucos de operaci&#x00f3;n en lote (batch) posibles."
 
-#: index.docbook:521
+#. Tag: title
+#: session_api.xml:546
+#, no-c-format
 msgid "Modifying detached objects"
 msgstr "Modificando objetos separados"
 
-#: index.docbook:523
+#. Tag: para
+#: session_api.xml:548
+#, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
 "the UI layer for manipulation, then save the changes in a new transaction. "
@@ -1221,7 +1414,9 @@
 "de enfoque en un entorno de alta concurrencia usualmente usan datos "
 "versionados para asegurar el aislamiento de la unidad de trabajo \"larga\"."
 
-#: index.docbook:530
+#. Tag: para
+#: session_api.xml:555
+#, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
 "instances using the <literal>Session.update()</literal> or <literal>Session."
@@ -1231,7 +1426,9 @@
 "separadas usando los m&#x00e9;todos <literal>Session.update()</literal> o "
 "<literal>Session.merge()</literal>:"
 
-#: index.docbook:536
+#. Tag: programlisting
+#: session_api.xml:561
+#, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
 "Cat cat = (Cat) firstSession.load(Cat.class, catId);\n"
@@ -1257,7 +1454,9 @@
 "secondSession.update(cat);  // update cat\n"
 "secondSession.update(mate); // update mate]]>"
 
-#: index.docbook:538
+#. Tag: para
+#: session_api.xml:563
+#, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
 "already been loaded by <literal>secondSession</literal> when the application "
@@ -1268,15 +1467,17 @@
 "aplicaci&#x00f3;n intent&#x00f3; volver a unirlo, se habr&#x00ed;a lanzado "
 "una excepci&#x00f3;n."
 
-#: index.docbook:544
+#. Tag: para
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "Usa <literal>update()</literal> si no est&#x00e1;s seguro que la sesi&#x00f3;"
 "n tenga una instancia ya persistente con el mismo identificador, y "
@@ -1287,13 +1488,15 @@
 "que la re-uni&#x00f3;n de tus instancias separadas es la primera "
 "operaci&#x00f3;n que se ejecuta."
 
-#: index.docbook:553
+#. Tag: para
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "La aplicaci&#x00f3;n debe actualizar individualmente las instancias "
 "separadas alcanzables por la instancia separada dada llamando a "
@@ -1302,17 +1505,21 @@
 "ser automatizado usando <emphasis>persistencia transitiva</emphasis>, ver "
 "<xref linkend=\"objectstate-transitive\"/>."
 
-#: index.docbook:560
+#. Tag: para
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "El m&#x00e9;todo <literal>lock()</literal> tambi&#x00e9;n permite a una "
 "aplicaci&#x00f3;n reasociar un objeto con una sesi&#x00f3;n nueva. Sin "
 "embargo, la instancia separada no puede haber sido modificada!"
 
-#: index.docbook:565
+#. Tag: programlisting
+#: session_api.xml:590
+#, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
 "sess.lock(fritz, LockMode.NONE);\n"
@@ -1328,10 +1535,12 @@
 "//do a version check, using SELECT ... FOR UPDATE, then reassociate:\n"
 "sess.lock(pk, LockMode.UPGRADE);]]>"
 
-#: index.docbook:567
+#. Tag: para
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1341,7 +1550,9 @@
 "informaci&#x00f3;n. La re-uni&#x00f3;n no es el &#x00fa;nico caso de uso "
 "para <literal>lock()</literal>."
 
-#: index.docbook:574
+#. Tag: para
+#: session_api.xml:599
+#, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
 "\"transactions-optimistic\"/>."
@@ -1349,11 +1560,15 @@
 "Se discuten otros modelos para unidades de trabajo largas en <xref linkend="
 "\"transactions-optimistic\"/>."
 
-#: index.docbook:581
+#. Tag: title
+#: session_api.xml:606
+#, no-c-format
 msgid "Automatic state detection"
 msgstr "Detecci&#x00f3;n autom&#x00e1;tica de estado"
 
-#: index.docbook:583
+#. Tag: para
+#: session_api.xml:608
+#, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
 "transient instance by generating a new identifier or updates/reattaches the "
@@ -1366,7 +1581,9 @@
 "su identificador actual. El m&#x00e9;todo <literal>saveOrUpdate()</literal> "
 "implementa esta funcionalidad."
 
-#: index.docbook:590
+#. Tag: programlisting
+#: session_api.xml:615
+#, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
 "Cat cat = (Cat) firstSession.load(Cat.class, catID);\n"
@@ -1394,7 +1611,9 @@
 "secondSession.saveOrUpdate(mate);  // save the new instance (mate has a null "
 "id)]]>"
 
-#: index.docbook:592
+#. Tag: para
+#: session_api.xml:617
+#, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
 "confusing for new users. Firstly, so long as you are not trying to use "
@@ -1410,7 +1629,9 @@
 "</literal>, o <literal>merge()</literal>. Algunas aplicaciones enteras nunca "
 "usar&#x00e1;n ninguno de estos m&#x00e9;todos."
 
-#: index.docbook:600
+#. Tag: para
+#: session_api.xml:625
+#, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
 "used in the following scenario:"
@@ -1418,23 +1639,33 @@
 "Usualmente <literal>update()</literal> o <literal>saveOrUpdate()</literal> "
 "se usan en el siguiente escenario:"
 
-#: index.docbook:607
+#. Tag: para
+#: session_api.xml:632
+#, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "la aplicaci&#x00f3;n carga un objeto en la primera sesi&#x00f3;n"
 
-#: index.docbook:612
+#. Tag: para
+#: session_api.xml:637
+#, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "el objeto es pasado a la capa de UI"
 
-#: index.docbook:617
+#. Tag: para
+#: session_api.xml:642
+#, no-c-format
 msgid "some modifications are made to the object"
 msgstr "se hacen algunas modificaciones al objeto"
 
-#: index.docbook:622
+#. Tag: para
+#: session_api.xml:647
+#, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "el objeto se pasa abajo de regreso a la capa de negocio"
 
-#: index.docbook:627
+#. Tag: para
+#: session_api.xml:652
+#, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
 "literal> in a second session"
@@ -1442,15 +1673,21 @@
 "la aplicaci&#x00f3;n hace estas modificaciones persistentes llamando a "
 "<literal>update()</literal> en una segunda sesi&#x00f3;n"
 
-#: index.docbook:634
+#. Tag: para
+#: session_api.xml:659
+#, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal> hace lo siguiente:"
 
-#: index.docbook:640
+#. Tag: para
+#: session_api.xml:665
+#, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr "si el objeto ya es persistente en esta sesi&#x00f3;n, no hace nada"
 
-#: index.docbook:645
+#. Tag: para
+#: session_api.xml:670
+#, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
 "an exception"
@@ -1458,13 +1695,17 @@
 "si otro objeto asociado con la sesi&#x00f3;n tiene el mismo identificador, "
 "lanza una excepci&#x00f3;n"
 
-#: index.docbook:651
+#. Tag: para
+#: session_api.xml:676
+#, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
 "si el objeto no tiene ninguna propiedad identificadora, lo salva llamando a "
 "<literal>save()</literal>"
 
-#: index.docbook:656
+#. Tag: para
+#: session_api.xml:681
+#, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
 "object, <literal>save()</literal> it"
@@ -1472,10 +1713,12 @@
 "si el identificador del objeto tiene el valor asignado a un objeto "
 "reci&#x00e9;n instanciado, lo salva llamando a <literal>save()</literal>"
 
-#: index.docbook:662
+#. Tag: para
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1484,17 +1727,23 @@
 "de versi&#x00f3;n es el mismo valor asignado a una objeto reci&#x00e9;n "
 "instanciado, lo salva llamando a <literal>save()</literal>"
 
-#: index.docbook:670
+#. Tag: para
+#: session_api.xml:695
+#, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr ""
 "en cualquier otro caso se actualiza el objeto llamando a <literal>update()</"
 "literal>"
 
-#: index.docbook:676
+#. Tag: para
+#: session_api.xml:701
+#, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "y <literal>merge()</literal> es muy diferente:"
 
-#: index.docbook:682
+#. Tag: para
+#: session_api.xml:707
+#, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
 "associated with the session, copy the state of the given object onto the "
@@ -1504,7 +1753,9 @@
 "actualmente con la sesi&#x00f3;n, copia el estado del objeto dado en la "
 "instancia persistente"
 
-#: index.docbook:689
+#. Tag: para
+#: session_api.xml:714
+#, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
 "try to load it from the database, or create a new persistent instance"
@@ -1513,11 +1764,15 @@
 "sesi&#x00f3;n, intente cargarla de la base de datos, o crear una nueva "
 "instancia persistente"
 
-#: index.docbook:695
+#. Tag: para
+#: session_api.xml:720
+#, no-c-format
 msgid "the persistent instance is returned"
 msgstr "la instancia persistente es devuelta"
 
-#: index.docbook:700
+#. Tag: para
+#: session_api.xml:725
+#, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
 "detached"
@@ -1525,32 +1780,40 @@
 "la instancia dada no resulta ser asociada a la sesi&#x00f3;n, permanece "
 "separada"
 
-#: index.docbook:710
+#. Tag: title
+#: session_api.xml:735
+#, no-c-format
 msgid "Deleting persistent objects"
 msgstr "Borrando objetos persistentes"
 
-#: index.docbook:712
+#. Tag: para
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "<literal>Session.delete()</literal> quitar&#x00e1; el estado de un objeto de "
 "la base de datos. Por supuesto, tu aplicaci&#x00f3;n podr&#x00ed;a tener "
 "a&#x00fa;n una referencia a un objeto borrado. Lo mejor es pensar en "
 "<literal>delete()</literal> como hacer transitoria una instancia persistente."
 
-#: index.docbook:719
+#. Tag: programlisting
+#: session_api.xml:744
+#, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr "<![CDATA[sess.delete(cat);]]>"
 
-#: index.docbook:721
+#. Tag: para
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "Puedes borrar los objetos en el orden que gustes, sin riesgo de violaciones "
 "de restricci&#x00f3;n de clave for&#x00e1;nea. A&#x00fa;n es posible violar "
@@ -1558,13 +1821,17 @@
 "for&#x00e1;nea borrando objetos en un orden err&#x00f3;neo, por ejemplo, si "
 "borras el padre, pero olvidas borrar los hijos."
 
-#: index.docbook:732
+#. Tag: title
+#: session_api.xml:757
+#, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "Replicando objetos entre dos almac&#x00e9;nes de datos diferentes"
 
-#: index.docbook:734
+#. Tag: para
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1572,7 +1839,9 @@
 "persistentes y hacerlas persistentes en un almac&#x00e9;n de datos "
 "diferente, sin regenerar los valores identificadores."
 
-#: index.docbook:740
+#. Tag: programlisting
+#: session_api.xml:765
+#, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
 "Session session1 = factory1.openSession();\n"
@@ -1602,42 +1871,52 @@
 "tx2.commit();\n"
 "session2.close();]]>"
 
-#: index.docbook:742
+#. Tag: para
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "El <literal>ReplicationMode</literal> determina c&#x00f3;mo "
 "<literal>replicate()</literal> tratar&#x00e1; los conflictos con filas "
 "existentes en la base de datos."
 
-#: index.docbook:749
+#. Tag: para
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.IGNORE</literal> - ignora el objeto cuando existe "
 "una fila de base de datos con el mismo identificador"
 
-#: index.docbook:755
+#. Tag: para
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.OVERWRITE</literal> - sobrescribe cualquier fila de "
 "base de datos existente con el mismo identificador"
 
-#: index.docbook:761
+#. Tag: para
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.EXCEPTION</literal> - lanza una excepci&#x00f3;n si "
 "existe una fila de base de datos con el mismo identificador"
 
-#: index.docbook:767
+#. Tag: para
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1645,7 +1924,9 @@
 "su n&#x00fa;mero de versi&#x00f3;n es anterior al n&#x00fa;mero de "
 "versi&#x00f3;n del objeto, o en caso contrario ignora el objeto"
 
-#: index.docbook:775
+#. Tag: para
+#: session_api.xml:800
+#, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
 "database instances, upgrading system configuration information during "
@@ -1658,16 +1939,20 @@
 "actualizaciones de producto, deshacer cambios producidos durante "
 "transacciones no-ACID y m&#x00e1;s."
 
-#: index.docbook:784
+#. Tag: title
+#: session_api.xml:809
+#, no-c-format
 msgid "Flushing the Session"
 msgstr "Limpiando (flushing) la sesi&#x00f3;n"
 
-#: index.docbook:786
+#. Tag: para
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "Cada tanto, la <literal>Session</literal> ejecutar&#x00e1; las sentencias "
 "SQL necesarias para sincronizar el estado de la conexi&#x00f3;n JDBC con el "
@@ -1675,72 +1960,95 @@
 "<emphasis>limpieza (flush)</emphasis>, ocurre por defecto en los siguientes "
 "puntos"
 
-#: index.docbook:795
+#. Tag: para
+#: session_api.xml:820
+#, no-c-format
 msgid "before some query executions"
 msgstr "antes de algunas ejecuciones de consulta"
 
-#: index.docbook:800
+#. Tag: para
+#: session_api.xml:825
+#, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr "desde <literal>org.hibernate.Transaction.commit()</literal>"
 
-#: index.docbook:805
+#. Tag: para
+#: session_api.xml:830
+#, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "desde <literal>Session.flush()</literal>"
 
-#: index.docbook:811
-msgid "The SQL statements are issued in the following order"
+#. Tag: para
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "Las sentencias SQL son liberadas en el siguiente orden"
 
-#: index.docbook:817
+#. Tag: para
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "todas las inserciones de entidades, en el mismo orden que los objetos "
 "correspondientes fueron salvados usando <literal>Session.save()</literal>"
 
-#: index.docbook:823
+#. Tag: para
+#: session_api.xml:848
+#, no-c-format
 msgid "all entity updates"
 msgstr "todas las actualizaciones de entidades"
 
-#: index.docbook:828
+#. Tag: para
+#: session_api.xml:853
+#, no-c-format
 msgid "all collection deletions"
 msgstr "todas los borrados de colecciones"
 
-#: index.docbook:833
+#. Tag: para
+#: session_api.xml:858
+#, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr ""
 "todos los borrados, actualizaciones e inserciones de elementos de "
 "colecci&#x00f3;n"
 
-#: index.docbook:838
+#. Tag: para
+#: session_api.xml:863
+#, no-c-format
 msgid "all collection insertions"
 msgstr "todas las inserciones de colecciones"
 
-#: index.docbook:843
+#. Tag: para
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "todos los borrados de entidades, en el mismo orden que los objetos "
 "correspondientes fueron borrados usando <literal>Session.delete()</literal>"
 
-#: index.docbook:850
+#. Tag: para
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(Una excepci&#x00f3;n es que los objetos que usan generaci&#x00f3;n de ID "
 "<literal>native</literal> se insertan cuando son salvados.)"
 
-#: index.docbook:855
+#. Tag: para
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "Excepto cuando llamas expl&#x00ed;citamente a <literal>flush()</literal>, no "
 "hay en absoluto garant&#x00ed;as sobre <emphasis>cu&#x00e1;ndo</emphasis> la "
@@ -1749,16 +2057,18 @@
 "garantiza que los m&#x00e9;todos <literal>Query.list(..)</literal> nunca "
 "devolver&#x00e1;n datos a&#x00f1;ejos o err&#x00f3;neos."
 
-#: index.docbook:863
+#. Tag: para
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "Es posible cambiar el comportamiento por defecto de modo que la limpieza "
 "(flush) ocurra menos frecuentemente. La clase <literal>FlushMode</literal> "
@@ -1770,7 +2080,9 @@
 "<literal>Session</literal> se mantiene abierta y desconectada por largo "
 "tiempo (ver <xref linkend=\"transactions-optimistic-longsession\"/>)."
 
-#: index.docbook:873
+#. Tag: programlisting
+#: session_api.xml:898
+#, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
 "Transaction tx = sess.beginTransaction();\n"
@@ -1801,7 +2113,9 @@
 "...\n"
 "tx.commit(); // flush occurs]]>"
 
-#: index.docbook:875
+#. Tag: para
+#: session_api.xml:900
+#, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
 "constraint). Since handling exceptions involves some understanding of "
@@ -1814,11 +2128,15 @@
 "transaccional de Hibernate, lo discutimos en <xref linkend=\"transactions\"/"
 ">."
 
-#: index.docbook:884
+#. Tag: title
+#: session_api.xml:909
+#, no-c-format
 msgid "Transitive persistence"
 msgstr "Persistencia transitiva"
 
-#: index.docbook:886
+#. Tag: para
+#: session_api.xml:911
+#, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
 "especially if you deal with a graph of associated objects. A common case is "
@@ -1829,16 +2147,18 @@
 "caso com&#x00fa;n es una relaci&#x00f3;n padre/hijo. Considera el siguiente "
 "ejemplo:"
 
-#: index.docbook:892
+#. Tag: para
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "Si los hijos en una relaci&#x00f3;n padre/hijo pudieran ser tipificados en "
 "valor (por ejemplo, una colecci&#x00f3;n de direcciones o cadenas), sus "
@@ -1851,11 +2171,13 @@
 "tipificados en valor no pueden tener referencias compartidas, borrar&#x00e1; "
 "el hijo de la base de datos."
 
-#: index.docbook:903
+#. Tag: para
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1870,7 +2192,9 @@
 "entidades asociadas. Hibernate no implementa <emphasis>persistencia por "
 "alcance</emphasis>."
 
-#: index.docbook:912
+#. Tag: para
+#: session_api.xml:937
+#, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
 "<literal>persist(), merge(), saveOrUpdate(), delete(), lock(), refresh(), "
@@ -1889,23 +2213,31 @@
 "cascada a lo largo de una asociaci&#x00f3;n, debes indicar eso en el "
 "documento de mapeo. Por ejemplo:"
 
-#: index.docbook:921
+#. Tag: programlisting
+#: session_api.xml:946
+#, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 
-#: index.docbook:923
+#. Tag: para
+#: session_api.xml:948
+#, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "Los estilos de cascada pueden combinarse:"
 
-#: index.docbook:927
+#. Tag: programlisting
+#: session_api.xml:952
+#, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 
-#: index.docbook:929
+#. Tag: para
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -1916,7 +2248,9 @@
 "literal> especifica que ninguna operaci&#x00f3;n ser&#x00e1; tratada en "
 "cascada."
 
-#: index.docbook:935
+#. Tag: para
+#: session_api.xml:960
+#, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
 "one-to-many associations, and indicates that the <literal>delete()</literal> "
@@ -1928,13 +2262,17 @@
 "<literal>delete()</literal> debe aplicarse a cualquier objeto hijo que sea "
 "quitado de la asociaci&#x00f3;n."
 
-#: index.docbook:942
+#. Tag: para
+#: session_api.xml:967
+#, no-c-format
 msgid "Recommendations:"
 msgstr "Recomendaciones:"
 
-#: index.docbook:948
+#. Tag: para
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -1945,7 +2283,9 @@
 "til para las asociaciones <literal>&lt;one-to-one&gt;</literal> y "
 "<literal>&lt;one-to-many&gt;</literal>. associations."
 
-#: index.docbook:956
+#. Tag: para
+#: session_api.xml:981
+#, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
 "object, make it a <emphasis>life cycle object</emphasis> by specifying "
@@ -1956,7 +2296,9 @@
 "ciclo de vida</emphasis> especificando <literal>cascade=\"all,delete-orphan"
 "\"</literal>."
 
-#: index.docbook:963
+#. Tag: para
+#: session_api.xml:988
+#, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
 "often be working with the parent and children together in the same "
@@ -1969,7 +2311,9 @@
 "tipeo, considera usar <literal>cascade=\"persist,merge,save-update\"</"
 "literal>."
 
-#: index.docbook:971
+#. Tag: para
+#: session_api.xml:996
+#, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
 "with <literal>cascade=\"all\"</literal> marks the association as a "
@@ -1982,11 +2326,13 @@
 "emphasis> donde save/update/delete en el padre resulta en save/update/delete "
 "del hijo o hijos."
 
-#: index.docbook:977
+#. Tag: para
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -2001,7 +2347,9 @@
 "sem&#x00e1;ntica precisa de las operaciones en cascada para una "
 "relaci&#x00f3;n padre/hijo es:"
 
-#: index.docbook:988
+#. Tag: para
+#: session_api.xml:1013
+#, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
 "passed to <literal>persist()</literal>"
@@ -2009,7 +2357,9 @@
 "Si un padre le es pasado a <literal>persist()</literal>, todos los hijos le "
 "son pasados a <literal>persist()</literal>"
 
-#: index.docbook:994
+#. Tag: para
+#: session_api.xml:1019
+#, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
 "to <literal>merge()</literal>"
@@ -2017,7 +2367,9 @@
 "Si un padre le es pasado a <literal>merge()</literal>, todos los hijos le "
 "son pasados a <literal>merge()</literal>"
 
-#: index.docbook:1000
+#. Tag: para
+#: session_api.xml:1025
+#, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
 "literal> or <literal>saveOrUpdate()</literal>, all children are passed to "
@@ -2027,7 +2379,9 @@
 "literal> o <literal>saveOrUpdate()</literal>, todos los hijos le son pasados "
 "a <literal>saveOrUpdate()</literal>"
 
-#: index.docbook:1006
+#. Tag: para
+#: session_api.xml:1031
+#, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
 "it is passed to <literal>saveOrUpdate()</literal>"
@@ -2035,7 +2389,9 @@
 "Si un hijo transitorio o separado se vuelve referenciado por un padre "
 "persistente, le es pasado a <literal>saveOrUpdate()</literal>"
 
-#: index.docbook:1012
+#. Tag: para
+#: session_api.xml:1037
+#, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
 "literal>"
@@ -2043,7 +2399,9 @@
 "Si un padre es borrado, todos los hijos le son pasados a <literal>delete()</"
 "literal>"
 
-#: index.docbook:1017
+#. Tag: para
+#: session_api.xml:1042
+#, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
 "happens</emphasis> - the application should explicitly delete the child if "
@@ -2056,12 +2414,14 @@
 "<literal>cascade=\"delete-orphan\"</literal>, en cuyo caso el hijo "
 "\"hu&#x00e9;rfano\" es borrado."
 
-#: index.docbook:1026
+#. Tag: para
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2072,18 +2432,22 @@
 "upate</literal> and <literal>delete-orphan</literal> are transitive for all "
 "associated entities reachable during flush of the <literal>Session</literal>."
 
-#: index.docbook:1038
+#. Tag: title
+#: session_api.xml:1063
+#, no-c-format
 msgid "Using metadata"
 msgstr "Usando metadatos"
 
-#: index.docbook:1040
+#. Tag: para
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "Hibernate requiere de un modelo de meta-nivel muy rico de todas las "
 "entidades y tipos de valor. De vez en cuando, este modelo es muy &#x00fa;til "
@@ -2094,11 +2458,13 @@
 "(por ejemplo, tipos de valor inmutables y, posiblemente, entidades "
 "asociadas)."
 
-#: index.docbook:1047
+#. Tag: para
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "Hibernate expone los metadatos v&#x00ed;a las interfaces "
@@ -2107,7 +2473,9 @@
 "interfaces de metadatos pueden obtenerse de <literal>SessionFactory</"
 "literal>."
 
-#: index.docbook:1054
+#. Tag: programlisting
+#: session_api.xml:1079
+#, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"
 "ClassMetadata catMeta = sessionfactory.getClassMetadata(Cat.class);\n"
@@ -2141,8 +2509,8 @@
 "    }\n"
 "}]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,26 +1,34 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: toolset_guide.xml:29
+#, no-c-format
 msgid "Toolset Guide"
 msgstr "Gu&#x00ed;a del Conjunto de Herramientas"
 
-#: index.docbook:7
+#. Tag: para
+#: toolset_guide.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "La ingenier&#x00ed;a de ida y vuelta con Hibernate es posible usando un "
 "conjunto de plugins de Eclipse, herramientas de l&#x00ed;nea de comandos, "
 "as&#x00ed; como tareas de Ant."
 
-#: index.docbook:12
+#. Tag: para
+#: toolset_guide.xml:36
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -28,12 +36,14 @@
 "plugins para la IDE de Eclipse as&#x00ed; como tareas de Ant para la "
 "ingenier&#x00ed;a inversa de bases de datos existentes:"
 
-#: index.docbook:18
+#. Tag: para
+#: toolset_guide.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>Editor de Mapeo:</emphasis> Un editor de ficheros de mapeo XML, "
 "que soporta autocompleci&#x00f3;n y resaltado de sint&#x00e1;xis. Soporta "
@@ -41,13 +51,15 @@
 "nombres de campos/propiedades, haci&#x00e9;ndolo mucho m&#x00e1;s "
 "vers&#x00e1;til que un editor de XML normal."
 
-#: index.docbook:23
+#. Tag: para
+#: toolset_guide.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>Consola:</emphasis> La consola es una nueva vista en Eclipse. "
 "Adem&#x00e1;s de la vista de &#x00e1;rbol de tus configuraciones de consola, "
@@ -55,14 +67,15 @@
 "relaciones. La console te permite ejecutar consultas HQL contra tu base de "
 "datos y navegar el resultado directamente en Eclipse."
 
-#: index.docbook:30
+#. Tag: para
+#: toolset_guide.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>Asistentes de Desarrollo:</emphasis> Se proveen muchos asistentes "
 "con las herramientas de Eclipse. Puedes usar un asistente para generar "
@@ -72,38 +85,42 @@
 "de mapeo de Hibernate. El asistente de ingenier&#x00ed;a inversa soporta "
 "plantillas personalizables."
 
-#: index.docbook:38
-msgid "Ant Tasks:"
-msgstr "Tareas de Ant:"
-
-#: index.docbook:43
+#. Tag: para
+#: toolset_guide.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "Por favor refi&#x00e9;rete al paquete <emphasis>Herramientas de Hibernate</"
 "emphasis> y su documentaci&#x00f3;n para m&#x00e1;s informaci&#x00f3;n."
 
-#: index.docbook:48
+#. Tag: para
+#: toolset_guide.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "Sin embargo, el paquete principal de Hibernate viene incluyendo una "
 "herramienta integrada (puede ser usada incluso \"dentro\" de Hibernate on-"
 "the-fly): <emphasis>SchemaExport</emphasis> tambi&#x00e9;n conocido como "
 "<literal>hbm2ddl</literal>."
 
-#: index.docbook:55
+#. Tag: title
+#: toolset_guide.xml:79
+#, no-c-format
 msgid "Automatic schema generation"
 msgstr "Generaci&#x00f3;n autom&#x00e1;tica de esquemas"
 
-#: index.docbook:57
+#. Tag: para
+#: toolset_guide.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "Una utilidad de Hibernate puede generar DDL desde tus ficheros de mapeo. El "
@@ -112,29 +129,39 @@
 "tablas y secuencias tambi&#x00e9;n son creadas para los generadores de "
 "identificadores mapeados."
 
-#: index.docbook:64
+#. Tag: para
+#: toolset_guide.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "<emphasis>Debes</emphasis> especificar un <literal>Dialecto</literal> SQL "
 "v&#x00ed;a la propiedad <literal>hibernate.dialect</literal> al usar esta "
 "herramienta, ya que el DDL es altamente espec&#x00ed;fico del vendedor."
 
-#: index.docbook:70
-msgid "First, customize your mapping files to improve the generated schema."
+#. Tag: para
+#: toolset_guide.xml:94
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr "First, customize your mapping files to improve the generated schema."
 
-#: index.docbook:75
+#. Tag: title
+#: toolset_guide.xml:99
+#, no-c-format
 msgid "Customizing the schema"
 msgstr "Personalizando el esquema"
 
-#: index.docbook:77
+#. Tag: para
+#: toolset_guide.xml:101
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "Muchos elementos de mapeo de Hibernate definen un atributo opcional llamado "
@@ -142,33 +169,43 @@
 "tama&#x00f1;o de una columna. (O, para tipos de datos num&#x00e9;ricos/"
 "decimales, la precisi&#x00f3;n.)"
 
-#: index.docbook:84
+#. Tag: programlisting
+#: toolset_guide.xml:108
+#, no-c-format
 msgid "<![CDATA[<property name=\"zip\" length=\"5\"/>]]>"
 msgstr "<![CDATA[<property name=\"zip\" length=\"5\"/>]]>"
 
-#: index.docbook:85
+#. Tag: programlisting
+#: toolset_guide.xml:109
+#, no-c-format
 msgid "<![CDATA[<property name=\"balance\" precision=\"12\" scale=\"2\"/>]]>"
 msgstr "<![CDATA[<property name=\"balance\" precision=\"12\" scale=\"2\"/>]]>"
 
-#: index.docbook:87
+#. Tag: para
+#: toolset_guide.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "Algunas etiquetas tambi&#x00e9;n aceptan un atributo <literal>not-null</"
 "literal> (para generar una restricci&#x00f3;n <literal>NOT NULL</literal> en "
 "columnas de tablas) y y un atributo <literal>unique</literal> (para generar "
 "restricciones <literal>UNIQUE</literal> en columnas de tablas)."
 
-#: index.docbook:93
+#. Tag: programlisting
+#: toolset_guide.xml:117
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" not-null=\"true\"/>]]>"
 msgstr ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" not-null=\"true\"/>]]>"
 
-#: index.docbook:95
+#. Tag: programlisting
+#: toolset_guide.xml:119
+#, no-c-format
 msgid ""
 "<![CDATA[<element column=\"serialNumber\" type=\"long\" not-null=\"true\" "
 "unique=\"true\"/>]]>"
@@ -176,13 +213,15 @@
 "<![CDATA[<element column=\"serialNumber\" type=\"long\" not-null=\"true\" "
 "unique=\"true\"/>]]>"
 
-#: index.docbook:97
+#. Tag: para
+#: toolset_guide.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "A <literal>unique-key</literal> attribute may be used to group columns in a "
 "single unique key constraint. Currently, the specified value of the "
@@ -190,7 +229,9 @@
 "name the constraint in the generated DDL, only to group the columns in the "
 "mapping file."
 
-#: index.docbook:105
+#. Tag: programlisting
+#: toolset_guide.xml:129
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"org\" column=\"orgId\" unique-key="
 "\"OrgEmployeeId\"/>\n"
@@ -200,17 +241,21 @@
 "\"OrgEmployeeId\"/>\n"
 "<property name=\"employeeId\" unique-key=\"OrgEmployee\"/>]]>"
 
-#: index.docbook:107
+#. Tag: para
+#: toolset_guide.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "An <literal>index</literal> attribute specifies the name of an index that "
 "will be created using the mapped column or columns. Multiple columns may be "
 "grouped into the same index, simply by specifying the same index name."
 
-#: index.docbook:113
+#. Tag: programlisting
+#: toolset_guide.xml:137
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
 "<property name=\"firstName\" index=\"CustName\"/>]]>"
@@ -218,15 +263,19 @@
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
 "        <property name=\"firstName\" index=\"CustName\"/>]]>"
 
-#: index.docbook:115
+#. Tag: para
+#: toolset_guide.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "A <literal>foreign-key</literal> attribute may be used to override the name "
 "of any generated foreign key constraint."
 
-#: index.docbook:120
+#. Tag: programlisting
+#: toolset_guide.xml:144
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" foreign-key=\"FKFooBar\"/"
 ">]]>"
@@ -234,7 +283,9 @@
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" foreign-key=\"FKFooBar\"/"
 ">]]>"
 
-#: index.docbook:122
+#. Tag: para
+#: toolset_guide.xml:146
+#, no-c-format
 msgid ""
 "Many mapping elements also accept a child <literal>&lt;column&gt;</literal> "
 "element. This is particularly useful for mapping multi-column types:"
@@ -242,7 +293,9 @@
 "Many mapping elements also accept a child <literal>&lt;column&gt;</literal> "
 "element. This is particularly useful for mapping multi-column types:"
 
-#: index.docbook:127
+#. Tag: programlisting
+#: toolset_guide.xml:151
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
 "    <column name=\"last\" not-null=\"true\" index=\"bar_idx\" length=\"30\"/"
@@ -260,17 +313,21 @@
 "        <column name=\"initial\"/>\n"
 "</property>]]>"
 
-#: index.docbook:129
+#. Tag: para
+#: toolset_guide.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "The <literal>default</literal> attribute lets you specify a default value "
 "for a column (you should assign the same value to the mapped property before "
 "saving a new instance of the mapped class)."
 
-#: index.docbook:135
+#. Tag: programlisting
+#: toolset_guide.xml:159
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
 "    <column name=\"credits\" default=\"10\"/>\n"
@@ -280,7 +337,9 @@
 "                <column name=\"credits\" default=\"10\"/>\n"
 "        </property>]]>"
 
-#: index.docbook:137
+#. Tag: programlisting
+#: toolset_guide.xml:161
+#, no-c-format
 msgid ""
 "<![CDATA[<version name=\"version\" type=\"integer\" insert=\"false\">\n"
 "    <column name=\"version\" default=\"0\"/>\n"
@@ -290,7 +349,9 @@
 "                <column name=\"version\" default=\"0\"/>\n"
 "        </property>]]>"
 
-#: index.docbook:139
+#. Tag: para
+#: toolset_guide.xml:163
+#, no-c-format
 msgid ""
 "The <literal>sql-type</literal> attribute allows the user to override the "
 "default mapping of a Hibernate type to SQL datatype."
@@ -298,7 +359,9 @@
 "El atributo <literal>sql-type</literal> permite al usuario sobrescribir el "
 "mapeo por defecto de tipo Hibernate a tipo de datos SQL."
 
-#: index.docbook:144
+#. Tag: programlisting
+#: toolset_guide.xml:168
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
 "    <column name=\"balance\" sql-type=\"decimal(13,3)\"/>\n"
@@ -309,7 +372,9 @@
 "\"/>\n"
 "</property>]]>"
 
-#: index.docbook:146
+#. Tag: para
+#: toolset_guide.xml:170
+#, no-c-format
 msgid ""
 "The <literal>check</literal> attribute allows you to specify a check "
 "constraint."
@@ -317,7 +382,9 @@
 "El atributo <literal>check</literal> te permite especificar una "
 "comprobaci&#x00f3;n de restricci&#x00f3;n."
 
-#: index.docbook:150
+#. Tag: programlisting
+#: toolset_guide.xml:174
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"foo\" type=\"integer\">\n"
 "    <column name=\"foo\" check=\"foo > 10\"/>\n"
@@ -327,7 +394,9 @@
 "    <column name=\"foo\" check=\"foo > 10\"/>\n"
 "</property>]]>"
 
-#: index.docbook:152
+#. Tag: programlisting
+#: toolset_guide.xml:176
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Foo\" table=\"foos\" check=\"bar < 100.0\">\n"
 "    ...\n"
@@ -339,105 +408,161 @@
 "    <property name=\"bar\" type=\"float\"/>\n"
 "</class>]]>"
 
-#: index.docbook:156
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:182
+#, no-c-format
 msgid "Summary"
 msgstr "Resumen"
 
-#: index.docbook:163
+#. Tag: entry
+#: toolset_guide.xml:189
+#, no-c-format
 msgid "Attribute"
 msgstr "Atributo"
 
-#: index.docbook:164
+#. Tag: entry
+#: toolset_guide.xml:190
+#, no-c-format
 msgid "Values"
 msgstr "Valores"
 
-#: index.docbook:165
+#. Tag: entry
+#: toolset_guide.xml:191
+#, no-c-format
 msgid "Interpretation"
 msgstr "Interpretaci&#x00f3;n"
 
-#: index.docbook:170
+#. Tag: literal
+#: toolset_guide.xml:196
+#, no-c-format
 msgid "length"
 msgstr "length"
 
-#: index.docbook:171, index.docbook:176, index.docbook:181
+#. Tag: entry
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
+#, no-c-format
 msgid "number"
 msgstr "number"
 
-#: index.docbook:172
+#. Tag: entry
+#: toolset_guide.xml:198
+#, no-c-format
 msgid "column length"
 msgstr "largo de columna/precisi&#x00f3;n decimal"
 
-#: index.docbook:175
+#. Tag: literal
+#: toolset_guide.xml:201
+#, no-c-format
 msgid "precision"
 msgstr "precision"
 
-#: index.docbook:177
+#. Tag: entry
+#: toolset_guide.xml:203
+#, no-c-format
 msgid "column decimal precision"
 msgstr "column decimal precision"
 
-#: index.docbook:180
+#. Tag: literal
+#: toolset_guide.xml:206
+#, no-c-format
 msgid "scale"
 msgstr "scale"
 
-#: index.docbook:182
+#. Tag: entry
+#: toolset_guide.xml:208
+#, no-c-format
 msgid "column decimal scale"
 msgstr "column decimal scale"
 
-#: index.docbook:185
+#. Tag: literal
+#: toolset_guide.xml:211
+#, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
-#: index.docbook:186, index.docbook:191
+#. Tag: literal
+#: toolset_guide.xml:212 toolset_guide.xml:217
+#, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
-#: index.docbook:187
-msgid "specfies that the column should be non-nullable"
+#. Tag: entry
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "especifica que la columna debe ser no nulable"
 
-#: index.docbook:190
+#. Tag: literal
+#: toolset_guide.xml:216
+#, no-c-format
 msgid "unique"
 msgstr "unique"
 
-#: index.docbook:192
+#. Tag: entry
+#: toolset_guide.xml:218
+#, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr ""
 "especifica que la columna debe tener una restricci&#x00f3;n de unicidad"
 
-#: index.docbook:195
+#. Tag: literal
+#: toolset_guide.xml:221
+#, no-c-format
 msgid "index"
 msgstr "index"
 
-#: index.docbook:196
+#. Tag: literal
+#: toolset_guide.xml:222
+#, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
-#: index.docbook:197
+#. Tag: entry
+#: toolset_guide.xml:223
+#, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "especifica el nombre de un &#x00ed;ndice (multicolumna)"
 
-#: index.docbook:200
+#. Tag: literal
+#: toolset_guide.xml:226
+#, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
-#: index.docbook:201
+#. Tag: literal
+#: toolset_guide.xml:227
+#, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
-#: index.docbook:202
+#. Tag: entry
+#: toolset_guide.xml:228
+#, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr ""
 "especifica el nombre de una restricci&#x00f3;n de unicidad multicolumna"
 
-#: index.docbook:205
+#. Tag: literal
+#: toolset_guide.xml:231
+#, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
-#: index.docbook:206
+#. Tag: literal
+#: toolset_guide.xml:232
+#, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
-#: index.docbook:207
+#. Tag: entry
+#: toolset_guide.xml:233
+#, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
 "association, for a <literal>&lt;one-to-one&gt;</literal>, <literal>&lt;many-"
@@ -452,15 +577,21 @@
 "lados <literal>inverse=\"true\"</literal> no ser&#x00e1;n considerados por "
 "<literal>SchemaExport</literal>."
 
-#: index.docbook:217
+#. Tag: literal
+#: toolset_guide.xml:243
+#, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
-#: index.docbook:218
+#. Tag: literal
+#: toolset_guide.xml:244
+#, no-c-format
 msgid "SQL column type"
 msgstr "column_type"
 
-#: index.docbook:219
+#. Tag: entry
+#: toolset_guide.xml:245
+#, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
 "literal> element only)"
@@ -468,28 +599,40 @@
 "sobrescribe el tipo de columna por defecto (s&#x00f3;lo atributo del "
 "elemento <literal>&lt;column&gt;</literal>)"
 
-#: index.docbook:225
+#. Tag: literal
+#: toolset_guide.xml:251
+#, no-c-format
 msgid "default"
 msgstr "default"
 
-#: index.docbook:226, index.docbook:233
+#. Tag: entry
+#: toolset_guide.xml:252 toolset_guide.xml:259
+#, no-c-format
 msgid "SQL expression"
 msgstr "SQL expression"
 
-#: index.docbook:227
+#. Tag: entry
+#: toolset_guide.xml:253
+#, no-c-format
 msgid "specify a default value for the column"
 msgstr "specify a default value for the column"
 
-#: index.docbook:232
+#. Tag: literal
+#: toolset_guide.xml:258
+#, no-c-format
 msgid "check"
 msgstr "check"
 
-#: index.docbook:234
+#. Tag: entry
+#: toolset_guide.xml:260
+#, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr ""
 "crea una restricci&#x00f3;n de comprobaci&#x00f3;n SQL en columna o tabla"
 
-#: index.docbook:242
+#. Tag: para
+#: toolset_guide.xml:268
+#, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
 "comments for the generated schema."
@@ -497,7 +640,9 @@
 "El elemento <literal>&lt;comment&gt;</literal> te permite especificar un "
 "comentario para el esquema generado."
 
-#: index.docbook:247
+#. Tag: programlisting
+#: toolset_guide.xml:273
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
 "    <comment>Current customers only</comment>\n"
@@ -509,7 +654,9 @@
 "    ...\n"
 "</class>]]>"
 
-#: index.docbook:249
+#. Tag: programlisting
+#: toolset_guide.xml:275
+#, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
 "    <column name=\"bal\">\n"
@@ -523,20 +670,26 @@
 "    </column>\n"
 "</property>]]>"
 
-#: index.docbook:251
+#. Tag: para
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "Esto resulta en una sentencia <literal>comment on table</literal> o "
 "<literal>comment on column</literal> en el DDL generado (donde est&#x00e9; "
 "soportado)."
 
-#: index.docbook:260
+#. Tag: title
+#: toolset_guide.xml:286
+#, no-c-format
 msgid "Running the tool"
 msgstr "Ejecutando la herramienta"
 
-#: index.docbook:262
+#. Tag: para
+#: toolset_guide.xml:288
+#, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
 "and/or executes the DDL statements."
@@ -544,8 +697,19 @@
 "La herramienta <literal>SchemaExport</literal> escribe un gui&#x00f3;n DDL a "
 "la salida est&#x00e1;ndar y/o ejecuta las sentencias DDL."
 
-#: index.docbook:267
+#. Tag: para
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
 msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr ""
+"Opciones de L&#x00ed;nea de Comandos de <literal>SchemaExport</literal>"
+
+#. Tag: para
+#: toolset_guide.xml:295
+#, no-c-format
+msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
 "<literal>org.hibernate.tool.hbm2ddl.SchemaExport</literal> <emphasis>options "
 "mapping_files</emphasis>"
@@ -554,106 +718,157 @@
 "<literal>org.hibernate.tool.hbm2ddl.SchemaExport</literal> "
 "<emphasis>opciones ficheros_de_mapeo</emphasis>"
 
-#: index.docbook:273
+#. Tag: title
+#: toolset_guide.xml:301
+#, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr ""
 "Opciones de L&#x00ed;nea de Comandos de <literal>SchemaExport</literal>"
 
-#: index.docbook:279, index.docbook:429, index.docbook:498
+#. Tag: entry
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
+#, no-c-format
 msgid "Option"
 msgstr "Opci&#x00f3;n"
 
-#: index.docbook:280, index.docbook:367, index.docbook:430, index.docbook:499
+#. Tag: entry
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
+#, no-c-format
 msgid "Description"
 msgstr "Descripci&#x00f3;n"
 
-#: index.docbook:285, index.docbook:435
+#. Tag: literal
+#: toolset_guide.xml:313 toolset_guide.xml:463
+#, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
-#: index.docbook:286, index.docbook:436
-msgid "don't output the script to stdout"
+#. Tag: entry
+#: toolset_guide.xml:314 toolset_guide.xml:464
+#, fuzzy, no-c-format
+msgid "do not output the script to stdout"
 msgstr "no enviar a salida est&#x00e1;ndar el gui&#x00f3;n"
 
-#: index.docbook:289
+#. Tag: literal
+#: toolset_guide.xml:317
+#, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
-#: index.docbook:290
+#. Tag: entry
+#: toolset_guide.xml:318
+#, no-c-format
 msgid "only drop the tables"
 msgstr "s&#x00f3;lo desechar las tablas"
 
-#: index.docbook:293
+#. Tag: literal
+#: toolset_guide.xml:321
+#, no-c-format
 msgid "--create"
 msgstr "--create"
 
-#: index.docbook:294
+#. Tag: entry
+#: toolset_guide.xml:322
+#, no-c-format
 msgid "only create the tables"
 msgstr "only create the tables"
 
-#: index.docbook:297, index.docbook:439
+#. Tag: literal
+#: toolset_guide.xml:325 toolset_guide.xml:467
+#, no-c-format
 msgid "--text"
 msgstr "--text"
 
-#: index.docbook:298
-msgid "don't export to the database"
+#. Tag: entry
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "no exportar a la base de datos"
 
-#: index.docbook:301
+#. Tag: literal
+#: toolset_guide.xml:329
+#, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
-#: index.docbook:302
+#. Tag: entry
+#: toolset_guide.xml:330
+#, no-c-format
 msgid "output the ddl script to a file"
 msgstr "enviar la salida del gui&#x00f3;n ddl a un fichero"
 
-#: index.docbook:305, index.docbook:443, index.docbook:504
+#. Tag: literal
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
+#, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
-#: index.docbook:306, index.docbook:444, index.docbook:505
+#. Tag: entry
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
+#, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "select a <literal>NamingStrategy</literal>"
 
-#: index.docbook:309, index.docbook:451, index.docbook:512
+#. Tag: literal
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
+#, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
-#: index.docbook:310
+#. Tag: entry
+#: toolset_guide.xml:338
+#, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "lee la configuraci&#x00f3;n de Hibernate de un fichero XML"
 
-#: index.docbook:313, index.docbook:447, index.docbook:508
+#. Tag: literal
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
+#, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
-#: index.docbook:314, index.docbook:448, index.docbook:509
+#. Tag: entry
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
+#, no-c-format
 msgid "read database properties from a file"
 msgstr "lee las propiedades de base de datos de un fichero"
 
-#: index.docbook:317
+#. Tag: literal
+#: toolset_guide.xml:345
+#, no-c-format
 msgid "--format"
 msgstr "--format"
 
-#: index.docbook:318
+#. Tag: entry
+#: toolset_guide.xml:346
+#, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "formatea agradablemente el SQL generado en el gui&#x00f3;n"
 
-#: index.docbook:321
+#. Tag: literal
+#: toolset_guide.xml:349
+#, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=x"
 
-#: index.docbook:322
+#. Tag: entry
+#: toolset_guide.xml:350
+#, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "establece un delimitador de fin de l&#x00ed;nea para el gui&#x00f3;n"
 
-#: index.docbook:328
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#. Tag: para
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 "Puedes incluso encajar <literal>SchemaExport</literal> en tu aplicaci&#x00f3;"
 "n:"
 
-#: index.docbook:332
+#. Tag: programlisting
+#: toolset_guide.xml:360
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
 "new SchemaExport(cfg).create(false, true);]]>"
@@ -661,15 +876,21 @@
 "<![CDATA[Configuration cfg = ....;\n"
 "new SchemaExport(cfg).create(false, true);]]>"
 
-#: index.docbook:337
+#. Tag: title
+#: toolset_guide.xml:365
+#, no-c-format
 msgid "Properties"
 msgstr "Propiedades"
 
-#: index.docbook:339
-msgid "Database properties may be specified"
+#. Tag: para
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "Las propiedades de base de datos pueden especificarse"
 
-#: index.docbook:345
+#. Tag: para
+#: toolset_guide.xml:373
+#, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
 "emphasis>"
@@ -677,79 +898,115 @@
 "como propiedades de sistema con <literal>-D</literal><emphasis>&lt;"
 "property&gt;</emphasis>"
 
-#: index.docbook:348
+#. Tag: para
+#: toolset_guide.xml:376
+#, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "en <literal>hibernate.properties</literal>"
 
-#: index.docbook:351
+#. Tag: para
+#: toolset_guide.xml:379
+#, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
 "en un fichero de propiedades mencionado con <literal>--properties</literal>"
 
-#: index.docbook:355
+#. Tag: para
+#: toolset_guide.xml:383
+#, no-c-format
 msgid "The needed properties are:"
 msgstr "Las propiedades necesarias son:"
 
-#: index.docbook:360
+#. Tag: title
+#: toolset_guide.xml:388
+#, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "Propiedades de Conexi&#x00f3;n de SchemaExport"
 
-#: index.docbook:366
+#. Tag: entry
+#: toolset_guide.xml:394
+#, no-c-format
 msgid "Property Name"
 msgstr "Nombre de Propiedad"
 
-#: index.docbook:372
+#. Tag: literal
+#: toolset_guide.xml:400
+#, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
-#: index.docbook:373
+#. Tag: entry
+#: toolset_guide.xml:401
+#, no-c-format
 msgid "jdbc driver class"
 msgstr "clase del driver jdbc"
 
-#: index.docbook:376
+#. Tag: literal
+#: toolset_guide.xml:404
+#, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
-#: index.docbook:377
+#. Tag: entry
+#: toolset_guide.xml:405
+#, no-c-format
 msgid "jdbc url"
 msgstr "url de jdbc"
 
-#: index.docbook:380
+#. Tag: literal
+#: toolset_guide.xml:408
+#, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
-#: index.docbook:381
+#. Tag: entry
+#: toolset_guide.xml:409
+#, no-c-format
 msgid "database user"
 msgstr "usuario de base de datos"
 
-#: index.docbook:384
+#. Tag: literal
+#: toolset_guide.xml:412
+#, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
-#: index.docbook:385
+#. Tag: entry
+#: toolset_guide.xml:413
+#, no-c-format
 msgid "user password"
 msgstr "contrase&#x00f1;a de usuario"
 
-#: index.docbook:388
+#. Tag: literal
+#: toolset_guide.xml:416
+#, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
-#: index.docbook:389
+#. Tag: entry
+#: toolset_guide.xml:417
+#, no-c-format
 msgid "dialect"
 msgstr "dialecto"
 
-#: index.docbook:398
+#. Tag: title
+#: toolset_guide.xml:426
+#, no-c-format
 msgid "Using Ant"
 msgstr "Usando Ant"
 
-#: index.docbook:400
+#. Tag: para
+#: toolset_guide.xml:428
+#, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
 msgstr ""
 "Puedes llamar a <literal>SchemaExport</literal> desde tu gui&#x00f3;n de "
 "construcci&#x00f3;n de Ant:"
 
-#: index.docbook:404
+#. Tag: programlisting
+#: toolset_guide.xml:432
+#, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
 "    <taskdef name=\"schemaexport\"\n"
@@ -787,23 +1044,28 @@
 "    </schemaexport>\n"
 "</target>]]>"
 
-#: index.docbook:409
+#. Tag: title
+#: toolset_guide.xml:437
+#, no-c-format
 msgid "Incremental schema updates"
 msgstr "Actualizaciones incrementales de esquema"
 
-#: index.docbook:411
+#. Tag: para
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "La herramienta <literal>SchemaUpdate</literal> actualizar&#x00e1; un esquema "
 "existente con cambios \"incrementales\". Nota que <literal>SchemaUpdate</"
 "literal> depende fuertemente de la API de metadatos de JDBC, de modo que no "
 "funcionar&#x00e1; con todos los drivers JDBC."
 
-#: index.docbook:417
+#. Tag: para
+#: toolset_guide.xml:445
+#, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
 "<literal>org.hibernate.tool.hbm2ddl.SchemaUpdate</literal> <emphasis>options "
@@ -813,25 +1075,35 @@
 "<literal>org.hibernate.tool.hbm2ddl.SchemaUpdate</literal> "
 "<emphasis>opciones ficheros_de_mapeo</emphasis>"
 
-#: index.docbook:423
+#. Tag: title
+#: toolset_guide.xml:451
+#, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr ""
 "Opciones de L&#x00ed;nea de Comandos de <literal>SchemaUpdate</literal>"
 
-#: index.docbook:440
-msgid "don't export the script to the database"
+#. Tag: entry
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "don't export the script to the database"
 
-#: index.docbook:452, index.docbook:513
+#. Tag: entry
+#: toolset_guide.xml:480 toolset_guide.xml:542
+#, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr "specify a <literal>.cfg.xml</literal> file"
 
-#: index.docbook:458
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#. Tag: para
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 "Puedes encajar <literal>SchemaUpdate</literal> en tu aplicaci&#x00f3;n:"
 
-#: index.docbook:462
+#. Tag: programlisting
+#: toolset_guide.xml:490
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
 "new SchemaUpdate(cfg).execute(false);]]>"
@@ -839,16 +1111,22 @@
 "<![CDATA[Configuration cfg = ....;\n"
 "new SchemaUpdate(cfg).execute(false);]]>"
 
-#: index.docbook:467
+#. Tag: title
+#: toolset_guide.xml:495
+#, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "Usando Ant para actualizaciones incrementales de esquema"
 
-#: index.docbook:469
+#. Tag: para
+#: toolset_guide.xml:497
+#, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 "Puedes llamar a <literal>SchemaUpdate</literal> desde el gui&#x00f3;n de Ant:"
 
-#: index.docbook:473
+#. Tag: programlisting
+#: toolset_guide.xml:501
+#, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
 "    <taskdef name=\"schemaupdate\"\n"
@@ -878,17 +1156,21 @@
 "    </schemaupdate>\n"
 "</target>]]>"
 
-#: index.docbook:478
+#. Tag: title
+#: toolset_guide.xml:506
+#, no-c-format
 msgid "Schema validation"
 msgstr "Schema validation"
 
-#: index.docbook:480
+#. Tag: para
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
 "database schema \"matches\" your mapping documents. Note that "
@@ -896,7 +1178,9 @@
 "API, so it will not work with all JDBC drivers. This tool is extremely "
 "useful for testing."
 
-#: index.docbook:486
+#. Tag: para
+#: toolset_guide.xml:514
+#, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
 "<literal>org.hibernate.tool.hbm2ddl.SchemaValidator</literal> "
@@ -906,15 +1190,29 @@
 "<literal>org.hibernate.tool.hbm2ddl.SchemaValidator</literal> "
 "<emphasis>options mapping_files</emphasis>"
 
-#: index.docbook:492
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal> Command Line Options"
+
+#. Tag: title
+#: toolset_guide.xml:521
+#, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> Command Line Options"
 
-#: index.docbook:519
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#. Tag: para
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr "You may embed <literal>SchemaValidator</literal> in your application:"
 
-#: index.docbook:523
+#. Tag: programlisting
+#: toolset_guide.xml:552
+#, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
 "new SchemaValidator(cfg).validate();]]>"
@@ -923,15 +1221,21 @@
 "                                                       new SchemaValidator"
 "(cfg).validate();]]>"
 
-#: index.docbook:528
+#. Tag: title
+#: toolset_guide.xml:557
+#, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "Using Ant for schema validation"
 
-#: index.docbook:530
+#. Tag: para
+#: toolset_guide.xml:559
+#, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr "You can call <literal>SchemaValidator</literal> from the Ant script:"
 
-#: index.docbook:534
+#. Tag: programlisting
+#: toolset_guide.xml:563
+#, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
 "    <taskdef name=\"schemavalidator\"\n"
@@ -962,8 +1266,11 @@
 "                                </schemavalidator>\n"
 "                        </target>]]>"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "Ant Tasks:"
+#~ msgstr "Tareas de Ant:"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
-#, no-c-format
-msgid "Transactions And Concurrency"
+#: transactions.xml:29
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "Transacciones y Concurrencia"
 
 #. Tag: para
-#: transactions.xml:7
-#, no-c-format
+#: transactions.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "El punto más importante sobre Hibernate y el control de concurrencia es que "
@@ -37,15 +37,14 @@
 "CMT) con tus recursos de base de datos."
 
 #. Tag: para
-#: transactions.xml:14
-#, no-c-format
+#: transactions.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
@@ -55,23 +54,23 @@
 "values)."
 
 #. Tag: para
-#: transactions.xml:22
-#, no-c-format
+#: transactions.xml:46
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "Sin embargo, además del versionado automático, Hibernate ofrece una API "
 "(menor) para bloqueo pesimista de filas, usando la sintáxis <literal>SELECT "
 "FOR UPDATE</literal>. Esta API se discute más adelante en este capítulo:"
 
 #. Tag: para
-#: transactions.xml:29
-#, no-c-format
+#: transactions.xml:53
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -82,19 +81,19 @@
 "transacciones de aplicación largas."
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "Ámbitos de sesión y de transacción"
 
 #. Tag: para
-#: transactions.xml:38
-#, no-c-format
+#: transactions.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "Una <literal>SessionFactory</literal> es un objeto seguro entre hebras caro-"
 "de-crear pensado para ser compartido por todas las hebras de la aplicación. "
@@ -102,14 +101,14 @@
 "de una instancia de <literal>Configuration</literal>."
 
 #. Tag: para
-#: transactions.xml:44
-#, no-c-format
+#: transactions.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "Una <literal>Session</literal> es un objeto barato, inseguro entre hebras "
 "que debe ser usado una sola vez, para un solo proceso de negocio, una sola "
@@ -122,15 +121,14 @@
 "patrones usando intercepción de peticiones)."
 
 #. Tag: para
-#: transactions.xml:52
-#, no-c-format
+#: transactions.xml:76
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "Para completar este cuadro tienes que pensar también en las transacciones de "
 "base de datos. Una transacción de base de datos tiene que ser tan corta como "
@@ -139,14 +137,14 @@
 "a una carga altamente concurrente."
 
 #. Tag: para
-#: transactions.xml:61
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "¿Qué es el ámbito de una unidad de trabajo? ¿Puede una sola "
 "<literal>Session</literal> de Hibernate extenderse a través de varias "
@@ -155,28 +153,43 @@
 "los límites de la transacción de base de datos?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "Unidad de trabajo"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "Primero, no uses el antipatrón <emphasis>sesión-por-operación</emphasis>, "
@@ -191,19 +204,19 @@
 "modo auto-commit inmediatamente.)"
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is send to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "El patrón más común en una aplicación mutiusuario cliente/servidor es "
 "<emphasis>sesión-por-petición</emphasis>. En este modelo, una petición del "
@@ -218,20 +231,20 @@
 "medida perfecta de muchas aplicaciones."
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is send to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "The challenge lies in the implementation. Hibernate provides built-in "
 "management of the \"current session\" to simplify this pattern. All you have "
@@ -246,15 +259,14 @@
 "later in this chapter, for ease of use and code portability."
 
 #. Tag: para
-#: transactions.xml:112
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "Your application code can access a \"current session\" to process the "
 "request by simply calling <literal>sessionFactory.getCurrentSession()</"
@@ -264,19 +276,18 @@
 "<xref linkend=\"architecture-current-session\"/>."
 
 #. Tag: para
-#: transactions.xml:120
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "Sometimes it is convenient to extend the scope of a <literal>Session</"
 "literal> and database transaction until the \"view has been rendered\". This "
@@ -290,20 +301,20 @@
 "Session in View</emphasis> pattern."
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "Transacciones de aplicación"
 
 #. Tag: para
-#: transactions.xml:137
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "El patrón sesión-por-petición no es el único concepto útil que puedes usar "
 "para diseñar unidades de trabajo. Muchos procesos de negocio requiere una "
@@ -313,10 +324,10 @@
 "usuario. Considera el siguiente ejemplo:"
 
 #. Tag: para
-#: transactions.xml:147
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -325,12 +336,12 @@
 "datos particular. El usuario es libre de modificar los objetos."
 
 #. Tag: para
-#: transactions.xml:154
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "El usuario hace click en \"Salvar\" después de 5 minutos y espera que sus "
 "modificaciones sean hechas persistentes. También espera que él sea la única "
@@ -338,27 +349,26 @@
 "modificación en conflicto."
 
 #. Tag: para
-#: transactions.xml:162
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "Llamamos a esto unidad de trabajo, desde el punto de vista del usuario, una "
 "larga <emphasis>transacción de aplicación</emphasis> ejecutándose. Hay "
 "muchas formas en que puedes implementar esto en tu aplicación."
 
 #. Tag: para
-#: transactions.xml:168
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "Una primera implementación ingenua podría mantener abierta la "
 "<literal>Session</literal> y la transacción de base de datos durante el "
@@ -369,17 +379,17 @@
 "concurrentes."
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:214
+#, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"converastion. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "Claramente, tenemos que usar muchas transacciones de base de datos para "
 "implementar la transacción de aplicación. En este caso, mantener el "
@@ -393,13 +403,13 @@
 "funcionalidades de Hibernate:"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:227
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occured during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>Versionado Automático</emphasis> - Hibernate puede llevar un "
 "control automático de concurrencia optimista por ti, puede detectar "
@@ -407,15 +417,15 @@
 "tiempo de pensar del usuario."
 
 #. Tag: para
-#: transactions.xml:197
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>Objetos Separados</emphasis> - Si decides usar el ya discutido "
 "patrón de <emphasis>sesión-por-petición</emphasis>, todas las instancias "
@@ -426,17 +436,17 @@
 "modificaciones concurrentes."
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitely."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>Sesión Larga</emphasis> - La <literal>Session</literal> de "
 "Hibernate puede ser desconectada de la conexión JDBC subyacente después que "
@@ -447,13 +457,13 @@
 "versionado automático."
 
 #. Tag: para
-#: transactions.xml:220
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "Tanto <emphasis>sesión-por-petición-con-objetos-separados</emphasis> como "
 "<emphasis>sesión-por-transacción-de-aplicación</emphasis>, ambas tienen "
@@ -461,19 +471,19 @@
 "contexto del control optimista de concurrencia."
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "Considerando la identidad del objeto"
 
 #. Tag: para
-#: transactions.xml:231
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "Una aplicación puede acceder concurrentemente a el mismo estado persistente "
 "en dos <literal>Session</literal>s diferentes. Sin embargo, una instancia de "
@@ -482,41 +492,41 @@
 "identidad:"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "Identidad de Base de Datos"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "Identidad JVM"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "Entonces para objetos unidos a una <literal>Session</literal><emphasis>en "
 "particular</emphasis> (es decir en el ámbito de una <literal>Session</"
@@ -529,16 +539,16 @@
 "un enfoque optimista."
 
 #. Tag: para
-#: transactions.xml:266
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "Este enfoque deja que Hibernate y la base de datos se preocupen sobre la "
 "concurrencia. Además provee la mejor escalabilidad, ya que garantizando la "
@@ -550,28 +560,29 @@
 "objetos."
 
 #. Tag: para
-#: transactions.xml:275
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "Sin embargo, una aplicación que usa <literal>==</literal> fuera de una "
 "<literal>Session</literal>, podría ver resultados inesperados. Esto podría "
@@ -597,19 +608,19 @@
 "Java tiene que ser implementada."
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "Temas comunes"
 
 #. Tag: para
-#: transactions.xml:298
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "Nunca uses los antipatrones <emphasis>sesión-por-sesión-de-usuario</"
@@ -619,17 +630,17 @@
 "entiendes las implicaciones antes de tomar una decisión de diseño:"
 
 #. Tag: para
-#: transactions.xml:307
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "Una <literal>Session</literal> no es segura entre hebras. Las cosas que se "
 "suponen que funcionan concurrentemente, como peticiones HTTP, beans de "
@@ -642,18 +653,18 @@
 "ejecutándose concurrentemente."
 
 #. Tag: para
-#: transactions.xml:318
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "Una excepción lanzada por Hibernate significa que tienes que deshacer "
 "(rollback) tu transacción de base de datos y cerrar la <literal>Session</"
@@ -667,18 +678,18 @@
 "después del rollback de todos modos."
 
 #. Tag: para
-#: transactions.xml:330
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "La <literal>Session</literal> pone en caché todo objeto que esté en estado "
 "persistente (vigilado y chequeado por estado sucio por Hibernate). Esto "
@@ -693,21 +704,21 @@
 "probabilidad de datos añejos."
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "Demarcación de la transacción de base de datos"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Datatabase (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -721,18 +732,18 @@
 "explícitamente las transacciones."
 
 #. Tag: para
-#: transactions.xml:360
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "Una aplicación Hibernate puede ejecutarse en entornos no manejados (es "
 "decir, como independiente, Web simple, o aplicaciones Swing) y entornos "
@@ -748,13 +759,13 @@
 "hecho automáticamente."
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:408
+#, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
-"transaction demaracation. Hibernate offers a wrapper API called "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
+"transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
 "strongly encourage its use unless you are in a CMT session bean."
@@ -766,62 +777,62 @@
 "recomendamos fuertemente su uso salvo que estés en un bean de sesión CMT."
 
 #. Tag: para
-#: transactions.xml:379
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 "Usualmente, finalizar una <literal>Session</literal> implica cuatro fases "
 "distintas:"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "limpiar (flush) la sesión"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "comprometer la transacción"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "cerrar la sesión"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "manejar excepciones"
 
 #. Tag: para
-#: transactions.xml:406
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "Limpiar la sesión ha sido discutido anteriormente, tendremos ahora una "
 "mirada más de cerca a la demarcación de transacciones y manejo de "
 "excepciones en sendos entornos manejado y no manejados."
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "Entorno no manejado"
 
 #. Tag: para
-#: transactions.xml:415
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -830,7 +841,7 @@
 "pooling de Hibernate. El idioma manejo de sesión/transacción se ve así:"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -854,12 +865,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
-#, no-c-format
+#: transactions.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -873,17 +884,17 @@
 "sesión."
 
 #. Tag: para
-#: transactions.xml:433
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "Este código Java es portable y se ejecuta tanto en entornos no manejados "
 "como en entornos JTA."
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -902,17 +913,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "Muy probablemente nunca veas este idioma en código de negocio en una "
 "aplicación normal; las excepciones fatales (sistema) deben siempre ser "
@@ -925,29 +936,29 @@
 "capítulo."
 
 #. Tag: para
-#: transactions.xml:450
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "Nota que debes seleccionar <literal>org.hibernate.transaction."
 "JDBCTransactionFactory</literal> (que es el por defecto)."
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "Usando JTA"
 
 #. Tag: para
-#: transactions.xml:461
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -958,12 +969,12 @@
 "global. Hibernate ofrece dos estrategias para esta integración."
 
 #. Tag: para
-#: transactions.xml:468
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "Si usas transacciones gestionadas-por-bean (BMT) Hibernate le dirá al "
@@ -972,7 +983,7 @@
 "de la transacción es idéntico al de un entorno no manejado."
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -996,13 +1007,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 "Con CMT, la demarcación de la transacción se hace en descriptores de "
 "despliegue de beans de sesión, no programáticamente. Si no quieres limpiar "
@@ -1021,7 +1031,7 @@
 "en absoluto la API de <literal>Transaction</literal> de Hibernate.</emphasis>"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1044,11 +1054,11 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "Nota que debes elegir <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> en un bean de sesión BMT, y <literal>org."
@@ -1058,7 +1068,7 @@
 "literal>."
 
 #. Tag: programlisting
-#: transactions.xml:489
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1070,15 +1080,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "Si trabajas en un entorno CMT, y usas limpieza (flushing) y cierre "
 "automáticos de la sesión, podrías querer también usar la misma sesión en "
@@ -1096,17 +1106,16 @@
 "reduce a:"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatiblity), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "En otras palabras, todo lo que tienes que hacer en un entorno manejado, es "
 "llamar a <literal>SessionFactory.getCurrentSession()</literal>, hacer tu "
@@ -1116,21 +1125,21 @@
 "completamente por Hibernate."
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:546
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
-"close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicity "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "Existe una advertencia al uso del modo de liberación de conexión "
 "<literal>after_statement</literal>. Debido a una limitación tonta de la "
@@ -1146,23 +1155,23 @@
 "CMT.)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "Manejo de excepciones"
 
 #. Tag: para
-#: transactions.xml:526
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "Si la <literal>Session</literal> lanza una excepción (incluyendo cualquier "
 "<literal>SQLException</literal>), debes inmediatamente deshacer (rollback) "
@@ -1175,19 +1184,19 @@
 "literal>."
 
 #. Tag: para
-#: transactions.xml:537
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "La <literal>HibernateException</literal>, que envuelve la mayoría de los "
 "errores que pueden ocurrir en la capa de persistencia de Hibernate, en una "
@@ -1203,12 +1212,12 @@
 "debe tomarse una acción apropiada."
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
 "with the database in a <literal>JDBCException</literal>. In fact, Hibernate "
-"will attempt to convert the eexception into a more meningful subclass of "
+"will attempt to convert the exception into a more meaningful subclass of "
 "<literal>JDBCException</literal>. The underlying <literal>SQLException</"
 "literal> is always available via <literal>JDBCException.getCause()</"
 "literal>. Hibernate converts the <literal>SQLException</literal> into an "
@@ -1216,9 +1225,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "Hibernate envuelve <literal>SQLException</literal>s lanzadas mientras se "
@@ -1237,74 +1246,74 @@
 "subtipos estándar de <literal>JDBCException</literal> son:"
 
 #. Tag: para
-#: transactions.xml:565
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - indica un error con la "
 "comunicación JDBC subyacente."
 
 #. Tag: para
-#: transactions.xml:571
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - indica un problema de gramática o "
 "sintáxis con el SQL publicado."
 
 #. Tag: para
-#: transactions.xml:577
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - indica alguna forma de "
 "violación de restricción de integridad."
 
 #. Tag: para
-#: transactions.xml:583
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - indica un error adquiriendo un "
 "nivel de bloqueo necesario para realizar una operación solicitada."
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr ""
 "<literal>GenericJDBCException</literal> - una excepción genérica que no cayó "
 "en ninguna de las otras categorías."
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "Transaction timeout"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:639
+#, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
-"transaction timeout to JTA. This functioanlity is abstracted by the "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "One extremely important feature provided by a managed environment like EJB "
@@ -1319,7 +1328,7 @@
 "Hibernate <literal>Transaction</literal> object."
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1344,33 +1353,32 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
 "where transaction timeouts must be defined declaratively."
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Control optimista de concurrencia"
 
 #. Tag: para
-#: transactions.xml:628
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "El único enfoque que es consistente con alta concurrencia y alta "
 "escalabilidad es el control optimista de concurrencia con versionamiento. El "
@@ -1383,22 +1391,22 @@
 "perdidas en transacciones de base de datos solas."
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "Chequeo de versiones de aplicación"
 
 #. Tag: para
-#: transactions.xml:641
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "En una implementación sin mucha ayuda de Hibernate, cada interacción con la "
 "base de datos ocurre en una nueva <literal>Session</literal> y el "
@@ -1409,7 +1417,7 @@
 "los EJBs de entidad."
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1427,7 +1435,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1439,15 +1447,15 @@
 "la limpieza si la entidad está sucia."
 
 #. Tag: para
-#: transactions.xml:658
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "Por supuesto, si estás operando un entorno de baja-concurrencia-de-datos y "
 "no requieres chequeo de versiones, puedes usar este enfoque y simplemente "
@@ -1459,14 +1467,14 @@
 "conflictivos."
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:705
+#, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "Claramente, el chequeo manual de versiones es factible solamente en "
 "circunstancias muy triviales, y no es práctico para la mayoría de "
@@ -1476,22 +1484,22 @@
 "literal> larga o de instancias separadas."
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "Sesión larga y versionado automático"
 
 #. Tag: para
-#: transactions.xml:680
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "Una sola instancia de <literal>Session</literal> y sus instancias "
 "persistentes son usadas para toda la transacción de aplicación. Hibernate "
@@ -1502,14 +1510,14 @@
 "de negocio sin datos añejos)."
 
 #. Tag: para
-#: transactions.xml:689
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "La <literal>Session</literal> se desconecta de cualquier conexión JDBC "
 "subyacente al esperar por una interacción del usuario. Este enfoque es el "
@@ -1519,7 +1527,7 @@
 "demarcation-timeout transacción de base de datos."
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1534,24 +1542,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "El objeto <literal>foo</literal> todavía conoce en qué <literal>Session</"
 "literal> fue cargado. <literal>Session.reconnect()</literal> obtiene una "
@@ -1565,28 +1572,34 @@
 "ningún dato que <emphasis>sí estés</emphasis> actualizando."
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "Si las llamadas explícitas a <literal>disconnect()</literal> y "
 "<literal>reconnect()</literal> son muy onerosas, puedes usar en cambio "
 "<literal>hibernate.connection.release_mode</literal>."
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:723
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "Este patrón es problemático si la <literal>Session</literal> es demasiado "
 "grande para ser almacenada durante el tiempo de pensar del usuario, por "
@@ -1598,14 +1611,14 @@
 "literal> tendrá pronto también datos añejos."
 
 #. Tag: para
-#: transactions.xml:729
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "Nota también que debes mantener la <literal>Session</literal> desconectada "
 "próxima a la capa de persistencia. En otras palabras, usa una sesión de EJB "
@@ -1614,13 +1627,13 @@
 "serializarla a una capa separada)."
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "UNTRANSLATED!!! The extended session pattern, or <emphasis>session-per-"
@@ -1630,13 +1643,13 @@
 "the Hibernate Wiki for examples."
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Objetos separados y versionado automático"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1656,7 +1669,7 @@
 "literal>, o <literal>Session.merge()</literal>."
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1670,22 +1683,22 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:799
+#, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
-"exception if conflicting updates occured."
+"exception if conflicting updates occurred."
 msgstr ""
 "De nuevo, Hibernate chequeará las versiones de instancia durante la limpieza "
 "(flush), lanzando una excepción si ocurrieron actualizaciones en conflicto."
 
 #. Tag: para
-#: transactions.xml:764
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "Puedes también llamar a <literal>lock()</literal> en vez de <literal>update()"
@@ -1694,16 +1707,16 @@
 "sido modificado."
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "Personalizando el versionado automático"
 
 #. Tag: para
-#: transactions.xml:775
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1714,19 +1727,19 @@
 "entonces no incrementará ya más las versiones si la propiedad está sucia."
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:822
+#, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this concepetually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "Los esquemas de base de datos heredados son frecuentemente estáticos y no "
 "pueden ser modificados. U otras aplicaciones podrían también acceder la "
@@ -1741,13 +1754,13 @@
 "no sesión-por-petición-con-instancias-separadas."
 
 #. Tag: para
-#: transactions.xml:793
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "A veces las modificaciones concurrentes pueden permitirse, en cuanto los "
 "cambios que hayan sido hechos no se traslapen. Si estableces "
@@ -1756,21 +1769,21 @@
 "limpieza."
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute uneccessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "En ambos casos, con columnas de versión/timestamp dedicadas o con "
 "comparación de campos completa/sucios, Hibernate usa una sola sentencia "
@@ -1787,20 +1800,20 @@
 "actualizaciones realmente ocurran, antes de actualizar la fila."
 
 #. Tag: title
-#: transactions.xml:817
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "Bloqueo pesimista"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:860
+#, fuzzy, no-c-format
 msgid ""
-"It is not intended that users spend much time worring about locking "
-"strategies. Its usually enough to specify an isolation level for the JDBC "
+"It is not intended that users spend much time worrying about locking "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "No se pretende que los usuarios gasten mucho tiempo preocupándose de las "
 "estrategias de bloqueo. Usualmente es suficiente con especificar un nivel de "
@@ -1810,28 +1823,28 @@
 "al comienzo de una nueva transacción."
 
 #. Tag: para
-#: transactions.xml:826
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr ""
 "¡Hibernate siempre usará el mecanismo de bloqueo de la base de datos, nunca "
 "bloqueo de objetos en memoria!"
 
 #. Tag: para
-#: transactions.xml:831
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "La clase <literal>LockMode</literal> define los diferentes niveles de "
 "bloqueo que pueden ser adquiridos por Hibernate. Un bloqueo se obtiene por "
 "los siguientes mecanismos:"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1841,10 +1854,10 @@
 "Hibernate actualiza o inserta una fila."
 
 #. Tag: para
-#: transactions.xml:844
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1853,10 +1866,10 @@
 "base de datos que soporten esa sintáxis."
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1865,19 +1878,19 @@
 "literal> bajo Oracle."
 
 #. Tag: para
-#: transactions.xml:856
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "<literal>LockMode.READ</literal> es adquirido automáticamente cuando "
 "Hibernate lee datos bajo los niveles de aislamiento Repeatable Read o "
 "Serializable. Puede ser readquirido por pedido explícito del usuario."
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1893,7 +1906,7 @@
 "también comienzan en este modo de bloqueo."
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
@@ -1902,7 +1915,7 @@
 "formas:"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1912,19 +1925,19 @@
 "<literal>LockMode</literal>."
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "Una llamada a <literal>Session.lock()</literal>."
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "Una llamada a <literal>Query.setLockMode()</literal>."
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1943,14 +1956,14 @@
 "Hibernate llama a <literal>lock()</literal> para ese objeto."
 
 #. Tag: para
-#: transactions.xml:903
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "<literal>Session.lock()</literal> realiza un chequeo de número de versión si "
 "el modo de bloqueo especificado es <literal>READ</literal>, "
@@ -1959,121 +1972,119 @@
 "<literal>SELECT ... FOR UPDATE</literal>.)"
 
 #. Tag: para
-#: transactions.xml:910
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "Si la base de datos no soporta el modo de bloqueo solicitado, Hibernate "
 "usará un modo alternativo apropiado (en vez de lanzar una excepción). Esto "
 "asegura que las aplicaciones serán portables."
 
 #. Tag: title
-#: transactions.xml:919
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "translator-credits"
 
 #. Tag: para
-#: transactions.xml:921
+#: transactions.xml:962
 #, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:935
+#: transactions.xml:976
 #, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obatins a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:942
+#: transactions.xml:983
 #, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:948
+#: transactions.xml:989
 #, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:958
+#: transactions.xml:999
 #, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:965
+#: transactions.xml:1006
 #, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:975
+#: transactions.xml:1016
 #, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:981
+#: transactions.xml:1022
 #, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1030
 #, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,155 +1,202 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:7
-msgid "Introduction to Hibernate"
-msgstr "Introducci&#x00f3;n a Hibernate"
+#. Tag: title
+#: tutorial.xml:31
+#, no-c-format
+msgid "Tutorial"
+msgstr ""
 
-#: index.docbook:10
-msgid "Preface"
-msgstr "Prefacio"
-
-#: index.docbook:12
+#. Tag: para
+#: tutorial.xml:33
+#, no-c-format
 msgid ""
-"This chapter is an introductory tutorial for new users of Hibernate. We "
-"start with a simple command line application using an in-memory database and "
-"develop it in easy to understand steps."
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
+"Gloegl. All code is contained in the <filename>tutorials/web</filename> "
+"directory of the project source."
 msgstr ""
-"Este cap&#x00ed;tulo es un tutorial introductorio de Hibernate. Comenzamos "
-"con una aplicaci&#x00f3;n simple de l&#x00ed;nea de comandos usando un base "
-"de datos en-memoria y desarroll&#x00e1;ndola en f&#x00e1;cil para entender "
-"los pasos."
 
-#: index.docbook:18
+#. Tag: para
+#: tutorial.xml:42
+#, no-c-format
 msgid ""
-"This tutorial is intended for new users of Hibernate but requires Java and "
-"SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-party "
-"libraries we name are for JDK 1.4 and 5.0. You might need others for JDK 1.3."
+"This tutorial expects the user have knowledge of both Java and SQL. If you "
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
-"Este tutorial est&#x00e1; concebido para usuarios nuevos de Hibernate pero "
-"requiere conocimiento en Java y SQL. Est&#x00e1; basado en un tutorial de "
-"Michael Gloegl. Las bibliotecas de terceros que mencionamos son para JDK 1.4 "
-"y 5.0. Podr&#x00ed;as necesitar otras para JDK 1.3."
 
-#: index.docbook:24
+#. Tag: para
+#: tutorial.xml:51
+#, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
-"UNTRANSLATED!!! The source code for the tutorial is included in the "
-"distribution in the <literal>doc/reference/tutorial/</literal> directory."
 
-#: index.docbook:32
+#. Tag: title
+#: tutorial.xml:59
+#, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "Parte 1 - La primera Aplicaci&#x00f3;n Hibernate"
 
-#: index.docbook:34
+#. Tag: para
+#: tutorial.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"First, we'll create a simple console-based Hibernate application. We use an "
-"Java database (HSQL DB), so we do not have to install any database server."
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
 msgstr ""
-"Primero, crearemos una aplicaci&#x00f3;n simple de Hibenate basada en "
-"consola. Usamos usamos una base de datos en-memoria (HSQL DB), de modo que "
-"no necesitamos instalar ning&#x00fa;n servidor de base de datos."
-
-#: index.docbook:39
-msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the hosts of these events."
-msgstr ""
 "Asumamos que necesitamos una aplicaci&#x00f3;n peque&#x00f1;a de base de "
 "datos que pueda almacenar eventos que queremos atender, e informaci&#x00f3;n "
 "acerca de los hostales de estos eventos."
 
-#: index.docbook:44
+#. Tag: para
+#: tutorial.xml:67
+#, no-c-format
 msgid ""
-"The first thing we do, is set up our development directory and put all the "
-"Java libraries we need into it. Download the Hibernate distribution from the "
-"Hibernate website. Extract the package and place all required libraries "
-"found in <literal>/lib</literal> into into the <literal>/lib</literal> "
-"directory of your new development working directory. It should look like "
-"this:"
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
-"La primera cosa que hacemos, es armar nuestro directorio de desarrollo y "
-"poner en &#x00e9;l todas las bibliotecas Java que necesitamos. Descarga la "
-"distribuci&#x00f3;n de Hibernate del sitio web de Hibernate. Extrae el "
-"paquete y coloca todas las bibliotecas requeridas encontradas en <literal>/"
-"lib</literal> dentro del directorio <literal>/lib</literal> de nuestro nuevo "
-"directorio de desarrollo de trabajo. Debe asemejarse a esto:"
 
-#: index.docbook:52
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:78
+#, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib-full.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  ehcache.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
 
-#: index.docbook:54
+#. Tag: para
+#: tutorial.xml:88
+#, no-c-format
 msgid ""
-"This is the minimum set of required libraries (note that we also copied "
-"hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
-"writing</emphasis>. The Hibernate release you are using might require more "
-"or less libraries. See the <literal>README.txt</literal> file in the "
-"<literal>lib/</literal> directory of the Hibernate distribution for more "
-"information about required and optional third-party libraries. (Actually, "
-"Log4j is not required but preferred by many developers.)"
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
 msgstr ""
-"Este es el conjunto m&#x00ed;nimo de bibliotecas requeridas para Hibernate "
-"(observa que tambi&#x00e9;n hemos copiado hibernate3.jar, el fichero "
-"principal). Ver el fichero <literal>README.txt</literal> en el directorio "
-"<literal>lib/</literal> de la distribuci&#x00f3;n de Hibernate para m&#x00e1;"
-"s informaci&#x00f3;n sobre bibliotecas de terceros requeridas y opcionales. "
-"(Realmente, Log4J no es requerida aunque preferida por muchos "
-"desarrolladores)."
 
-#: index.docbook:63
+#. Tag: programlisting
+#: tutorial.xml:94
+#, no-c-format
 msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+"         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
+"apache.org/xsd/maven-4.0.0.xsd\">\n"
+"\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
+"\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>org.hibernate</groupId>\n"
+"            <artifactId>hibernate-core</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Because this is a web app, we also have a dependency on the "
+"servlet api. -->\n"
+"        <dependency>\n"
+"            <groupId>javax.servlet</groupId>\n"
+"            <artifactId>servlet-api</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
-"Por siguiente, creamos una clase que represente el evento que queremos "
-"almacenar en base de datos."
 
-#: index.docbook:68
+#. Tag: para
+#: tutorial.xml:97
+#, no-c-format
+msgid ""
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:114
+#, no-c-format
+msgid ""
+"Save this file as <filename>pom.xml</filename> in the project root directory."
+msgstr ""
+
+#. Tag: title
+#: tutorial.xml:121
+#, no-c-format
 msgid "The first class"
 msgstr "La primera clase"
 
-#: index.docbook:70
+#. Tag: para
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
 msgstr ""
-"Nuestra primera clase persistente es un JavaBean simple con algunas "
-"propiedades:"
+"Por siguiente, creamos una clase que represente el evento que queremos "
+"almacenar en base de datos."
 
-#: index.docbook:74
+#. Tag: programlisting
+#: tutorial.xml:128
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -221,14 +268,15 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:76
+#. Tag: para
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "Puedes ver que esta clase usa las convenciones de nombrado est&#x00e1;ndar "
 "de JavaBean para m&#x00e9;todos getter y setter de propiedad, as&#x00ed; "
@@ -237,19 +285,21 @@
 "los campos directamente; el beneficio de los m&#x00e9;todos de acceso es la "
 "robustez para la refactorizaci&#x00f3;n."
 
-#: index.docbook:84
+#. Tag: para
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "La propiedad <literal>id</literal> tiene un valor &#x00fa;nico de "
 "identificador para un evento en particular. Todas las clase de entidad "
@@ -267,12 +317,14 @@
 "est&#x00e1; en ti, y puedes ajustarla a tu dise&#x00f1;o de aplicaci&#x00f3;"
 "n."
 
-#: index.docbook:96
+#. Tag: para
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "El constructor sin argumentos es un requerimiento para todas las clases "
@@ -282,42 +334,23 @@
 "tiempo de ejecuci&#x00f3;n y la recuperaci&#x00f3;n de datos sin "
 "instrumentaci&#x00f3;n del bytecode."
 
-#: index.docbook:103
+#. Tag: para
+#: tutorial.xml:161
+#, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"Coloca este fichero de c&#x00f3;digo Java en un directorio llamado "
-"<literal>src</literal> en la carpeta de desarrollo. El directorio ahora debe "
-"verse como esto:"
 
-#: index.docbook:108
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  Event.java]]>"
-
-#: index.docbook:110
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr ""
-"En el pr&#x00f3;ximo paso, le decimos a Hibernate sobre esta clase "
-"persistente."
-
-#: index.docbook:117
+#. Tag: title
+#: tutorial.xml:168
+#, no-c-format
 msgid "The mapping file"
 msgstr "El fichero de mapeo"
 
-#: index.docbook:119
+#. Tag: para
+#: tutorial.xml:170
+#, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
 "class. This is where the Hibernate mapping file comes into play. The mapping "
@@ -329,18 +362,22 @@
 "juego. El fichero de mapeo le dice a Hibernate a qu&#x00e9; tabla en la base "
 "de datos tiene que acceder, y qu&#x00e9; columnas en esta tabla debe usar."
 
-#: index.docbook:126
+#. Tag: para
+#: tutorial.xml:178
+#, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "La estructura b&#x00e1;sica de un fichero de mapeo se parece a esto:"
 
-#: index.docbook:130
+#. Tag: programlisting
+#: tutorial.xml:182
+#, fuzzy, no-c-format
 msgid ""
 "<![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\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
@@ -353,16 +390,18 @@
 "[...]\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:132
+#. Tag: para
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "Observa que el DTD de Hibernate es muy sofisticado. Puedes usarlo para "
 "autocompleci&#x00f3;n de los elementos y atributos XML de mapeo en tu editor "
@@ -375,20 +414,24 @@
 "<literal>hibernate3.jar</literal> as&#x00ed; como tambi&#x00e9;n en el "
 "directorio <literal>src/</literal> de la distribuci&#x00f3;n de Hibernate."
 
-#: index.docbook:143
+#. Tag: para
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "Omitiremos la declaraci&#x00f3;n de DTD en futuros ejemplos para acortar el "
 "c&#x00f3;digo. Por supuesto, no es opcional."
 
-#: index.docbook:148
+#. Tag: para
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "Entre las dos etiquetas <literal>hibernate-mapping</literal>, incluye un "
 "elemento <literal>class</literal>. Todas las clases de entidad persistentes "
@@ -396,11 +439,13 @@
 "no sean entidades de-primera-clase) necesitan dicho mapeo a una tabla en la "
 "base de datos SQL:"
 
-#: index.docbook:155
+#. Tag: programlisting
+#: tutorial.xml:210
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -414,15 +459,16 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:157
+#. Tag: para
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "Hasta ahora dijimos a Hibernate c&#x00f3;mo persistir y cargar el objeto de "
 "clase <literal>Event</literal> a la tabla <literal>EVENTS</literal>, cada "
@@ -432,11 +478,13 @@
 "identificador, configuramos la estrategia de generaci&#x00f3;n de "
 "identificadores para una columna clave primaria delegada:"
 
-#: index.docbook:165
+#. Tag: programlisting
+#: tutorial.xml:222
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -454,49 +502,58 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:167
+#. Tag: para
+#: tutorial.xml:224
+#, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"The <literal>id</literal> element is the declaration of the identifier "
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"El elemento <literal>id</literal> el la declaraci&#x00f3;n de la propiedad "
-"identificadora, <literal>name=\"id\"</literal> declara el nombre de la "
-"propiedad Java. Hibernate usar&#x00e1; los m&#x00e9;todos getter y setter "
-"para acceder a la propiedad. El attributo de columna dice a Hibernate "
-"cu&#x00e1;l columna de la tabla <literal>EVENTS</literal> usamos para esta "
-"clave primaria. El elemento anidado <literal>generator</literal> especifica "
-"la estrategia de generaci&#x00f3;n de identificadores, en este caso usamos "
-"<literal>increment</literal>, que es un m&#x00e9;todo muy simple de "
-"incremento de n&#x00fa;mero en-memoria &#x00fa;til mayormente para testeo (y "
-"tutoriales). Hibernate tambi&#x0e9;n soporta identificadores generados por "
-"base de datos, globalmente &#x00fa;nicos, as&#x00ed; como tambi&#x00e9;n "
-"asignados por aplicaci&#x00f3;n (o cualquier estrategia para la que hayas "
-"escrito una extensi&#x00f3;n)."
 
-#: index.docbook:180
+#. Tag: para
+#: tutorial.xml:234
+#, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "Finalmente inclu&#x00ed;mos declaraciones para las propiedades persistentes "
 "de la clases en el fichero de mapeo. Por defecto, ninguna propiedad de la "
 "clase se considera persistente:"
 
-#: index.docbook:186
+#. Tag: programlisting
+#: tutorial.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -519,26 +576,30 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:188
+#. Tag: para
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "Al igual que con el elemento <literal>id</literal>, el atributo "
 "<literal>name</literal> del elemento <literal>property</literal> dice a "
 "Hibernate c&#x00e1;les m&#x00e9;todos getter y setter usar."
 
-#: index.docbook:195
+#. Tag: para
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "¿Por qu&#x00e9; el mapeo de la propiedad <literal>date</literal> incluye el "
 "atributo <literal>column</literal>, pero el de la de <literal>title</"
@@ -548,23 +609,24 @@
 "es una palabra reservada en la mayor&#x00ed;a de las bases de datos, "
 "as&#x00ed; que mejor la mapeamos a un nombre diferente."
 
-#: index.docbook:204
+#. Tag: para
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "La pr&#x00f3;xima cosa interesante es que el mapeo de <literal>title</"
 "literal> carece de un atributo <literal>type</literal>. Los tipos que "
@@ -583,106 +645,91 @@
 "informaci&#x00f3;n completa de fecha y hora mapeando la propiedad con un "
 "<literal>timestamp</literal>."
 
-#: index.docbook:220
+#. Tag: para
+#: tutorial.xml:297
+#, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"Este fichero de mapeo debe ser salvado como <literal>Event.hbm.xml</"
-"literal>, justo en el directorio pr&#x00f3;ximo al fichero de c&#x00f3;digo "
-"fuente de la clase Java <literal>Event</literal>. El nombrado de los "
-"ficheros de mapeo puede ser arbitrario, sin embargo, el sufijo <literal>hbm."
-"xml</literal> se ha vuelto una convenci&#x00f3;n el la comunidad de "
-"desarrolladores de Hibernate. La estructura de directorio debe ahora verse "
-"como esto:"
 
-#: index.docbook:228
+#. Tag: para
+#: tutorial.xml:304
+#, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  Event.java\n"
-"  Event.hbm.xml]]>"
 
-#: index.docbook:230
-msgid "We continue with the main configuration of Hibernate."
-msgstr "Continuamos con la configuraci&#x00f3;n principal de Hibernate."
-
-#: index.docbook:237
+#. Tag: title
+#: tutorial.xml:312
+#, no-c-format
 msgid "Hibernate configuration"
 msgstr "Configuraci&#x00f3;n de Hibernate"
 
-#: index.docbook:239
+#. Tag: para
+#: tutorial.xml:314
+#, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"Tenemos ahora una clase persistente y su fichero de mapeo en su sitio. Es "
-"momento de configurar Hibernate. Antes que hagamos esto, necesitaremos una "
-"base de datos. HSQL DB, un DBMS SQL en-memoria basado en Java, puede ser "
-"descargado del sitio web de HSQL DB. Realmente, de esta descarga s&#x00f3;lo "
-"necesitas el <literal>hsqldb.jar</literal>. Coloca este fichero en el "
-"directorio <literal>lib/</literal> de la carpeta de desarrollo."
 
-#: index.docbook:247
+#. Tag: para
+#: tutorial.xml:321
+#, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "Crea un directorio llamado <literal>data</literal> en la ra&#x00ed;z del "
 "directorio de desarrollo. All&#x00ed; es donde HSQL DB almacenar&#x00e1; sus "
 "ficheros de datos."
 
-#: index.docbook:257
+#. Tag: para
+#: tutorial.xml:337
+#, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"Hibernate es la capa en tu aplicaci&#x00f3;n que se conecta a esta base de "
-"datos, de modo que necesita informaci&#x00f3;n de conexi&#x00f3;n. Las "
-"conexiones se hacen a trav&#x00e9;s de un pool de conexiones JDBC, que "
-"tamb&#x00e9;n tenemos que configurar. La distribuci&#x00f3;n de Hibernate "
-"contiene muchas herramientas de pooling de conexiones JDBC de c&#x00f3;digo "
-"abierto, pero para este tutorial usaremos el pool de conexiones prefabricado "
-"dentro de Hibernate. Observa que tienes que copiar la biblioteca requerida "
-"en tu classpath y usar diferentes configuraciones de pooling de conexiones "
-"si quieres usar un software de pooling JDBC de terceros de calidad de "
-"producci&#x00f3;n."
 
-#: index.docbook:267
+#. Tag: para
+#: tutorial.xml:348
+#, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "Para la configuraci&#x00f3;n de Hibernate, podemos usar un fichero "
 "<literal>hibernate.properties</literal> simple, un fichero "
@@ -691,7 +738,9 @@
 "mayor&#x00ed;a de los usuarios prefieren el fichero de configuraci&#x00f3;n "
 "XML:"
 
-#: index.docbook:273
+#. Tag: programlisting
+#: tutorial.xml:360
+#, fuzzy, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
 "<!DOCTYPE hibernate-configuration PUBLIC\n"
@@ -729,9 +778,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -774,13 +823,20 @@
 "\n"
 "</hibernate-configuration>]]>"
 
-#: index.docbook:275
+#. Tag: para
+#: tutorial.xml:363
+#, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "Observa que esta configuraci&#x00f3;n XML usa un DTD diferente. Configuramos "
 "la <literal>SessionFactory</literal> de Hibernate, una f&#x00e1;brica global "
@@ -789,19 +845,35 @@
 "literal> , usualmente en varios ficheros de configuraci&#x00f3;n (para un "
 "arranque m&#x00e1;s f&#x00e1;cil)."
 
-#: index.docbook:283
+#. Tag: para
+#: tutorial.xml:373
+#, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "Los primeros cuatro elementos <literal>property</literal> contienen la "
 "configuraci&#x00f3;n necesaria para la conexi&#x00f3;n JDBC. El elemento de "
 "dialecto <literal>property</literal> especifica la variante de SQL en "
@@ -812,143 +884,64 @@
 "con la ayuda de la tarea de Ant <literal>SchemaExport</literal>. Finalmente, "
 "agregamos el(los) fichero(s) de mapeo para clases persistentes."
 
-#: index.docbook:296
+#. Tag: para
+#: tutorial.xml:395
+#, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"Copia este fichero dentro del directorio de c&#x00f3;digo fuente, de modo "
-"que termine ubicado en la rai&#x00ed;z del classpath. Hibernate busca "
-"autom&#x00e1;ticamente un fichero llamado <literal>hibernate.cfg.xml</"
-"literal> en la ra&#x00ed;z del classpath al arrancar."
 
-#: index.docbook:305
-msgid "Building with Ant"
+#. Tag: title
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "Construyendo con Ant"
 
-#: index.docbook:307
+#. Tag: para
+#: tutorial.xml:405
+#, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"Construiremos ahora el tutorial con Ant. Necesitar&#x00e1;s tener Ant "
-"instalado. Obt&#x00e9;nlo de <ulink url=\"http://ant.apache.org/bindownload."
-"cgi\">P&#x00e1;gina de descarga de Ant</ulink>. No se cubrir&#x00e1; "
-"aqu&#x00ed; c&#x00f3;mo instalar Ant. Por favor refi&#x00e9;rete al <ulink "
-"url=\"http://ant.apache.org/manual/index.html\"> Manual de Ant</ulink>. "
-"Despu&#x00e9;s que hayas instalado Ant, podemos comenzar a crear el "
-"buildfile. Ser&#x00e1; llamado <literal>build.xml</literal> y colocado "
-"directamente en el directorio de desarrollo."
 
-#: index.docbook:316
-msgid "A basic build file looks like this:"
-msgstr "Reparar Ant"
-
-#: index.docbook:320
+#. Tag: programlisting
+#: tutorial.xml:415
+#, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
-"Observa que la distribuci&#x00f3;n de Ant est&#x00e1; por defecto rota (como "
-"se describe en el FAQ de Ant) y tiene que ser reparado por ti, por ejemplo, "
-"si quisieras usar JUnit desde dentro de tu fichero de construcci&#x00f3;n. "
-"Para hacer que funcione la tarea de JUnit (no lo necesitaremos en este "
-"tutorial), copia junit.jar a <literal>ANT_HOME/lib</literal> o quita el "
-"trozo de plugin <literal>ANT_HOME/lib/ant-junit.jar</literal>."
 
-#: index.docbook:322
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr "Un fichero de construcci&#x00f3;n b&#x00e1;sico se ve como esto:"
-
-#: index.docbook:329
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
-
-#: index.docbook:334
+#. Tag: title
+#: tutorial.xml:420
+#, no-c-format
 msgid "Startup and helpers"
 msgstr ""
 "Esto dir&#x00e1; a Ant que agregue todos los ficheros en el directorio lib "
@@ -958,16 +951,20 @@
 "configuraci&#x00f3;n y mapeos de Hibernate. Si ahora corres Ant, debes "
 "obtener esta salida:"
 
-#: index.docbook:336
+#. Tag: para
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "<![CDATA[C:\\hibernateTutorial\\>ant\n"
 "Buildfile: build.xml\n"
@@ -981,30 +978,35 @@
 "BUILD SUCCESSFUL\n"
 "Total time: 1 second ]]>"
 
-#: index.docbook:346
+#. Tag: para
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr "Arranque y ayudantes"
 
-#: index.docbook:352
+#. Tag: programlisting
+#: tutorial.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -1029,14 +1031,25 @@
 "<literal>SessionFactory</literal> es un objeto global seguro entre hebras, "
 "instanciado una sola vez."
 
-#: index.docbook:354
+#. Tag: para
+#: tutorial.xml:444
+#, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "Crearemos una clase de ayuda <literal>HibernateUtil</literal> que cuide del "
 "arranque y haga conveniente el manejo de <literal>Session</literal>. El "
 "as&#x00ed; llamado patr&#x00f3;n <emphasis>Sesi&#x00f3;n de Hebra Local "
@@ -1044,14 +1057,16 @@
 "unidad de trabajo actual asociada a la hebra actual. Echemos una mirada a la "
 "implementaci&#x00f3;n:"
 
-#: index.docbook:361
+#. Tag: para
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "<![CDATA[import org.hibernate.*;\n"
 "import org.hibernate.cfg.*;\n"
@@ -1094,66 +1109,28 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:370
+#. Tag: para
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"Esta clase no &#x00f3;lo produce la <literal>SessionFactory</literal> global "
-"en su inicializador static (llamado s&#x00f3;lo una vez por la JVM al cargar "
-"la clase), sino que tambi&#x00e9;n tiene una variable <literal>ThreadLocal</"
-"literal> para tener la <literal>Session</literal> para la hebra actual. No "
-"importa cu&#x00e1;ndo llames a <literal>HibernateUtil.currentSession()</"
-"literal>, siempre devolver&#x00e1; la misma unidad de trabajo de Hibernate "
-"en la misma hebra. Una llamada a <literal>HibernateUtil.closeSession()</"
-"literal> termina la unidad de trabajo actualmente asociada a la hebra."
-
-#: index.docbook:375
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-"Aseg&#x00fa;rate de entender el concepto Java de una variable local a una "
-"hebra antes de usar esta ayuda. Una clase <literal>HibernateUtil</literal> "
-"m&#x00e1;s potente puede encontrarse en <literal>CaveatEmptor</literal>, "
-"http://caveatemptor.hibernate.org/, as&#x00ed; como en el libro \"Java "
-"Persistence with Hibernate\". Observa que esta clase no es necesaria si "
-"despliegas Hibernate en un servidor de aplicaciones J2EE: una "
-"<literal>Session</literal> ser&#x00e1; autom&#x00e1;ticamente ligada a la "
-"transacci&#x00f3;n JTA actual, y puedes buscar la <literal>SessionFactory</"
-"literal> a trav&#x00e9;s de JNDI. Si usas JBoss AS, Hibernate puede ser "
-"desplegado como un servicio de sistema manejado y autom&#x00e1;ticamente "
-"ligar&#x00e1; la <literal>SessionFactory</literal> a un nombre JNDI."
-
-#: index.docbook:377
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "Coloca <literal>HibernateUtil.java</literal> en el directorio de fuentes de "
 "desarrollo, junto a <literal>Event.java</literal>:"
 
-#: index.docbook:387
+#. Tag: para
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr ""
 "<![CDATA[.\n"
 "+lib\n"
@@ -1166,7 +1143,9 @@
 "+data\n"
 "build.xml]]>"
 
-#: index.docbook:395
+#. Tag: title
+#: tutorial.xml:485
+#, no-c-format
 msgid "Loading and storing objects"
 msgstr ""
 "Esto tambi&#x00e9;n debe compilar sin problemas. Finalmente necesitamos "
@@ -1180,23 +1159,29 @@
 "salida m&#x00e1;s verborr&#x00e1;gica. Por defecto, s&#x00f3;lo se muestra "
 "el mensaje de arranque de Hibernate en la salida."
 
-#: index.docbook:397
+#. Tag: para
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "La infraestructura del tutorial est&#x00e1; completa, y estamos listos para "
 "hacer alg&#x00fa;n trabajo real con Hibernate."
 
-#: index.docbook:402
+#. Tag: programlisting
+#: tutorial.xml:493
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1211,16 +1196,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1229,25 +1211,31 @@
 "}]]>"
 msgstr "Cargando y almacenando objetos"
 
-#: index.docbook:404
+#. Tag: para
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "Finalmente, podemos usar Hibernate para cargar y almacenar objetos. "
 "Escribimos una clase <literal>EventManager</literal> con un m&#x00e9;todo "
 "<literal>main()</literal>:"
 
-#: index.docbook:411
+#. Tag: para
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "<![CDATA[import org.hibernate.Transaction;\n"
 "import org.hibernate.Session;\n"
@@ -1268,36 +1256,45 @@
 "\n"
 "}]]>"
 
-#: index.docbook:419
+#. Tag: para
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "Leemos algunos argumentos de la l&#x00ed;nea de comandos, y si el primer "
 "argumento es \"store\", creamos y almacenamos un nuevo Event:"
 
-#: index.docbook:430
+#. Tag: para
+#: tutorial.xml:529
+#, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "<![CDATA[private void createAndStoreEvent(String title, Date theDate) {\n"
 "    Session session = HibernateUtil.currentSession();\n"
 "    Transaction tx = session.beginTransaction();\n"
@@ -1312,18 +1309,21 @@
 "    HibernateUtil.closeSession();\n"
 "}]]>"
 
-#: index.docbook:441
+#. Tag: para
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "Creamos un nuevo objeto <literal>Event</literal>, y se lo damos a Hibernate. "
 "Hibernate cuida ahora del SQL y ejecuta <literal>INSERT</literal>s en la "
@@ -1331,11 +1331,13 @@
 "<literal>Session</literal> y <literal>Transaction</literal> antes de "
 "ejecutar esto."
 
-#: index.docbook:452
+#. Tag: para
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "Una <literal>Session</literal> es una sola unidad de trabajo. Podr&#x00ed;a "
 "sorprenderte que tengamos una API adicional, <literal>Transaction</literal>. "
@@ -1352,65 +1354,32 @@
 "granularidad uno-a-uno entre una <literal>Session</literal> y una "
 "<literal>Transaction</literal>."
 
-#: index.docbook:458
+#. Tag: para
+#: tutorial.xml:574
+#, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"¿Qu&#x00e9; es lo que hacen <literal>Transaction.begin()</literal> y "
-"<literal>commit()</literal>? ¿D&#x00f3;nde est&#x00e1; el rollback en caso "
-"que algo vaya mal? La API de <literal>Transaction</literal> de Hibernate es "
-"opcional realmente, pero la usamos por conveniencia y portabilidad. Si "
-"manejases la transacci&#x00f3;n de base de datos por ti mismo (por ejemplo, "
-"llamando a <literal>session.connection.commit()</literal>), ligar&#x00ed;as "
-"el c&#x00f3;digo a un entorno de despliegue particular, en este JDBC directo "
-"no manejado. Estableciendo la f&#x00e1;brica de <literal>Transaction</"
-"literal> en tu configuraci&#x00f3;n de Hibernate puedes desplegar tu capa de "
-"persistencia en cualquier sitio. Echa una mirada al <xref linkend="
-"\"transactions\"/> para m&#x00e1;s informaci&#x00f3;n sobre manejo y "
-"demarcaci&#x00f3;n de transacciones. Hemos saltado tambi&#x00e9;n cualquier "
-"manejo de excepciones y rollback en este ejemplo."
 
-#: index.docbook:462
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
+#. Tag: para
+#: tutorial.xml:581
+#, no-c-format
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"Para ejecutar la primera rutina tenemos que agregar un objetivo llamable al "
-"fichero de construcci&#x00f3;n de Ant:"
 
-#: index.docbook:464
+#. Tag: para
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
-msgstr ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"EventManager\" classpathref=\"libraries"
-"\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-
-#: index.docbook:469
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-"El valor del argumento <literal>action</literal> es establecido por l&#x00ed;"
-"nea de comandos al llamar al objetivo:"
-
-#: index.docbook:471
-msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
 
-#: index.docbook:476
+#. Tag: programlisting
+#: tutorial.xml:591
+#, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
 "values (?, ?, ?)]]>"
@@ -1419,45 +1388,47 @@
 "y, dependiendo de tu configuraci&#x00f3;n mucha salida de registro (log). Al "
 "final encontrar&#x00e1;s la siguiente l&#x00ed;nea:"
 
-#: index.docbook:478
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+#. Tag: para
+#: tutorial.xml:593
+#, no-c-format
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
-"values (?, ?, ?)]]>"
 
-#: index.docbook:484
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#. Tag: para
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "Esta es la <literal>INSERT</literal> ejecutada por Hibernate, los signos de "
 "preguntas representan par&#x00e1;metros de ligado JDBC. Para ver los valores "
 "ligados como argumentos, o para reducir la verborragia del registro, chequea "
 "tu <literal>log4j.properties</literal>."
 
-#: index.docbook:488
+#. Tag: programlisting
+#: tutorial.xml:601
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 "Ahora quisi&#x00e9;ramos listar acontecimientos almacenados tambi&#x00e9;n, "
 "as&#x00ed; que agregamos una opci&#x00f3;n al m&#x00e9;todo principal:"
 
-#: index.docbook:490
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#. Tag: para
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr ""
 "<![CDATA[if (args[0].equals(\"store\")) {\n"
 "    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
@@ -1471,32 +1442,31 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:494
+#. Tag: programlisting
+#: tutorial.xml:607
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 "Agregamos tambi&#x00e9;n un nuevo m&#x00e9;todo <literal>listEvents()</"
 "literal>:"
 
-#: index.docbook:496
+#. Tag: para
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "<![CDATA[private List listEvents() {\n"
 "    Session session = HibernateUtil.currentSession();\n"
@@ -1510,65 +1480,18 @@
 "    return result;\n"
 "}]]>"
 
-#: index.docbook:503
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr ""
-"Lo que hacemos aqu&#x00ed; es usar una consulta HQL (Lenguaje de Consulta de "
-"Hibernate o Hibernate Query Language) para cargar todos los objetos "
-"<literal>Event</literal> existentes de la base de datos. Hibernate "
-"generar&#x00e1; el SQL apropiado, lo enviar&#x00e1; a la base de datosy "
-"poblar&#x00e1; los objetos <literal>Event</literal> con datos. Puedes, por "
-"supuesto, crear consultas m&#x00e1;s complejas con HQL."
-
-#: index.docbook:509
+#. Tag: para
+#: tutorial.xml:617
+#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
-msgstr "Now, to execute and test all of this, follow these steps:"
-
-#: index.docbook:515
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
 
-#: index.docbook:525
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-
-#: index.docbook:531
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-
-#: index.docbook:544
+#. Tag: title
+#: tutorial.xml:627
+#, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr ""
 "Note: Most new Hibernate users fail at this point and we see questions about "
@@ -1578,14 +1501,19 @@
 "application restarts will use this schema. If you change the mapping and/or "
 "database schema, you have to re-enable hbm2ddl once again."
 
-#: index.docbook:546
+#. Tag: para
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr "Part 2 - Mapeando asociaciones"
 
-#: index.docbook:552
+#. Tag: title
+#: tutorial.xml:637
+#, no-c-format
 msgid "Mapping the Person class"
 msgstr ""
 "Hemos mapeado un clase de entidad persistente a una tabla. Construyamos "
@@ -1593,13 +1521,17 @@
 "personas a nuestra aplicaci&#x00f3;n, y almacenaremos una lista de eventos "
 "en las que participan."
 
-#: index.docbook:554
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#. Tag: para
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr "Mapeando la clase Person"
 
-#: index.docbook:558
+#. Tag: programlisting
+#: tutorial.xml:643
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1615,29 +1547,29 @@
 "}]]>"
 msgstr "El primer corte de la clase <literal>Person</literal> es simple:"
 
-#: index.docbook:560
+#. Tag: para
+#: tutorial.xml:645
+#, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"<![CDATA[public class Person {\n"
-"\n"
-"    private Long id;\n"
-"    private int age;\n"
-"    private String firstname;\n"
-"    private String lastname;\n"
-"\n"
-"    Person() {}\n"
-"\n"
-"    // Accessor methods for all properties, private setter for 'id'\n"
-"\n"
-"}]]>"
 
-#: index.docbook:565
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
+#. Tag: programlisting
+#: tutorial.xml:655
+#, fuzzy, no-c-format
+msgid ""
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1649,7 +1581,9 @@
 "</hibernate-mapping>]]>"
 msgstr "Crea un fichero de mapeo llamado <literal>Person.hbm.xml</literal>:"
 
-#: index.docbook:567
+#. Tag: para
+#: tutorial.xml:657
+#, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1665,25 +1599,30 @@
 "\n"
 "</hibernate-mapping>]]>"
 
-#: index.docbook:571
+#. Tag: programlisting
+#: tutorial.xml:661
+#, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
 "<mapping resource=\"events/Person.hbm.xml\"/>]]>"
 msgstr ""
 "Finalmente, agrega el nuevo mapeo a la configuraci&#x00f3;n de Hibernate:"
 
-#: index.docbook:573
+#. Tag: para
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "<![CDATA[        <mapping resource=\"Event.hbm.xml\"/>\n"
 "        <mapping resource=\"Person.hbm.xml\"/>\n"
 "]]>"
 
-#: index.docbook:583
+#. Tag: title
+#: tutorial.xml:673
+#, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr ""
 "Crearemos ahora una asociaci&#x00f3;n entre estas dos entidades. Obviamente, "
@@ -1691,31 +1630,23 @@
 "participantes. Las cuestiones de dise&#x00f1;o con que tenemos que tratar "
 "son: direccionalidad, multiplicidad y comportamiento de colecci&#x00f3;n."
 
-#: index.docbook:585
+#. Tag: para
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr "Una asociaci&#x00f3;n unidireccional basada en Set"
 
-#: index.docbook:592
+#. Tag: programlisting
+#: tutorial.xml:686
+#, no-c-format
 msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr ""
-"Agregaremos una colecci&#x00f3;n de eventos a la clase <literal>Person</"
-"literal>. De esta forma podemos navegar facilmente a los eventos de una "
-"persona en particular, sin ejecutar una consulta expl&#x00ed;cita, llamando "
-"a <literal>aPerson.getEvents()</literal>. Usamos una colecci&#x00f3;n Java, "
-"un <literal>Set</literal>, porque la colecci&#x00f3;n no contendr&#x00e1; "
-"elementos duplicados y el ordenamiento no nos es relevante."
-
-#: index.docbook:597
-msgid ""
 "<![CDATA[public class Person {\n"
 "\n"
 "    private Set events = new HashSet();\n"
@@ -1733,18 +1664,19 @@
 "multivaluadas, implementadas con un <literal>Set</literal>. Escribamos el "
 "c&#x00f3;digo para esto en las clases Java y luego lo mapeemos:"
 
-#: index.docbook:599
+#. Tag: para
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "<![CDATA[public class Person {\n"
 "\n"
@@ -1759,9 +1691,11 @@
 "    }\n"
 "}]]>"
 
-#: index.docbook:610
+#. Tag: programlisting
+#: tutorial.xml:701
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1771,7 +1705,7 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
@@ -1786,20 +1720,21 @@
 "llamamos a esto una asociaci&#x00f3;n <emphasis>muchos-a-muchos</emphasis>. "
 "Por lo tanto, usamos un mapeo many-to-many de Hibernate:"
 
-#: index.docbook:612
+#. Tag: para
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
@@ -1816,7 +1751,9 @@
 "\n"
 "</class>]]>"
 
-#: index.docbook:624
+#. Tag: para
+#: tutorial.xml:719
+#, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr ""
 "Hibernate soporta todo tipo de mapeos de colecci&#x00f3;n, siendo el "
@@ -1833,7 +1770,9 @@
 "de los objetos en tu colecci&#x00f3;n (correcto: la clase del otro lado de "
 "la colecci&#x00f3;n de referencias)."
 
-#: index.docbook:628
+#. Tag: programlisting
+#: tutorial.xml:723
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "    _____________        __________________\n"
@@ -1850,7 +1789,9 @@
 " ]]>"
 msgstr "El esquema de base de datos para este mapeo es, por lo tanto:"
 
-#: index.docbook:633
+#. Tag: title
+#: tutorial.xml:728
+#, no-c-format
 msgid "Working the association"
 msgstr ""
 "<![CDATA[\n"
@@ -1867,49 +1808,50 @@
 "                                                  |_____________|\n"
 " ]]>"
 
-#: index.docbook:635
+#. Tag: para
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr "Trabajando la asociaci&#x00f3;n"
 
-#: index.docbook:639
+#. Tag: programlisting
+#: tutorial.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 "Traigamos alguna gente y eventos juntos en un nuevo m&#x00e9;todo en "
 "<literal>EventManager</literal>:"
 
-#: index.docbook:641
+#. Tag: para
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
 "    Session session = HibernateUtil.currentSession();\n"
@@ -1924,13 +1866,15 @@
 "    HibernateUtil.closeSession();\n"
 "}]]>"
 
-#: index.docbook:656
+#. Tag: para
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "Despu&#x00e9;s de cargar una <literal>Person</literal> y un <literal>Event</"
 "literal>, simplemente modifica la colecci&#x00f3;n usando sus m&#x00e9;todos "
@@ -1948,40 +1892,39 @@
 "datos, usualmente s&#x00f3;lo al final de una unidad de trabajo, es llamado "
 "<emphasis>limpieza (flushing)</emphasis>."
 
-#: index.docbook:663
+#. Tag: programlisting
+#: tutorial.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 "Podr&#x00ed;as, por supuesto, cargar persona y evento en unidades de trabajo "
 "diferentes. O modificas un objeto fuera de una <literal>Session</literal>, "
@@ -1989,13 +1932,15 @@
 "llamamos a este estado <emphasis>separado (detached) </emphasis>). En "
 "c&#x00f3;digo (no muy realista), esto se ver&#x00ed;a como sigue:"
 
-#: index.docbook:665
+#. Tag: para
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
 "\n"
@@ -2020,30 +1965,34 @@
 "    }\n"
 "]]>"
 
-#: index.docbook:672
+#. Tag: para
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "La llamada a <literal>update</literal> hace a un objeto persistente de "
 "nuevo, podr&#x00ed;as decir que la liga a una nueva unidad de trabajo, de "
 "modo que cualquier modificaci&#x00f3;n que le hagas mientras est&#x00e9; "
 "separado puede ser salvada a base de datos."
 
-#: index.docbook:680
+#. Tag: programlisting
+#: tutorial.xml:783
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 "Bueno, esto no es muy usado en nuestra situaci&#x00f3;n actual, pero es un "
 "concepto importante que puedes dise&#x00f1;ar en tu propia aplicaci&#x00f3;"
@@ -2052,20 +2001,22 @@
 "la l&#x00ed;nea de comandos. Si necesitas los identificadores de una persona "
 "o evento, el m&#x00e9;todo <literal>save()</literal> los devuelve."
 
-#: index.docbook:682
+#. Tag: para
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "Esto fue un ejemplo de una asociaci&#x00f3;n entre dos clases igualmente "
 "importantes, dos entidades. Como se ha mencionado anteriormente, hay otras "
@@ -2082,9 +2033,11 @@
 "puedes escribir por ti mismo clases dependientes, por ejemplo, "
 "<literal>Address</literal> o <literal>MonetaryAmount</literal>."
 
-#: index.docbook:695
+#. Tag: para
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -2092,33 +2045,34 @@
 "Esto es conceptualmente muy diferente de una colecci&#x00f3;n de referencias "
 "a otras entidades, pero se ve casi lo mismo en Java."
 
-#: index.docbook:703
+#. Tag: title
+#: tutorial.xml:812
+#, no-c-format
 msgid "Collection of values"
 msgstr "Colecci&#x00f3;n de valores"
 
-#: index.docbook:705
+#. Tag: para
+#: tutorial.xml:814
+#, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"Agregamos una colecci&#x00f3;n de objetos tipificados en valor a la entidad "
-"<literal>Person</literal>. Queremos almacenar direcciones de email, de modo "
-"que el tipo que usamos es <literal>String</literal>, y la colecci&#x00f3;n "
-"es nuevamente un <literal>Set</literal>:"
 
-#: index.docbook:710
+#. Tag: programlisting
+#: tutorial.xml:820
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 "<![CDATA[private Set emailAddresses = new HashSet();\n"
 "\n"
@@ -2130,34 +2084,41 @@
 "    this.emailAddresses = emailAddresses;\n"
 "}]]>"
 
-#: index.docbook:712
-msgid "The mapping of this <literal>Set</literal>:"
+#. Tag: para
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "El mapeo de este <literal>Set</literal>:"
 
-#: index.docbook:716
+#. Tag: programlisting
+#: tutorial.xml:826
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 "<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
 "    <key column=\"PERSON_ID\"/>\n"
 "    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
 "</set>]]>"
 
-#: index.docbook:718
+#. Tag: para
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "La diferencia comparada con el mapeo anterior es la parte <literal>element</"
 "literal>, que le dice a Hibernate que la colecci&#x00f3;n no contiene "
@@ -2171,11 +2132,15 @@
 "<literal>element</literal> define el nombre de columna donde realmente "
 "ser&#x00e1;n almacenados los valores <literal>String</literal>."
 
-#: index.docbook:728
-msgid "Have a look at the updated schema:"
+#. Tag: para
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "Echa una mirada al esquema actualizado:"
 
-#: index.docbook:732
+#. Tag: programlisting
+#: tutorial.xml:848
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "  _____________        __________________\n"
@@ -2219,10 +2184,12 @@
 "                                                |_____________|\n"
 " ]]>"
 
-#: index.docbook:734
+#. Tag: para
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -2231,10 +2198,12 @@
 "no pueden haber direcciones de email duplicadas por persona, que es "
 "exactamente la sem&#x00e1;ntica que necesitamos para un conjunto en Java."
 
-#: index.docbook:740
+#. Tag: para
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
 "{\n"
@@ -2255,51 +2224,55 @@
 "();\n"
 "}]]>"
 
-#: index.docbook:745
+#. Tag: programlisting
+#: tutorial.xml:861
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 "Puedes ahora intentar y agregar elementos a esta colecci&#x00f3;n, al igual "
 "que hicimos antes enlazando personas y eventos. Es el mismo c&#x00f3;digo en "
 "Java."
 
-#: index.docbook:747
+#. Tag: para
+#: tutorial.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
 "collection. Hence, the call to its getter method will trigger an additional "
 "select to initialize it, so we can add an element to it. Monitor the SQL log "
 "and try to optimize this with an eager fetch."
 
-#: index.docbook:757
+#. Tag: title
+#: tutorial.xml:872
+#, no-c-format
 msgid "Bi-directional associations"
 msgstr "Asociaciones bidireccionales"
 
-#: index.docbook:759
+#. Tag: para
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "A continuacion vamos a mapear una asociaci&#x00f3;n bidireccional, haciendo "
 "que la asociaci&#x00f3;n entre persona y evento funcione desde ambos lados "
@@ -2310,25 +2283,38 @@
 "navegaci&#x00f3;n; los datos pueden ser vistos y recuperados en cualquier "
 "forma posible."
 
-#: index.docbook:767
+#. Tag: para
+#: tutorial.xml:882
+#, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr ""
 "Primero agrega una colecci&#x00f3;n de participantes a la clase de eventos "
 "<literal>Event</literal>:"
 
-#: index.docbook:771
+#. Tag: programlisting
+#: tutorial.xml:895
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 "<![CDATA[private Set participants = new HashSet();\n"
 "\n"
@@ -2340,21 +2326,24 @@
 "    this.participants = participants;\n"
 "}]]>"
 
-#: index.docbook:773
+#. Tag: para
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr ""
 "Ahora mapea este lado de la asociaci&#x00f3;n tambi&#x00e9;n, en "
 "<literal>Event.hbm.xml</literal>."
 
-#: index.docbook:777
+#. Tag: programlisting
+#: tutorial.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 "<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
 "\">\n"
@@ -2362,14 +2351,16 @@
 "    <many-to-many column=\"PERSON_ID\" class=\"Person\"/>\n"
 "</set>]]>"
 
-#: index.docbook:779
+#. Tag: para
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "Como ves, estos son mapeos normales de <literal>set</literal> en ambos "
 "documentos de mapeo. Nota que los nombres de columnas en <literal>key</"
@@ -2378,12 +2369,14 @@
 "el atributo <literal>inverse=\"true\"</literal> en el elemento <literal>set</"
 "literal> del mapeo de colecci&#x00f3;n de <literal>Event</literal>."
 
-#: index.docbook:787
+#. Tag: para
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "Lo que esto significa es que Hibernate debe tomar el otro lado - la clase "
 "<literal>Person</literal> - cuando necesite descubrir informaci&#x00f3;n "
@@ -2391,21 +2384,25 @@
 "cil de entender una vez que veas c&#x00f3;mo se crea el enlace bidireccional "
 "entre nuestras dos entidades."
 
-#: index.docbook:796
+#. Tag: title
+#: tutorial.xml:920
+#, no-c-format
 msgid "Working bi-directional links"
 msgstr "Trabajando enlaces bidireccionales"
 
-#: index.docbook:798
+#. Tag: para
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "Primero, ten en mente que Hhibernate no afecta la sem&#x00e1;ntica normal de "
 "Java. ¿C&#x00f3;mo hemos creado un enlace entre una <literal>Person</"
@@ -2418,34 +2415,38 @@
 "<literal>Event</literal>. Este \"establecer el enlace a ambos lados\" es "
 "absolutamente necesario y nunca debes olvidar hacerlo."
 
-#: index.docbook:808
+#. Tag: para
+#: tutorial.xml:932
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"Many developers program defensively and create link management methods to "
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "Muchos desarrolladores programan a la defensiva y crean m&#x00e9;todos de "
 "manejo de un enlace para establecer correctamente ambos lados, por ejemplo "
 "en <literal>Person</literal>:"
 
-#: index.docbook:813
+#. Tag: programlisting
+#: tutorial.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 "<![CDATA[protected Set getEvents() {\n"
 "    return events;\n"
@@ -2465,13 +2466,14 @@
 "    event.getParticipants().remove(this);\n"
 "}]]>"
 
-#: index.docbook:815
+#. Tag: para
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "Nota que los m&#x00e9;todos get y set para esta colecci&#x00f3;n son ahora "
 "protegidos. Esto le permite a clases en el mismo paquete y a subclases "
@@ -2479,22 +2481,22 @@
 "ensuciarse con la colecci&#x00f3;n directamente (bueno, casi). Probablemente "
 "debas hacer lo mismo con la colecci&#x00f3;n al otro lado."
 
-#: index.docbook:822
+#. Tag: para
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "Y ¿qu&#x00e9; del atributo de mapeo <literal>inverse</literal>? Para ti, y "
 "para Java, un enlace bidireccional es simplemente cuesti&#x00f3;n de "
@@ -2513,19 +2515,19 @@
 "ser el lado-de-muchos. En una asociaci&#x00f3;n muchos-a-muchos, puedes "
 "tomar cualquier lado, no hay diferencia."
 
-#: index.docbook:837
-msgid "Let's turn this into a small web application."
-msgstr "Let's turn this into a small web application."
-
-#: index.docbook:844
+#. Tag: title
+#: tutorial.xml:962
+#, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "Part 3 - The EventManager web application"
 
-#: index.docbook:846
+#. Tag: para
+#: tutorial.xml:964
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2535,70 +2537,62 @@
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 
-#: index.docbook:854
+#. Tag: title
+#: tutorial.xml:972
+#, no-c-format
 msgid "Writing the basic servlet"
 msgstr "Writing the basic servlet"
 
-#: index.docbook:856
+#. Tag: para
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
 msgstr ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
+"method we implement is <literal>doGet()</literal>:"
 
-#: index.docbook:861
+#. Tag: programlisting
+#: tutorial.xml:980
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-"<![CDATA[package events;\n"
-"                                                 \n"
-"                                                 // Imports\n"
-"                                                 \n"
-"                                                 public class "
-"EventManagerServlet extends HttpServlet {\n"
-"                                                 \n"
-"                                                 // Servlet code\n"
-"                                                 }]]>"
-
-#: index.docbook:863
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-
-#: index.docbook:868
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
@@ -2639,16 +2633,25 @@
 "                                                   \n"
 "                                                   }]]>"
 
-#: index.docbook:870
+#. Tag: para
+#: tutorial.xml:982
+#, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
+#, fuzzy, no-c-format
+msgid ""
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
+msgstr ""
 "The pattern we are applying here is called <emphasis>session-per-request</"
 "emphasis>. When a request hits the servlet, a new Hibernate "
 "<literal>Session</literal> is opened through the first call to "
@@ -2657,7 +2660,9 @@
 "occur inside a transaction, no matter if data is read or written (we don't "
 "use the auto-commit mode in applications)."
 
-#: index.docbook:879
+#. Tag: para
+#: tutorial.xml:996
+#, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
 "for every database operation. Use one Hibernate <literal>Session</literal> "
@@ -2669,24 +2674,28 @@
 "that is scoped to the whole request. Use <literal>getCurrentSession()</"
 "literal>, so that it is automatically bound to the current Java thread."
 
-#: index.docbook:886
+#. Tag: para
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "Next, the possible actions of the request are processed and the response "
 "HTML is rendered. We'll get to that part soon."
 
-#: index.docbook:891
+#. Tag: para
+#: tutorial.xml:1008
+#, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occured during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "Finally, the unit of work ends when processing and rendering is complete. If "
 "any problem occured during processing or rendering, an exception will be "
@@ -2697,44 +2706,55 @@
 "called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
 "soon as you consider rendering your view in JSP, not in a servlet."
 
-#: index.docbook:905
+#. Tag: title
+#: tutorial.xml:1022
+#, no-c-format
 msgid "Processing and rendering"
 msgstr "Processing and rendering"
 
-#: index.docbook:907
+#. Tag: para
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr ""
 "Let's implement the processing of the request and rendering of the page."
 
-#: index.docbook:911
+#. Tag: programlisting
+#: tutorial.xml:1028
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 "<![CDATA[// Write HTML header\n"
 "                                            PrintWriter out = response."
@@ -2777,13 +2797,15 @@
 "                                            out.flush();\n"
 "                                            out.close();]]>"
 
-#: index.docbook:913
+#. Tag: para
+#: tutorial.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr ""
 "Granted, this coding style with a mix of Java and HTML would not scale in a "
@@ -2793,17 +2815,21 @@
 "all events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 
-#: index.docbook:922
+#. Tag: programlisting
+#: tutorial.xml:1039
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 "<![CDATA[private void printEventForm(PrintWriter out) {\n"
 "                                                                     out."
@@ -2821,7 +2847,9 @@
 "println(\"</form>\");\n"
 "                                                                     }]]>"
 
-#: index.docbook:924
+#. Tag: para
+#: tutorial.xml:1041
+#, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
 "<literal>Session</literal> bound to the current thread to execute a query:"
@@ -2829,32 +2857,34 @@
 "The <literal>listEvents()</literal> method uses the Hibernate "
 "<literal>Session</literal> bound to the current thread to execute a query:"
 
-#: index.docbook:930
+#. Tag: programlisting
+#: tutorial.xml:1047
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 "<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
@@ -2895,7 +2925,9 @@
 "                                                                }\n"
 "                                                                }]]>"
 
-#: index.docbook:932
+#. Tag: para
+#: tutorial.xml:1049
+#, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
 "<literal>createAndStoreEvent()</literal> method, which also uses the "
@@ -2905,16 +2937,19 @@
 "<literal>createAndStoreEvent()</literal> method, which also uses the "
 "<literal>Session</literal> of the current thread:"
 
-#: index.docbook:938
+#. Tag: programlisting
+#: tutorial.xml:1055
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 "<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
 "                                                                                Event "
@@ -2931,16 +2966,18 @@
 "                                                                                }]]"
 ">"
 
-#: index.docbook:940
+#. Tag: para
+#: tutorial.xml:1057
+#, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "That's it, the servlet is complete. A request to the servlet will be "
 "processed in a single <literal>Session</literal> and <literal>Transaction</"
@@ -2951,59 +2988,25 @@
 "more sophisticated design and move the data access code into data access "
 "objects (the DAO pattern). See the Hibernate Wiki for more examples."
 
-#: index.docbook:954
+#. Tag: title
+#: tutorial.xml:1071
+#, no-c-format
 msgid "Deploying and testing"
 msgstr "Deploying and testing"
 
-#: index.docbook:956
+#. Tag: para
+#: tutorial.xml:1073
+#, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
 
-#: index.docbook:961
+#. Tag: programlisting
+#: tutorial.xml:1079
+#, fuzzy, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"                                                                        <war "
-"destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"                                                                                <lib "
-"dir=\"${librarydir}\">\n"
-"                                                                                <exclude "
-"name=\"jsdk*.jar\"/>\n"
-"                                                                        </"
-"lib>\n"
-"                                                                        \n"
-"                                                                        <classes "
-"dir=\"${targetdir}\"/>\n"
-"                                                                </war>\n"
-"                                                        </target>]]>"
-
-#: index.docbook:963
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-
-#: index.docbook:969
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -3013,7 +3016,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -3050,35 +3054,32 @@
 "mapping>\n"
 "                                                        </web-app>]]>"
 
-#: index.docbook:971
+#. Tag: para
+#: tutorial.xml:1081
+#, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
-
-#: index.docbook:979
-msgid ""
 "To build and deploy call <literal>ant war</literal> in your project "
 "directory and copy the <literal>hibernate-tutorial.war</literal> file into "
 "your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
 "installed, download it and follow the installation instructions. You don't "
 "have to change any Tomcat configuration to deploy this application though."
+
+#. Tag: para
+#: tutorial.xml:1088
+#, no-c-format
+msgid ""
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
 msgstr ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
 
-#: index.docbook:987
+#. Tag: para
+#: tutorial.xml:1096
+#, no-c-format
 msgid ""
 "Once deployed and Tomcat is running, access the application at "
 "<literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. "
@@ -3094,44 +3095,691 @@
 "<literal>HibernateUtil</literal> is called) and to get the detailed output "
 "if any exceptions occurs."
 
-#: index.docbook:1000
+#. Tag: title
+#: tutorial.xml:1109
+#, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
-#: index.docbook:1002
+#. Tag: para
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "Este tutorial cubri&#x00f3; los fundamentos de escribir una simple "
 "aplicaci&#x00f3;n independiente de Hibernate."
 
-#: index.docbook:1007
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"Si ya te sientes confidente con Hibernate, contin&#x00fa;a navegando a "
-"trav&#x00e9;s de la tabla de contenidos de la documentaci&#x00f3;n de "
-"referencia para los temas que encuentres interesantes. Los m&#x00e1;s "
-"consultados son procesamiento transaccional (<xref linkend=\"transactions\"/"
-">), rendimiento de recuperaci&#x00f3;n (<xref linkend=\"performance\"/>), o "
-"el uso de la API (<xref linkend=\"objectstate\"/>) y las funcionalidades de "
-"consulta (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Introducci&#x00f3;n a Hibernate"
 
-#: index.docbook:1015
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-"No olvides chequear el sitio web de Hibernate por m&#x00e1;s "
-"(especializados) tutoriales."
+#~ msgid "Preface"
+#~ msgstr "Prefacio"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid ""
+#~ "This chapter is an introductory tutorial for new users of Hibernate. We "
+#~ "start with a simple command line application using an in-memory database "
+#~ "and develop it in easy to understand steps."
+#~ msgstr ""
+#~ "Este cap&#x00ed;tulo es un tutorial introductorio de Hibernate. "
+#~ "Comenzamos con una aplicaci&#x00f3;n simple de l&#x00ed;nea de comandos "
+#~ "usando un base de datos en-memoria y desarroll&#x00e1;ndola en f&#x00e1;"
+#~ "cil para entender los pasos."
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid ""
+#~ "This tutorial is intended for new users of Hibernate but requires Java "
+#~ "and SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-"
+#~ "party libraries we name are for JDK 1.4 and 5.0. You might need others "
+#~ "for JDK 1.3."
+#~ msgstr ""
+#~ "Este tutorial est&#x00e1; concebido para usuarios nuevos de Hibernate "
+#~ "pero requiere conocimiento en Java y SQL. Est&#x00e1; basado en un "
+#~ "tutorial de Michael Gloegl. Las bibliotecas de terceros que mencionamos "
+#~ "son para JDK 1.4 y 5.0. Podr&#x00ed;as necesitar otras para JDK 1.3."
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "UNTRANSLATED!!! The source code for the tutorial is included in the "
+#~ "distribution in the <literal>doc/reference/tutorial/</literal> directory."
+
+#~ msgid ""
+#~ "First, we'll create a simple console-based Hibernate application. We use "
+#~ "an Java database (HSQL DB), so we do not have to install any database "
+#~ "server."
+#~ msgstr ""
+#~ "Primero, crearemos una aplicaci&#x00f3;n simple de Hibenate basada en "
+#~ "consola. Usamos usamos una base de datos en-memoria (HSQL DB), de modo "
+#~ "que no necesitamos instalar ning&#x00fa;n servidor de base de datos."
+
+#~ msgid ""
+#~ "The first thing we do, is set up our development directory and put all "
+#~ "the Java libraries we need into it. Download the Hibernate distribution "
+#~ "from the Hibernate website. Extract the package and place all required "
+#~ "libraries found in <literal>/lib</literal> into into the <literal>/lib</"
+#~ "literal> directory of your new development working directory. It should "
+#~ "look like this:"
+#~ msgstr ""
+#~ "La primera cosa que hacemos, es armar nuestro directorio de desarrollo y "
+#~ "poner en &#x00e9;l todas las bibliotecas Java que necesitamos. Descarga "
+#~ "la distribuci&#x00f3;n de Hibernate del sitio web de Hibernate. Extrae el "
+#~ "paquete y coloca todas las bibliotecas requeridas encontradas en "
+#~ "<literal>/lib</literal> dentro del directorio <literal>/lib</literal> de "
+#~ "nuestro nuevo directorio de desarrollo de trabajo. Debe asemejarse a esto:"
+
+#~ msgid ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  antlr.jar\n"
+#~ "  cglib.jar\n"
+#~ "  asm.jar\n"
+#~ "  asm-attrs.jars\n"
+#~ "  commons-collections.jar\n"
+#~ "  commons-logging.jar\n"
+#~ "  hibernate3.jar\n"
+#~ "  jta.jar\n"
+#~ "  dom4j.jar\n"
+#~ "  log4j.jar ]]>"
+#~ msgstr ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  antlr.jar\n"
+#~ "  cglib-full.jar\n"
+#~ "  asm.jar\n"
+#~ "  asm-attrs.jars\n"
+#~ "  commons-collections.jar\n"
+#~ "  commons-logging.jar\n"
+#~ "  ehcache.jar\n"
+#~ "  hibernate3.jar\n"
+#~ "  jta.jar\n"
+#~ "  dom4j.jar\n"
+#~ "  log4j.jar ]]>"
+
+#~ msgid ""
+#~ "This is the minimum set of required libraries (note that we also copied "
+#~ "hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
+#~ "writing</emphasis>. The Hibernate release you are using might require "
+#~ "more or less libraries. See the <literal>README.txt</literal> file in the "
+#~ "<literal>lib/</literal> directory of the Hibernate distribution for more "
+#~ "information about required and optional third-party libraries. (Actually, "
+#~ "Log4j is not required but preferred by many developers.)"
+#~ msgstr ""
+#~ "Este es el conjunto m&#x00ed;nimo de bibliotecas requeridas para "
+#~ "Hibernate (observa que tambi&#x00e9;n hemos copiado hibernate3.jar, el "
+#~ "fichero principal). Ver el fichero <literal>README.txt</literal> en el "
+#~ "directorio <literal>lib/</literal> de la distribuci&#x00f3;n de Hibernate "
+#~ "para m&#x00e1;s informaci&#x00f3;n sobre bibliotecas de terceros "
+#~ "requeridas y opcionales. (Realmente, Log4J no es requerida aunque "
+#~ "preferida por muchos desarrolladores)."
+
+#~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "Nuestra primera clase persistente es un JavaBean simple con algunas "
+#~ "propiedades:"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "Coloca este fichero de c&#x00f3;digo Java en un directorio llamado "
+#~ "<literal>src</literal> en la carpeta de desarrollo. El directorio ahora "
+#~ "debe verse como esto:"
+
+#~ msgid ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  <Hibernate and third-party libraries>\n"
+#~ "+src\n"
+#~ "  +events\n"
+#~ "    Event.java]]>"
+#~ msgstr ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  <Hibernate and third-party libraries>\n"
+#~ "+src\n"
+#~ "  Event.java]]>"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr ""
+#~ "En el pr&#x00f3;ximo paso, le decimos a Hibernate sobre esta clase "
+#~ "persistente."
+
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifer "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "El elemento <literal>id</literal> el la declaraci&#x00f3;n de la "
+#~ "propiedad identificadora, <literal>name=\"id\"</literal> declara el "
+#~ "nombre de la propiedad Java. Hibernate usar&#x00e1; los m&#x00e9;todos "
+#~ "getter y setter para acceder a la propiedad. El attributo de columna dice "
+#~ "a Hibernate cu&#x00e1;l columna de la tabla <literal>EVENTS</literal> "
+#~ "usamos para esta clave primaria. El elemento anidado <literal>generator</"
+#~ "literal> especifica la estrategia de generaci&#x00f3;n de "
+#~ "identificadores, en este caso usamos <literal>increment</literal>, que es "
+#~ "un m&#x00e9;todo muy simple de incremento de n&#x00fa;mero en-memoria "
+#~ "&#x00fa;til mayormente para testeo (y tutoriales). Hibernate tambi&#x0e9;"
+#~ "n soporta identificadores generados por base de datos, globalmente "
+#~ "&#x00fa;nicos, as&#x00ed; como tambi&#x00e9;n asignados por "
+#~ "aplicaci&#x00f3;n (o cualquier estrategia para la que hayas escrito una "
+#~ "extensi&#x00f3;n)."
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "Este fichero de mapeo debe ser salvado como <literal>Event.hbm.xml</"
+#~ "literal>, justo en el directorio pr&#x00f3;ximo al fichero de c&#x00f3;"
+#~ "digo fuente de la clase Java <literal>Event</literal>. El nombrado de los "
+#~ "ficheros de mapeo puede ser arbitrario, sin embargo, el sufijo "
+#~ "<literal>hbm.xml</literal> se ha vuelto una convenci&#x00f3;n el la "
+#~ "comunidad de desarrolladores de Hibernate. La estructura de directorio "
+#~ "debe ahora verse como esto:"
+
+#~ msgid ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  <Hibernate and third-party libraries>\n"
+#~ "+src\n"
+#~ "  +events\n"
+#~ "    Event.java\n"
+#~ "    Event.hbm.xml]]>"
+#~ msgstr ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  <Hibernate and third-party libraries>\n"
+#~ "+src\n"
+#~ "  Event.java\n"
+#~ "  Event.hbm.xml]]>"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "Continuamos con la configuraci&#x00f3;n principal de Hibernate."
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "Tenemos ahora una clase persistente y su fichero de mapeo en su sitio. Es "
+#~ "momento de configurar Hibernate. Antes que hagamos esto, necesitaremos "
+#~ "una base de datos. HSQL DB, un DBMS SQL en-memoria basado en Java, puede "
+#~ "ser descargado del sitio web de HSQL DB. Realmente, de esta descarga "
+#~ "s&#x00f3;lo necesitas el <literal>hsqldb.jar</literal>. Coloca este "
+#~ "fichero en el directorio <literal>lib/</literal> de la carpeta de "
+#~ "desarrollo."
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "Hibernate es la capa en tu aplicaci&#x00f3;n que se conecta a esta base "
+#~ "de datos, de modo que necesita informaci&#x00f3;n de conexi&#x00f3;n. Las "
+#~ "conexiones se hacen a trav&#x00e9;s de un pool de conexiones JDBC, que "
+#~ "tamb&#x00e9;n tenemos que configurar. La distribuci&#x00f3;n de Hibernate "
+#~ "contiene muchas herramientas de pooling de conexiones JDBC de c&#x00f3;"
+#~ "digo abierto, pero para este tutorial usaremos el pool de conexiones "
+#~ "prefabricado dentro de Hibernate. Observa que tienes que copiar la "
+#~ "biblioteca requerida en tu classpath y usar diferentes configuraciones de "
+#~ "pooling de conexiones si quieres usar un software de pooling JDBC de "
+#~ "terceros de calidad de producci&#x00f3;n."
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "Copia este fichero dentro del directorio de c&#x00f3;digo fuente, de modo "
+#~ "que termine ubicado en la rai&#x00ed;z del classpath. Hibernate busca "
+#~ "autom&#x00e1;ticamente un fichero llamado <literal>hibernate.cfg.xml</"
+#~ "literal> en la ra&#x00ed;z del classpath al arrancar."
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "Construiremos ahora el tutorial con Ant. Necesitar&#x00e1;s tener Ant "
+#~ "instalado. Obt&#x00e9;nlo de <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">P&#x00e1;gina de descarga de Ant</ulink>. No se "
+#~ "cubrir&#x00e1; aqu&#x00ed; c&#x00f3;mo instalar Ant. Por favor "
+#~ "refi&#x00e9;rete al <ulink url=\"http://ant.apache.org/manual/index.html"
+#~ "\"> Manual de Ant</ulink>. Despu&#x00e9;s que hayas instalado Ant, "
+#~ "podemos comenzar a crear el buildfile. Ser&#x00e1; llamado <literal>build."
+#~ "xml</literal> y colocado directamente en el directorio de desarrollo."
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "Reparar Ant"
+
+#~ msgid ""
+#~ "<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
+#~ "\n"
+#~ "    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
+#~ "    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
+#~ "    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
+#~ "\n"
+#~ "    <path id=\"libraries\">\n"
+#~ "        <fileset dir=\"${librarydir}\">\n"
+#~ "            <include name=\"*.jar\"/>\n"
+#~ "        </fileset>\n"
+#~ "    </path>\n"
+#~ "\n"
+#~ "    <target name=\"clean\">\n"
+#~ "        <delete dir=\"${targetdir}\"/>\n"
+#~ "        <mkdir dir=\"${targetdir}\"/>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
+#~ "      <javac srcdir=\"${sourcedir}\"\n"
+#~ "             destdir=\"${targetdir}\"\n"
+#~ "             classpathref=\"libraries\"/>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "    <target name=\"copy-resources\">\n"
+#~ "        <copy todir=\"${targetdir}\">\n"
+#~ "            <fileset dir=\"${sourcedir}\">\n"
+#~ "                <exclude name=\"**/*.java\"/>\n"
+#~ "            </fileset>\n"
+#~ "        </copy>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "</project>]]>"
+#~ msgstr ""
+#~ "Observa que la distribuci&#x00f3;n de Ant est&#x00e1; por defecto rota "
+#~ "(como se describe en el FAQ de Ant) y tiene que ser reparado por ti, por "
+#~ "ejemplo, si quisieras usar JUnit desde dentro de tu fichero de "
+#~ "construcci&#x00f3;n. Para hacer que funcione la tarea de JUnit (no lo "
+#~ "necesitaremos en este tutorial), copia junit.jar a <literal>ANT_HOME/lib</"
+#~ "literal> o quita el trozo de plugin <literal>ANT_HOME/lib/ant-junit.jar</"
+#~ "literal>."
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr "Un fichero de construcci&#x00f3;n b&#x00e1;sico se ve como esto:"
+
+#~ msgid ""
+#~ "<![CDATA[C:\\hibernateTutorial\\>ant\n"
+#~ "Buildfile: build.xml\n"
+#~ "\n"
+#~ "copy-resources:\n"
+#~ "     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
+#~ "\n"
+#~ "compile:\n"
+#~ "    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
+#~ "\n"
+#~ "BUILD SUCCESSFUL\n"
+#~ "Total time: 1 second ]]>"
+#~ msgstr ""
+#~ "<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
+#~ "\n"
+#~ "    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
+#~ "    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
+#~ "    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
+#~ "\n"
+#~ "    <path id=\"libraries\">\n"
+#~ "        <fileset dir=\"${librarydir}\">\n"
+#~ "            <include name=\"*.jar\"/>\n"
+#~ "        </fileset>\n"
+#~ "    </path>\n"
+#~ "\n"
+#~ "    <target name=\"clean\">\n"
+#~ "        <delete dir=\"${targetdir}\"/>\n"
+#~ "        <mkdir dir=\"${targetdir}\"/>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
+#~ "      <javac srcdir=\"${sourcedir}\"\n"
+#~ "             destdir=\"${targetdir}\"\n"
+#~ "             classpathref=\"libraries\"/>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "    <target name=\"copy-resources\">\n"
+#~ "        <copy todir=\"${targetdir}\">\n"
+#~ "            <fileset dir=\"${sourcedir}\">\n"
+#~ "                <exclude name=\"**/*.java\"/>\n"
+#~ "            </fileset>\n"
+#~ "        </copy>\n"
+#~ "    </target>\n"
+#~ "\n"
+#~ "</project>]]>"
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "Esta clase no &#x00f3;lo produce la <literal>SessionFactory</literal> "
+#~ "global en su inicializador static (llamado s&#x00f3;lo una vez por la JVM "
+#~ "al cargar la clase), sino que tambi&#x00e9;n tiene una variable "
+#~ "<literal>ThreadLocal</literal> para tener la <literal>Session</literal> "
+#~ "para la hebra actual. No importa cu&#x00e1;ndo llames a "
+#~ "<literal>HibernateUtil.currentSession()</literal>, siempre "
+#~ "devolver&#x00e1; la misma unidad de trabajo de Hibernate en la misma "
+#~ "hebra. Una llamada a <literal>HibernateUtil.closeSession()</literal> "
+#~ "termina la unidad de trabajo actualmente asociada a la hebra."
+
+#~ msgid ""
+#~ "<![CDATA[.\n"
+#~ "+lib\n"
+#~ "  <Hibernate and third-party libraries>\n"
+#~ "+src\n"
+#~ "  +events\n"
+#~ "    Event.java\n"
+#~ "    Event.hbm.xml\n"
+#~ "  +util\n"
+#~ "    HibernateUtil.java\n"
+#~ "  hibernate.cfg.xml\n"
+#~ "+data\n"
+#~ "build.xml]]>"
+#~ msgstr ""
+#~ "Aseg&#x00fa;rate de entender el concepto Java de una variable local a una "
+#~ "hebra antes de usar esta ayuda. Una clase <literal>HibernateUtil</"
+#~ "literal> m&#x00e1;s potente puede encontrarse en <literal>CaveatEmptor</"
+#~ "literal>, http://caveatemptor.hibernate.org/, as&#x00ed; como en el libro "
+#~ "\"Java Persistence with Hibernate\". Observa que esta clase no es "
+#~ "necesaria si despliegas Hibernate en un servidor de aplicaciones J2EE: "
+#~ "una <literal>Session</literal> ser&#x00e1; autom&#x00e1;ticamente ligada "
+#~ "a la transacci&#x00f3;n JTA actual, y puedes buscar la "
+#~ "<literal>SessionFactory</literal> a trav&#x00e9;s de JNDI. Si usas JBoss "
+#~ "AS, Hibernate puede ser desplegado como un servicio de sistema manejado y "
+#~ "autom&#x00e1;ticamente ligar&#x00e1; la <literal>SessionFactory</literal> "
+#~ "a un nombre JNDI."
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "¿Qu&#x00e9; es lo que hacen <literal>Transaction.begin()</literal> y "
+#~ "<literal>commit()</literal>? ¿D&#x00f3;nde est&#x00e1; el rollback en "
+#~ "caso que algo vaya mal? La API de <literal>Transaction</literal> de "
+#~ "Hibernate es opcional realmente, pero la usamos por conveniencia y "
+#~ "portabilidad. Si manejases la transacci&#x00f3;n de base de datos por ti "
+#~ "mismo (por ejemplo, llamando a <literal>session.connection.commit()</"
+#~ "literal>), ligar&#x00ed;as el c&#x00f3;digo a un entorno de despliegue "
+#~ "particular, en este JDBC directo no manejado. Estableciendo la f&#x00e1;"
+#~ "brica de <literal>Transaction</literal> en tu configuraci&#x00f3;n de "
+#~ "Hibernate puedes desplegar tu capa de persistencia en cualquier sitio. "
+#~ "Echa una mirada al <xref linkend=\"transactions\"/> para m&#x00e1;s "
+#~ "informaci&#x00f3;n sobre manejo y demarcaci&#x00f3;n de transacciones. "
+#~ "Hemos saltado tambi&#x00e9;n cualquier manejo de excepciones y rollback "
+#~ "en este ejemplo."
+
+#~ msgid ""
+#~ "<![CDATA[<target name=\"run\" depends=\"compile\">\n"
+#~ "    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
+#~ "\"libraries\">\n"
+#~ "        <classpath path=\"${targetdir}\"/>\n"
+#~ "        <arg value=\"${action}\"/>\n"
+#~ "    </java>\n"
+#~ "</target>]]>"
+#~ msgstr ""
+#~ "Para ejecutar la primera rutina tenemos que agregar un objetivo llamable "
+#~ "al fichero de construcci&#x00f3;n de Ant:"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "<![CDATA[<target name=\"run\" depends=\"compile\">\n"
+#~ "    <java fork=\"true\" classname=\"EventManager\" classpathref="
+#~ "\"libraries\">\n"
+#~ "        <classpath path=\"${targetdir}\"/>\n"
+#~ "        <arg value=\"${action}\"/>\n"
+#~ "    </java>\n"
+#~ "</target>]]>"
+
+#~ msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
+#~ msgstr ""
+#~ "El valor del argumento <literal>action</literal> es establecido por "
+#~ "l&#x00ed;nea de comandos al llamar al objetivo:"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, "
+#~ "EVENT_ID) values (?, ?, ?)]]>"
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr ""
+#~ "Lo que hacemos aqu&#x00ed; es usar una consulta HQL (Lenguaje de Consulta "
+#~ "de Hibernate o Hibernate Query Language) para cargar todos los objetos "
+#~ "<literal>Event</literal> existentes de la base de datos. Hibernate "
+#~ "generar&#x00e1; el SQL apropiado, lo enviar&#x00e1; a la base de datosy "
+#~ "poblar&#x00e1; los objetos <literal>Event</literal> con datos. Puedes, "
+#~ "por supuesto, crear consultas m&#x00e1;s complejas con HQL."
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr "Now, to execute and test all of this, follow these steps:"
+
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "<![CDATA[public class Person {\n"
+#~ "\n"
+#~ "    private Long id;\n"
+#~ "    private int age;\n"
+#~ "    private String firstname;\n"
+#~ "    private String lastname;\n"
+#~ "\n"
+#~ "    Person() {}\n"
+#~ "\n"
+#~ "    // Accessor methods for all properties, private setter for 'id'\n"
+#~ "\n"
+#~ "}]]>"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr ""
+#~ "Agregaremos una colecci&#x00f3;n de eventos a la clase <literal>Person</"
+#~ "literal>. De esta forma podemos navegar facilmente a los eventos de una "
+#~ "persona en particular, sin ejecutar una consulta expl&#x00ed;cita, "
+#~ "llamando a <literal>aPerson.getEvents()</literal>. Usamos una "
+#~ "colecci&#x00f3;n Java, un <literal>Set</literal>, porque la "
+#~ "colecci&#x00f3;n no contendr&#x00e1; elementos duplicados y el "
+#~ "ordenamiento no nos es relevante."
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "Agregamos una colecci&#x00f3;n de objetos tipificados en valor a la "
+#~ "entidad <literal>Person</literal>. Queremos almacenar direcciones de "
+#~ "email, de modo que el tipo que usamos es <literal>String</literal>, y la "
+#~ "colecci&#x00f3;n es nuevamente un <literal>Set</literal>:"
+
+#~ msgid "Let's turn this into a small web application."
+#~ msgstr "Let's turn this into a small web application."
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+
+#~ msgid ""
+#~ "<![CDATA[package events;\n"
+#~ "\n"
+#~ "// Imports\n"
+#~ "\n"
+#~ "public class EventManagerServlet extends HttpServlet {\n"
+#~ "\n"
+#~ "    // Servlet code\n"
+#~ "}]]>"
+#~ msgstr ""
+#~ "<![CDATA[package events;\n"
+#~ "                                                 \n"
+#~ "                                                 // Imports\n"
+#~ "                                                 \n"
+#~ "                                                 public class "
+#~ "EventManagerServlet extends HttpServlet {\n"
+#~ "                                                 \n"
+#~ "                                                 // Servlet code\n"
+#~ "                                                 }]]>"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+
+#~ msgid ""
+#~ "<![CDATA[<target name=\"war\" depends=\"compile\">\n"
+#~ "    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
+#~ "        <lib dir=\"${librarydir}\">\n"
+#~ "          <exclude name=\"jsdk*.jar\"/>\n"
+#~ "        </lib>\n"
+#~ "\n"
+#~ "        <classes dir=\"${targetdir}\"/>\n"
+#~ "    </war>\n"
+#~ "</target>]]>"
+#~ msgstr ""
+#~ "<![CDATA[<target name=\"war\" depends=\"compile\">\n"
+#~ "                                                                        <war "
+#~ "destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
+#~ "                                                                                <lib "
+#~ "dir=\"${librarydir}\">\n"
+#~ "                                                                                <exclude "
+#~ "name=\"jsdk*.jar\"/>\n"
+#~ "                                                                        </"
+#~ "lib>\n"
+#~ "                                                                        \n"
+#~ "                                                                        <classes "
+#~ "dir=\"${targetdir}\"/>\n"
+#~ "                                                                </war>\n"
+#~ "                                                        </target>]]>"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+#~ msgstr ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "Si ya te sientes confidente con Hibernate, contin&#x00fa;a navegando a "
+#~ "trav&#x00e9;s de la tabla de contenidos de la documentaci&#x00f3;n de "
+#~ "referencia para los temas que encuentres interesantes. Los m&#x00e1;s "
+#~ "consultados son procesamiento transaccional (<xref linkend=\"transactions"
+#~ "\"/>), rendimiento de recuperaci&#x00f3;n (<xref linkend=\"performance\"/"
+#~ ">), o el uso de la API (<xref linkend=\"objectstate\"/>) y las "
+#~ "funcionalidades de consulta (<xref linkend=\"objectstate-querying\"/>)."
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr ""
+#~ "No olvides chequear el sitio web de Hibernate por m&#x00e1;s "
+#~ "(especializados) tutoriales."
+
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,39 +1,51 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 
-#: index.docbook:5
+#. Tag: title
+#: xml.xml:29
+#, no-c-format
 msgid "XML Mapping"
 msgstr "Mapeo XML"
 
-#: index.docbook:7
+#. Tag: emphasis
+#: xml.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr ""
 "Nota que esta es una funcionalidad experimental en Hibernate 3.0 y está bajo "
 "un desarrollo extremadamente activo."
 
-#: index.docbook:13
+#. Tag: title
+#: xml.xml:37
+#, no-c-format
 msgid "Working with XML data"
 msgstr "Trabajando con datos XML"
 
-#: index.docbook:15
+#. Tag: para
+#: xml.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "Hibernate te permite trabajar con datos XML persistentes en casi la misma "
 "forma que trabajas con POJOs persistentes. Un árbol XML analizado (parsed) "
 "puede ser pensado como sólo otra forma de representar los datos relacionales "
 "a nivel de objetos, en vez de POJOs."
 
-#: index.docbook:22
+#. Tag: para
+#: xml.xml:46
+#, no-c-format
 msgid ""
 "Hibernate supports dom4j as API for manipulating XML trees. You can write "
 "queries that retrieve dom4j trees from the database and have any "
@@ -51,7 +63,9 @@
 "Hibernate: <literal>persist(), saveOrUpdate(), merge(), delete(), replicate()"
 "</literal> (la fusión no está aún soportada)."
 
-#: index.docbook:32
+#. Tag: para
+#: xml.xml:56
+#, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
 "externalization of entity data via JMS or SOAP and XSLT-based reporting."
@@ -60,25 +74,33 @@
 "exportación de datos, externalización de datos de entidad vía JMS o SOAP y "
 "reportes basados en XSLT."
 
-#: index.docbook:37
+#. Tag: para
+#: xml.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "Un solo mapeo puede ser usado para mapear simultáneamente las propiedades de "
 "una clase y los nodos de un documento XML a la base de datos, o, si no hay "
 "ninguna clase a mapear, puede ser usado para mapear sólo el XML."
 
-#: index.docbook:44
+#. Tag: title
+#: xml.xml:68
+#, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr "Especificando los mapeos de XML y de clase juntos"
 
-#: index.docbook:46
+#. Tag: para
+#: xml.xml:70
+#, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr "He aquí un ejemplo de mapear un POJO y XML simultáneamente:"
 
-#: index.docbook:50
+#. Tag: programlisting
+#: xml.xml:74
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Account\" \n"
 "        table=\"ACCOUNTS\" \n"
@@ -122,15 +144,21 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:54
+#. Tag: title
+#: xml.xml:78
+#, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr "Especificando sólo un mapeo XML"
 
-#: index.docbook:56
+#. Tag: para
+#: xml.xml:80
+#, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr "He aquí un ejemplo donde no hay ninguna clase POJO:"
 
-#: index.docbook:60
+#. Tag: programlisting
+#: xml.xml:84
+#, no-c-format
 msgid ""
 "<![CDATA[<class entity-name=\"Account\" \n"
 "        table=\"ACCOUNTS\" \n"
@@ -180,25 +208,31 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:62
+#. Tag: para
+#: xml.xml:86
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "Este mapeo te permite acceder a los datos como un árbol dom4j, o como un "
 "grafo de pares nombre/valor de propiedad (<literal>Map</literal>s de Java). "
 "Los nombres de propiedades son construcciones puramente lógicas a las que se "
 "puede hacer referencia en consultas HQL."
 
-#: index.docbook:73
+#. Tag: title
+#: xml.xml:97
+#, no-c-format
 msgid "XML mapping metadata"
 msgstr "Mapeo de metadatos XML"
 
-#: index.docbook:75
+#. Tag: para
+#: xml.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -207,28 +241,38 @@
 "que contenga los datos de la propiedad o entidad. El formato del atributo "
 "<literal>node</literal> debe ser uno de los siguientes:"
 
-#: index.docbook:84
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#. Tag: para
+#: xml.xml:108
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr "<literal>\"element-name\"</literal> - mapea al elemento XML mencionado"
 
-#: index.docbook:87
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#. Tag: para
+#: xml.xml:111
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 "<literal>\"@attribute-name\"</literal> - mapea al atributo XML mencionado"
 
-#: index.docbook:90
-msgid "<literal>\".\"</literal> - map to the parent element"
+#. Tag: para
+#: xml.xml:114
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - mapea al elemento padre"
 
-#: index.docbook:93
+#. Tag: para
+#: xml.xml:117
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - mapea al atributo "
 "mencionado del elemento mencionado"
 
-#: index.docbook:100
+#. Tag: para
+#: xml.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -236,7 +280,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "Para las colecciones y asociaciones monovaluadas, existe un atributo "
 "adicional <literal>embed-xml</literal>. Si <literal>embed-xml=\"true\"</"
@@ -247,15 +291,19 @@
 "el XML para asociaciones de punto único y para las colecciones simplemente "
 "no aparecerá en absoluto."
 
-#: index.docbook:110
+#. Tag: para
+#: xml.xml:134
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "¡Debes ser cuidadoso de no dejar <literal>embed-xml=\"true\"</literal> para "
 "demasiadas asociaciones, ya que XML no trata bien la circularidad!"
 
-#: index.docbook:115
+#. Tag: programlisting
+#: xml.xml:139
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
 "        table=\"CUSTOMER\" \n"
@@ -327,15 +375,19 @@
 "    \n"
 "</class>]]>"
 
-#: index.docbook:117
+#. Tag: para
+#: xml.xml:141
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "en este caso, hemos decidido embeber la colección de ids de cuenta, pero no "
 "los datos reales de cuenta. La siguiente consulta HQL:"
 
-#: index.docbook:122
+#. Tag: programlisting
+#: xml.xml:146
+#, no-c-format
 msgid ""
 "<![CDATA[from Customer c left join fetch c.accounts where c.lastName like :"
 "lastName]]>"
@@ -343,11 +395,15 @@
 "<![CDATA[from Customer c left join fetch c.accounts where c.lastName like :"
 "lastName]]>"
 
-#: index.docbook:124
-msgid "Would return datasets such as this:"
+#. Tag: para
+#: xml.xml:148
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "devolvería conjuntos de datos como estos:"
 
-#: index.docbook:128
+#. Tag: programlisting
+#: xml.xml:152
+#, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
 "    <account short-desc=\"Savings\">987632567</account>\n"
@@ -371,7 +427,9 @@
 "    ...\n"
 "</customer>]]>"
 
-#: index.docbook:130
+#. Tag: para
+#: xml.xml:154
+#, no-c-format
 msgid ""
 "If you set <literal>embed-xml=\"true\"</literal> on the <literal>&lt;one-to-"
 "many&gt;</literal> mapping, the data might look more like this:"
@@ -379,7 +437,9 @@
 "Si estableces <literal>embed-xml=\"true\"</literal> en el mapeo <literal>&lt;"
 "one-to-many&gt;</literal>, los datos podrían verse así:"
 
-#: index.docbook:135
+#. Tag: programlisting
+#: xml.xml:159
+#, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
 "    <account id=\"987632567\" short-desc=\"Savings\">\n"
@@ -415,19 +475,25 @@
 "    ...\n"
 "</customer>]]>"
 
-#: index.docbook:141
+#. Tag: title
+#: xml.xml:165
+#, no-c-format
 msgid "Manipulating XML data"
 msgstr "Manipulando datos XML"
 
-#: index.docbook:143
+#. Tag: para
+#: xml.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "Vamos a releer y actualizar documentos XML en la aplicación. Hacemos esto "
 "obteniendo una sesión dom4j:"
 
-#: index.docbook:148
+#. Tag: programlisting
+#: xml.xml:172
+#, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
 "       \n"
@@ -467,7 +533,9 @@
 "tx.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:150
+#. Tag: programlisting
+#: xml.xml:174
+#, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
 "Session dom4jSession = session.getSession(EntityMode.DOM4J);\n"
@@ -503,18 +571,19 @@
 "tx.commit();\n"
 "session.close();]]>"
 
-#: index.docbook:152
+#. Tag: para
+#: xml.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "Es extremadamente útil combinar esta funcionalidad con la operación "
 "<literal>replicate()</literal> de Hibernate para implementar la importación/"
 "exportación de datos basada en XML."
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - Persistance relationnelle en Java standard"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "Documentation de référence d'Hibernate"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,30 +24,45 @@
 
 #. Tag: para
 #: architecture.xml:35
-#, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Voici une vue (très) haut niveau de l'architecture d'Hibernate :"
 
 #. Tag: para
 #: architecture.xml:48
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"Nous aimerions décrire une vue plus détaillée de l'architecture. "
+"Malheureusement, Hibernate est flexible et supporte différentes approches. "
+"Nous allons en montrer les deux extrêmes. L'architecture légère laisse "
+"l'application fournir ses propres connexions JDBC et gérer ses propres "
+"transactions. Cette approche utilise le minimum des APIs Hibernate :"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "Ce diagramme montre Hibernate utilisant une base de données et des données "
 "de configuration pour fournir un service de persistance (et des objets "
 "persistants) à l'application."
 
 #. Tag: para
-#: architecture.xml:53
-#, no-c-format
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "Nous aimerions décrire une vue plus détaillée de l'architecture. "
 "Malheureusement, Hibernate est flexible et supporte différentes approches. "
@@ -56,37 +71,37 @@
 "transactions. Cette approche utilise le minimum des APIs Hibernate :"
 
 #. Tag: para
-#: architecture.xml:70
-#, no-c-format
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "L'architecture la plus complète abstrait l'application des APIs JDBC/JTA "
 "sous-jacentes et laisse Hibernate s'occuper des détails."
 
 #. Tag: para
-#: architecture.xml:84
+#: architecture.xml:88
 #, fuzzy, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr ""
 "Voici quelques définitions des objets des diagrammes : <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:89
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:91
-#, no-c-format
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "Un cache threadsafe (immuable) des mappings vers une (et une seule) base de "
 "données. Une factory (fabrique) de <literal>Session</literal> et un client "
@@ -96,20 +111,20 @@
 "nœuds d'un cluster."
 
 #. Tag: term
-#: architecture.xml:101
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:103
-#, no-c-format
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "Un objet mono-threadé, à durée de vie courte, qui représente une "
 "conversation entre l'application et l'entrepôt de persistance. Encapsule une "
@@ -119,21 +134,21 @@
 "d'objets ou lors de la récupération d'objets par leur identifiant."
 
 #. Tag: term
-#: architecture.xml:113
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objets et Collections persistants"
 
 #. Tag: para
-#: architecture.xml:115
-#, no-c-format
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "Objets mono-threadés à vie courte contenant l'état de persistance et la "
 "fonction métier. Ceux-ci sont en général les objets de type JavaBean (ou "
@@ -144,18 +159,18 @@
 "Data Transfer Objects - DTO : objet de transfert de données)."
 
 #. Tag: term
-#: architecture.xml:126
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objets et collections transients"
 
 #. Tag: para
-#: architecture.xml:128
-#, no-c-format
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "Instances de classes persistantes qui ne sont actuellement pas associées à "
@@ -164,21 +179,21 @@
 "instanciées par une <literal>Session</literal> fermée."
 
 #. Tag: term
-#: architecture.xml:137
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:139
-#, no-c-format
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(Optionnel) Un objet mono-threadé à vie courte utilisé par l'application "
 "pour définir une unité de travail atomique. Abstrait l'application des "
@@ -189,7 +204,7 @@
 "n'est jamais optionnelle!"
 
 #. Tag: term
-#: architecture.xml:150
+#: architecture.xml:153
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -199,13 +214,13 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:152
-#, no-c-format
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(Optionnel) Une fabrique de (pool de) connexions JDBC. Abstrait "
 "l'application de la <literal>Datasource</literal> ou du "
@@ -213,7 +228,7 @@
 "mais peut être étendu/implémenté par le développeur."
 
 #. Tag: term
-#: architecture.xml:160
+#: architecture.xml:163
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -221,28 +236,29 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:162
-#, no-c-format
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(Optionnel) Une fabrique d'instances de <literal>Transaction</literal>. Non "
 "exposé à l'application, mais peut être étendu/implémenté par le développeur."
 
 #. Tag: emphasis
-#: architecture.xml:169
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "Interfaces d'extension"
 
 #. Tag: para
-#: architecture.xml:171
-#, no-c-format
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "Hibernate fournit de nombreuses interfaces d'extensions optionnelles que "
 "vous pouvez implémenter pour personnaliser le comportement de votre couche "
@@ -250,12 +266,13 @@
 "détails."
 
 #. Tag: para
-#: architecture.xml:180
-#, no-c-format
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "Dans une architecture légère, l'application n'aura pas à utiliser les APIs "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> et/ou "
@@ -263,19 +280,19 @@
 "JTA ou JDBC."
 
 #. Tag: title
-#: architecture.xml:188
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr "Etats des instances"
 
 #. Tag: para
-#: architecture.xml:189
-#, no-c-format
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "Une instance d'une classe persistante peut être dans l'un des trois états "
 "suivants, définis par rapport à un <emphasis>contexte de persistance</"
@@ -283,37 +300,37 @@
 "concept de contexte de persistance :"
 
 #. Tag: term
-#: architecture.xml:197
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr "passager (transient)"
 
 #. Tag: para
-#: architecture.xml:199
-#, no-c-format
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr ""
 "L'instance n'est pas et n'a jamais été associée à un contexte de "
 "persistance. Elle ne possède pas d'identité persistante (valeur de clé "
 "primaire)"
 
 #. Tag: term
-#: architecture.xml:207
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr "persistant"
 
 #. Tag: para
-#: architecture.xml:209
-#, no-c-format
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "L'instance est associée au contexte de persistance. Elle possède une "
 "identité persistante (valeur de clé primaire) et, peut-être, un "
@@ -323,19 +340,19 @@
 "l'objet)"
 
 #. Tag: term
-#: architecture.xml:221
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr "détaché"
 
 #. Tag: para
-#: architecture.xml:223
+#: architecture.xml:226
 #, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corresponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "L'instance a été associée au contexte de persistance mais ce contexte a été "
@@ -345,18 +362,19 @@
 "sur la relation entre l'identité persistante et l'identité Java."
 
 #. Tag: title
-#: architecture.xml:238
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr "Intégration JMX"
 
 #. Tag: para
-#: architecture.xml:240
-#, no-c-format
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMX est le standard J2EE de gestion des composants Java. Hibernate peut être "
 "géré via un service JMX standard. Nous fournissons une implémentation d'un "
@@ -364,12 +382,12 @@
 "literal>."
 
 #. Tag: para
-#: architecture.xml:246
-#, no-c-format
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "Pour avoir un exemple sur la manière de déployer Hibernate en tant que "
 "service JMX dans le serveur d'application JBoss Application Server, référez "
@@ -377,17 +395,17 @@
 "Hibernate via JMX sur JBoss AS, vous aurez également les bénéfices suivants :"
 
 #. Tag: para
-#: architecture.xml:254
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>Gestion de la session :</emphasis> Le cycle de vie de la "
@@ -402,16 +420,16 @@
 "accéder à la <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:266
-#, no-c-format
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>Déploiement HAR :</emphasis> Habituellement vous déployez le "
 "service JMX Hibernate en utilisant le descripteur de déploiement de JBoss "
@@ -423,7 +441,7 @@
 "fichiers de mapping dans votre fichier HAR."
 
 #. Tag: para
-#: architecture.xml:277
+#: architecture.xml:280
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
@@ -432,52 +450,53 @@
 "ces options."
 
 #. Tag: para
-#: architecture.xml:281
-#, no-c-format
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "Les statistiques pendant l'exécution d'Hibernate (au runtime) sont une autre "
 "fonctionnalité disponible en tant que service JMX. Voyez pour cela <xref "
 "linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:288
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr "Support JCA"
 
 #. Tag: para
-#: architecture.xml:289
-#, no-c-format
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hibernate peut aussi être configuré en tant que connecteur JCA. Référez-vous "
 "au site web pour de plus amples détails. Il est important de noter que le "
 "support JCA d'Hibernate est encore considéré comme expérimental."
 
 #. Tag: title
-#: architecture.xml:296
-#, no-c-format
-msgid "Contextual Sessions"
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "Sessions Contextuelles"
 
 #. Tag: para
-#: architecture.xml:297
-#, no-c-format
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "Certaines applications utilisant Hibernate ont besoin d'une sorte de session "
@@ -493,19 +512,18 @@
 "l'utilisation de proxy/interception."
 
 #. Tag: para
-#: architecture.xml:306
-#, no-c-format
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "A partir de la version 3.0.1, Hibernate a ajouté la méthode "
 "<literal>SessionFactory.getCurrentSession()</literal>. Initialement, cela "
@@ -520,14 +538,14 @@
 "basée sur JTA."
 
 #. Tag: para
-#: architecture.xml:316
-#, no-c-format
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "Cependant, depuis la version 3.1, la logique derrière "
@@ -539,15 +557,15 @@
 "définir la portée et le contexte des sessions courantes."
 
 #. Tag: para
-#: architecture.xml:323
-#, no-c-format
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "Allez voir les Javadocs de l'interface <literal>org.hibernate.context."
 "CurrentSessionContext</literal> pour une description détaillée de son "
@@ -557,11 +575,11 @@
 "interface."
 
 #. Tag: para
-#: architecture.xml:333
-#, no-c-format
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -571,25 +589,24 @@
 "pour les détails."
 
 #. Tag: para
-#: architecture.xml:341
-#, no-c-format
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - les "
 "sessions courantes sont associées au thread d'exécution. Voir les javadocs "
 "pour les détails."
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
 "sessions are tracked by thread of execution. However, you are responsible to "
@@ -597,20 +614,21 @@
 "this class, it does never open, flush, or close a <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:356
+#: architecture.xml:359
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programmatic "
-"transaction demarcation in plain JSE without JTA, you are advised to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "Les deux implémentations fournissent un modèle de programmation de type "
 "\"une session - une transaction à la base de données\", aussi connu sous le "
@@ -626,18 +644,18 @@
 "d'informations et des exemples de code."
 
 #. Tag: para
-#: architecture.xml:368
-#, no-c-format
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "Le paramètre de configuration <literal>hibernate."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,11 +24,11 @@
 
 #. Tag: para
 #: association_mapping.xml:35
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -41,10 +41,10 @@
 
 #. Tag: para
 #: association_mapping.xml:43
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr ""
 "Nous utiliserons deux critères pour classer les associations : le premier "
 "sera de savoir si l'association est bâti sur une table supplémentaire "
@@ -53,11 +53,11 @@
 
 #. Tag: para
 #: association_mapping.xml:48
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "Autoriser une clé étrangère nulle est considéré comme un mauvais choix dans "
@@ -76,8 +76,8 @@
 
 #. Tag: title
 #: association_mapping.xml:61 association_mapping.xml:132
-#, no-c-format
-msgid "many to one"
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "plusieurs à un"
 
 #. Tag: para
@@ -124,9 +124,9 @@
 
 #. Tag: title
 #: association_mapping.xml:74 association_mapping.xml:145
-#: association_mapping.xml:209 association_mapping.xml:249
+#: association_mapping.xml:210
 #, fuzzy, no-c-format
-msgid "one to one"
+msgid "One-to-one"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "un à un\n"
@@ -171,7 +171,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:82 association_mapping.xml:217
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -183,11 +183,11 @@
 
 #. Tag: para
 #: association_mapping.xml:84
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"emphasis> usually uses a special id generator In this example, however, we "
+"have reversed the direction of the association:"
 msgstr ""
 "Une <emphasis>association un-à-un (one-to-one) unidirectionnelle sur une clé "
 "primaire</emphasis> utilise un générateur d'identifiant particulier. "
@@ -215,7 +215,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:91 association_mapping.xml:225
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -226,16 +226,16 @@
 
 #. Tag: title
 #: association_mapping.xml:96 association_mapping.xml:118
-#, no-c-format
-msgid "one to many"
+#, fuzzy, no-c-format
+msgid "One-to-many"
 msgstr "un à plusieurs"
 
 #. Tag: para
 #: association_mapping.xml:98
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "Une <emphasis>association un-à-plusieurs (one-to-many) unidirectionnelle sur "
 "une clé étrangère</emphasis> est vraiment inhabituelle, et n'est pas "
@@ -276,8 +276,8 @@
 
 #. Tag: para
 #: association_mapping.xml:106
-#, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr ""
 "Nous pensons qu'il est préférable d'utiliser une table de jointure pour ce "
 "type d'association."
@@ -290,12 +290,11 @@
 
 #. Tag: para
 #: association_mapping.xml:120
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"emphasis> is the preferred option. Specifying <literal>unique=\"true\"</"
+"literal>, changes the multiplicity from many-to-many to one-to-many."
 msgstr ""
 "Une <emphasis>association unidirectionnelle un-à-plusieurs (one-to-many) "
 "avec une table de jointure</emphasis> est un bien meilleur choix. Remarquez "
@@ -340,10 +339,10 @@
 
 #. Tag: para
 #: association_mapping.xml:134
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "Une <emphasis>assiociation plusieurs-à-un (many-to-one) unidirectionnelle "
 "sur une table de jointure</emphasis> est très fréquente quand l'association "
@@ -387,10 +386,10 @@
 
 #. Tag: para
 #: association_mapping.xml:147
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Une <emphasis>association unidirectionnelle un-à-un (one-to-one) sur une "
 "table de jointure</emphasis> est extrèmement rare mais envisageable."
@@ -422,7 +421,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:153 association_mapping.xml:257
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -434,17 +433,17 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:158 association_mapping.xml:262
-#, no-c-format
-msgid "many to many"
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "plusieurs à plusieurs"
 
 #. Tag: para
 #: association_mapping.xml:160
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr ""
 "Finallement, nous avons <emphasis>l'association unidirectionnelle plusieurs-"
 "à-plusieurs (many-to-many)</emphasis>."
@@ -472,7 +471,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:165 association_mapping.xml:270
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -490,17 +489,18 @@
 msgstr "Associations bidirectionnelles"
 
 #. Tag: title
-#: association_mapping.xml:175 association_mapping.xml:235
-#, no-c-format
-msgid "one to many / many to one"
+#: association_mapping.xml:175 association_mapping.xml:236
+#, fuzzy, no-c-format
+msgid "one-to-many / many-to-one"
 msgstr "un à plusieurs / plusieurs à un"
 
 #. Tag: para
 #: association_mapping.xml:177
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "Une <emphasis>association bidirectionnelle plusieurs à un (many-to-one)</"
 "emphasis> est le type d'association que l'on rencontre le plus souvent. "
@@ -532,14 +532,14 @@
 
 #. Tag: para
 #: association_mapping.xml:187
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "Si vous utilisez une <literal>List</literal> (ou toute autre collection "
 "indexée) vous devez paramétrer la colonne <literal>key</literal> de la clé "
@@ -575,12 +575,12 @@
 
 #. Tag: para
 #: association_mapping.xml:197
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -592,17 +592,17 @@
 "literal> element."
 
 #. Tag: para
-#: association_mapping.xml:211
-#, no-c-format
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr ""
 "Une <emphasis>association bidirectionnelle un à un (one-to-one) sur une clé "
 "étrangère</emphasis> est aussi très fréquente."
 
 #. Tag: programlisting
-#: association_mapping.xml:216
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -625,17 +625,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:219
-#, no-c-format
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr ""
 "Une <emphasis>association bidirectionnelle un-à-un (one-to-one) sur une clé "
 "primaire</emphasis> utilise un générateur particulier d'id."
 
 #. Tag: programlisting
-#: association_mapping.xml:224
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -657,18 +657,19 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:232
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "Associations bidirectionnelles avec table de jointure"
 
 #. Tag: para
-#: association_mapping.xml:237
-#, no-c-format
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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 ""
 "Une <emphasis>association bidirectionnelle un-à-plusieurs (one-to-many) sur "
 "une table de jointure </emphasis>. Remarquez que <literal>inverse=\"true\"</"
@@ -676,7 +677,7 @@
 "collection, ou sur la jointure."
 
 #. Tag: programlisting
-#: association_mapping.xml:243
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -708,7 +709,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -719,18 +720,32 @@
 "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, fuzzy, no-c-format
+msgid "one to one"
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"un à un\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"un à un\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"Un à un\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"Un à un"
+
 #. Tag: para
-#: association_mapping.xml:251
-#, no-c-format
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Une <emphasis>association bidirectionnelle un-à-un (one-to-one) sur une "
 "table de jointure</emphasis> est extrèmement rare mais envisageable."
 
 #. Tag: programlisting
-#: association_mapping.xml:256
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -766,17 +781,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:264
-#, no-c-format
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr ""
 "Finallement nous avons <emphasis>l'association bidirectionnelle plusieurs à "
 "plusieurs</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:268
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -803,21 +818,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:277
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "Des mappings plus complexes"
 
 #. Tag: para
-#: association_mapping.xml:279
-#, no-c-format
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "Des associations encore plus complexes sont <emphasis>extrêmement</emphasis> "
 "rares. Hibernate permet de gérer des situations plus complexes en utilisant "
@@ -827,7 +842,7 @@
 "<literal>effectiveStartDate</literal>, mappées de telle sorte:"
 
 #. Tag: programlisting
-#: association_mapping.xml:288
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -842,18 +857,18 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:290
-#, no-c-format
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"You can then map an association to the <emphasis>current</emphasis> "
+"instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "alors nous pouvons mapper une association à l'instance <emphasis>courante</"
 "emphasis> (celle avec une <literal>effectiveEndDate</literal>) nulle en "
 "utilisant:"
 
 #. Tag: programlisting
-#: association_mapping.xml:295
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -865,15 +880,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:297
-#, no-c-format
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"emphasis> employer, the one with the most recent <literal>startDate</"
+"literal>, could be mapped in the following way:"
 msgstr ""
 "Dans un exemple plus complexe, imaginez qu'une association entre "
 "<literal>Employee</literal> et <literal>Organization</literal> est gérée "
@@ -883,7 +898,7 @@
 "pourrait être mappée comme cela:"
 
 #. Tag: programlisting
-#: association_mapping.xml:305
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -901,11 +916,11 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:307
-#, no-c-format
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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 ""
 "Vous pouvez être créatif grace à ces possibilités, mais il est généralement "
 "plus pratique d'utiliser des requêtes HQL ou criteria dans ce genre de "

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,12 +24,12 @@
 
 #. Tag: para
 #: basic_mapping.xml:34
-#, no-c-format
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "Les mappings Objet/relationnel sont généralement définis dans un document "
 "XML. Le document de mapping est conçu pour être lisible et éditable à la "
@@ -39,11 +39,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:41
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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 ""
 "Remarquez que même si beaucoup d'utilisateurs de Hibernate préfèrent écrire "
 "les fichiers de mappings à la main, plusieurs outils existent pour générer "
@@ -51,8 +51,8 @@
 
 #. Tag: para
 #: basic_mapping.xml:47
-#, no-c-format
-msgid "Lets kick off with an example mapping:"
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "Démarrons avec un exemple de mapping :"
 
 #. Tag: programlisting
@@ -127,13 +127,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "Etudions le contenu du document de mapping. Nous décrirons uniquement les "
 "éléments et attributs du document utilisés par Hibernate à l'exécution. Le "
@@ -149,14 +149,14 @@
 
 #. Tag: para
 #: basic_mapping.xml:66
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "Tous les mappings XML devraient utiliser le doctype indiqué. Ce fichier est "
 "présent à l'URL ci-dessus, dans le répertoire <literal>hibernate-x.x.x/src/"
@@ -173,14 +173,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:77
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
 "classpath. The manner in which it does this is by registering a custom "
@@ -191,12 +190,12 @@
 
 #. Tag: para
 #: basic_mapping.xml:85
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
 "encounteres a systemId starting with <literal>http://hibernate.sourceforge."
@@ -205,11 +204,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:94
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -221,8 +220,8 @@
 
 #. Tag: para
 #: basic_mapping.xml:103
-#, no-c-format
-msgid "An example of utilizing user namespacing:"
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "An example of utilizing user namespacing:"
 
 #. Tag: programlisting
@@ -260,23 +259,24 @@
 
 #. Tag: title
 #: basic_mapping.xml:115
-#, no-c-format
-msgid "hibernate-mapping"
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
 #: basic_mapping.xml:117
-#, no-c-format
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "Cet élément a plusieurs attributs optionnels. Les attributs <literal>schema</"
 "literal> et <literal>catalog</literal> indiquent que les tables référencées "
@@ -305,37 +305,37 @@
 
 #. Tag: para
 #: basic_mapping.xml:141
-#, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr ""
 "<literal>schema</literal> (optionnel) : Le nom d'un schéma de base de "
 "données."
 
 #. Tag: para
 #: basic_mapping.xml:146
-#, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr ""
 "<literal>catalog</literal> (optionnel) : Le nom d'un catalogue de base de "
 "données."
 
 #. Tag: para
 #: basic_mapping.xml:151
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (optionnel - par défaut vaut : "
 "<literal>none</literal>) : Un type de cascade par défaut."
 
 #. Tag: para
 #: basic_mapping.xml:157
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (optionnel - par défaut vaut : "
 "<literal>property</literal>) : Comment hibernate accèdera aux propriétés. On "
@@ -344,10 +344,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:164
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (optionnel - par défaut vaut : "
@@ -356,11 +356,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:171
-#, no-c-format
+#, fuzzy, 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."
+"literal>): specifies whether we can use unqualified class names of classes "
+"in this mapping in the query language."
 msgstr ""
 "<literal>auto-import</literal> (optionnel - par défaut vaut : <literal>true</"
 "literal>) : Spécifie si l'on peut utiliser des noms de classes non qualifiés "
@@ -368,21 +368,21 @@
 
 #. Tag: para
 #: basic_mapping.xml:178
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<literal>package</literal> (optional): specifies a package prefix to use for "
+"unqualified class names in the mapping document."
 msgstr ""
 "<literal>package</literal> (optionnel) : Préfixe de package par défaut pour "
 "les noms de classe non qualifiés du document de mapping."
 
 #. Tag: para
 #: basic_mapping.xml:186
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "Si deux classes possèdent le même nom de classe (non qualifié), vous devez "
 "indiquer <literal>auto-import=\"false\"</literal>. Hibernate lancera une "
@@ -390,13 +390,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:192
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -411,16 +411,16 @@
 
 #. Tag: title
 #: basic_mapping.xml:205
-#, no-c-format
-msgid "<title>class</title>"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "class"
 
 #. Tag: para
 #: basic_mapping.xml:207
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr ""
 "Déclarez une classe persistante avec l'élément <literal>class</literal> :"
 
@@ -456,10 +456,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:238
-#, no-c-format
+#, fuzzy, 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 "
+"<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> (optionnel) : Le nom Java complet de la classe (ou "
@@ -468,21 +468,21 @@
 
 #. Tag: para
 #: basic_mapping.xml:245
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (optionnel - par défaut le nom (non-qualifié) de la "
 "classe) : Le nom de sa table en base de données."
 
 #. Tag: para
 #: basic_mapping.xml:251
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (optionnel - par défaut le nom de la "
@@ -492,19 +492,19 @@
 
 #. Tag: para
 #: basic_mapping.xml:258
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
+"specifies that instances of the class are (not) mutable."
 msgstr ""
 "<literal>mutable</literal> (optionnel, vaut <literal>true</literal> par "
 "défaut) : Spécifie que des instances de la classe sont (ou non) immuables."
 
 #. Tag: para
-#: basic_mapping.xml:264 basic_mapping.xml:2228
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -515,10 +515,10 @@
 "spécifié par l'élément de base <literal>&lt;hibernate-mapping&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:270 basic_mapping.xml:2234
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -530,10 +530,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:276
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (optionnel) : Spécifie une interface à utiliser "
 "pour l'initialisation différée (lazy loading) des proxies. Vous pouvez "
@@ -541,11 +541,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:282
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (optionnel, par défaut à <literal>false</"
 "literal>) : Spécifie que les <literal>UPDATE</literal> SQL doivent être "
@@ -554,10 +554,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:289
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (optionnel, par défaut à <literal>false</"
@@ -567,16 +567,15 @@
 
 #. Tag: para
 #: basic_mapping.xml:296
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (optionnel, par défaut à "
 "<literal>false</literal>): Spécifie que Hibernate ne doit <emphasis>jamais</"
@@ -589,10 +588,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:306
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "<literal>polymorphism</literal> (optionnel, vaut <literal>implicit</literal> "
@@ -601,19 +600,20 @@
 
 #. Tag: para
 #: basic_mapping.xml:312
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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> (optionnel) spécifie une clause SQL <literal>WHERE</"
 "literal> à utiliser lorsque l'on récupère des objets de cette classe."
 
 #. Tag: para
 #: basic_mapping.xml:318
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (optionnel) : Spécifie un "
@@ -621,10 +621,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:323
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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> (optionnel, par défaut = <literal>1</"
 "literal>) : spécifie une taille de batch pour remplir les instances de cette "
@@ -632,20 +633,20 @@
 
 #. Tag: para
 #: basic_mapping.xml:329
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock</literal> (optionnel, par défaut = "
 "<literal>version</literal>) : Détermine la stratégie de verrou optimiste."
 
 #. Tag: para
 #: basic_mapping.xml:335
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<literal>lazy</literal> (optional): lazy fetching can be disabled by setting "
+"<literal>lazy=\"false\"</literal>."
 msgstr ""
 "<literal>lazy</literal> (optionnel) : Déclarer <literal>lazy=\"true\"</"
 "literal> est un raccourci pour spécifier le nom de la classe comme étant "
@@ -653,14 +654,14 @@
 
 #. Tag: para
 #: basic_mapping.xml:341
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal> (optionnel) : Hibernate3 permet à une classe "
 "d'être mappée plusieurs fois (potentiellement à plusieurs tables), et permet "
@@ -671,9 +672,9 @@
 
 #. Tag: para
 #: basic_mapping.xml:351
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -683,13 +684,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:357
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (optionnel) : Hibernate peut utiliser des ROWID sur "
 "les bases de données qui utilisent ce mécanisme. Par exemple avec Oracle, "
@@ -698,12 +699,12 @@
 "Un ROWID représente la localisation physique d'un tuple enregistré."
 
 #. Tag: para
-#: basic_mapping.xml:365
-#, no-c-format
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (optionnel) : Permet de mapper une entité "
 "immuable en lecture-seule sur un sous-select de base de données. Utile pour "
@@ -711,25 +712,25 @@
 "plus d'information."
 
 #. Tag: para
-#: basic_mapping.xml:372
-#, no-c-format
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (optionnel) : Utilisé pour marquer des "
 "superclasses abstraites dans des hiérarchies de <literal>&lt;union-"
 "subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:380
-#, no-c-format
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "Il est tout à fait possible d'utiliser une interface comme nom de classe "
 "persistante. Vous devez alors déclarer les classes implémentant cette "
@@ -739,10 +740,10 @@
 "des classes internes c'est à dire <literal>eg.Foo$Bar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:387
-#, no-c-format
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -751,14 +752,14 @@
 "faire quelques optimisations mineures sur les performances."
 
 #. Tag: para
-#: basic_mapping.xml:392
-#, no-c-format
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "L'attribut optionnnel <literal>proxy</literal> permet les intialisations "
 "différées des instances persistantes de la classe. Hibernate retournera "
@@ -768,22 +769,22 @@
 "chargement différé (lazy initialization)."
 
 #. Tag: para
-#: basic_mapping.xml:399
-#, no-c-format
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "Le polymorphisme <emphasis>implicite</emphasis> signifie que les instances "
 "de la classe seront retournées par une requête qui utilise les noms de la "
@@ -802,17 +803,17 @@
 "voir la partie design pattern du site communautaire)."
 
 #. Tag: para
-#: basic_mapping.xml:411
-#, no-c-format
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "L'attribut <literal>persister</literal> vous permet de customiser la "
 "stratégie utilisée pour la classe. Vous pouvez, par exemple, spécifier votre "
@@ -825,15 +826,14 @@
 "simple (d'une \"persistance\" vers une <literal>Hashtable</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:422
-#, no-c-format
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "Notez que les paramètres <literal>dynamic-update</literal> et "
 "<literal>dynamic-insert</literal> ne sont pas hérités par les sous-classes "
@@ -843,12 +843,12 @@
 "amoindrir. A utiliser en connaissance de causes."
 
 #. Tag: para
-#: basic_mapping.xml:430
-#, no-c-format
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "L'utilisation de <literal>select-before-update</literal> va généralement "
@@ -857,7 +857,7 @@
 "d'instances à une <literal>Session</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:436
+#: basic_mapping.xml:435
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -867,42 +867,41 @@
 "stratégies de verrouillage optimiste (optimistic locking) sont les suivantes:"
 
 #. Tag: para
-#: basic_mapping.xml:442
-#, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr "<literal>version</literal> vérifie les colonnes version/timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:447
-#, no-c-format
-msgid "<literal>all</literal> check all columns"
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all</literal> vérifie toutes les colonnes"
 
 #. Tag: para
-#: basic_mapping.xml:452
-#, no-c-format
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr ""
 "<literal>dirty</literal> vérifie les colonnes modifiées, permettant des "
 "updates concurrents"
 
 #. Tag: para
-#: basic_mapping.xml:457
-#, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none</literal> pas de verrouillage optimiste"
 
 #. Tag: para
-#: basic_mapping.xml:462
-#, no-c-format
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "Nous encourageons <emphasis>très</emphasis> fortement l'utilisation de "
 "colonnes de version/timestamp pour le verrouillage optimiste avec Hibernate. "
@@ -911,15 +910,15 @@
 "lorsqu'on utilise <literal>Session.merge()</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:469
-#, no-c-format
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "Il n'y a pas de différence entre table et vue pour le mapping Hibernate, "
 "tant que c'est transparent au niveau base de données (remarquez que "
@@ -930,7 +929,7 @@
 "immuable en lecture seule sur un sous-select SQL donné:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:477
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -948,13 +947,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:479
-#, no-c-format
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "Déclarez les tables à synchroniser avec cette entité pour assurer que le "
 "flush automatique se produise correctement, et pour que les requêtes sur "
@@ -963,13 +962,13 @@
 "élément de mapping."
 
 #. Tag: title
-#: basic_mapping.xml:489
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:491
+#: basic_mapping.xml:490
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -985,7 +984,7 @@
 "cette propriété et la clef primaire en base."
 
 #. Tag: programlisting
-#: basic_mapping.xml:506
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -1001,39 +1000,39 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:509
-#, no-c-format
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr ""
 "<literal>name</literal> (optionnel) : Nom de la propriété qui sert "
 "d'identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:514
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
-msgstr "<literal>type</literal> (optionnel) : Nom indiquant le type Hibernate."
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
+msgstr "<literal>type</literal> (optionnel) : nom indiquant le type Hibernate."
 
 #. Tag: para
-#: basic_mapping.xml:519
-#, no-c-format
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr ""
 "<literal>column</literal> (optionnel - le nom de la propriété est pris par "
 "défaut) : Nom de la clef primaire."
 
 #. Tag: para
-#: basic_mapping.xml:525
-#, no-c-format
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal> (optionnel - par défaut une valeur \"bien "
 "choisie\") : Une valeur de la propriété d'identifiant qui indique que "
@@ -1042,13 +1041,11 @@
 "sauvegardées ou chargées dans une session précédente."
 
 #. Tag: para
-#: basic_mapping.xml:533 basic_mapping.xml:1041 basic_mapping.xml:1180
-#: basic_mapping.xml:1262 basic_mapping.xml:1369 basic_mapping.xml:1558
-#: basic_mapping.xml:1732 basic_mapping.xml:1902 basic_mapping.xml:2481
+#: basic_mapping.xml:532
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1092,7 +1089,7 @@
 "propriété."
 
 #. Tag: para
-#: basic_mapping.xml:541
+#: basic_mapping.xml:540
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1102,7 +1099,7 @@
 "classe ne possède pas de propriété identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:546
+#: basic_mapping.xml:545
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1114,25 +1111,25 @@
 "valeur par défaut."
 
 #. Tag: para
-#: basic_mapping.xml:550
-#, no-c-format
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "La déclaration alternative <literal>&lt;composite-id&gt;</literal> permet "
 "l'acccès aux données d'anciens systèmes qui utilisent des clefs composées. "
 "Son utilisation est fortement déconseillée pour d'autres cas."
 
 #. Tag: title
-#: basic_mapping.xml:556
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:558
+#: basic_mapping.xml:557
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1148,7 +1145,7 @@
 "<literal>&lt;param&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:565
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1160,14 +1157,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:567
+#: basic_mapping.xml:566
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "Tous les générateurs doivent implémenter l'interface <literal>org.hibernate."
 "id.IdentifierGenerator</literal>. C'est une interface très simple ; "
@@ -1177,13 +1174,13 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:575
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:577
+#: basic_mapping.xml:576
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1197,13 +1194,13 @@
 "en environnement clusterisé.</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:586
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:588
+#: basic_mapping.xml:587
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1215,13 +1212,13 @@
 "<literal>short</literal> ou <literal>int</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:596
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:598
+#: basic_mapping.xml:597
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1233,13 +1230,13 @@
 "<literal>long</literal>, <literal>short</literal> ou <literal>int</literal>"
 
 #. Tag: literal
-#: basic_mapping.xml:606
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:608
+#: basic_mapping.xml:607
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1257,13 +1254,13 @@
 "pour une base de données particulière seulement."
 
 #. Tag: literal
-#: basic_mapping.xml:618
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:620
+#: basic_mapping.xml:619
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1275,47 +1272,47 @@
 "literal>, étant donné un nom de séquence en base."
 
 #. Tag: literal
-#: basic_mapping.xml:628
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:630
-#, no-c-format
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "Utilise un algorithme de type UUID 128 bits pour générer des identifiants de "
 "type string, unique au sein d'un réseau (l'adresse IP est utilisée). Le UUID "
 "en codé en une chaîne de nombre héxadécimaux de longueur 32."
 
 #. Tag: literal
-#: basic_mapping.xml:638
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:640
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr ""
 "Utilise une chaîne GUID générée par la base pour MS SQL Server et MySQL."
 
 #. Tag: literal
-#: basic_mapping.xml:646
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:648
-#, no-c-format
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1324,50 +1321,50 @@
 "données sous-jacente."
 
 #. Tag: literal
-#: basic_mapping.xml:656
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:658
-#, no-c-format
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "Laisse l'application affecter un identifiant à l'objet avant que la métode "
 "<literal>save()</literal> soit appelée. Il s'agit de la stratégie par défaut "
 "si aucun <literal>&lt;generator&gt;</literal> n'est spécifié."
 
 #. Tag: literal
-#: basic_mapping.xml:666
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:668
-#, no-c-format
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr ""
 "Récupère une clef primaire assignée par un trigger en sélectionnant la ligne "
 "par une clef unique quelconque."
 
 #. Tag: literal
-#: basic_mapping.xml:675
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:677
-#, no-c-format
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1376,21 +1373,21 @@
 "la clef primaire."
 
 #. Tag: literal
-#: basic_mapping.xml:684
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:686
-#, no-c-format
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "a specialized sequence generation strategy which utilizes a database "
 "sequence for the actual value generation, but combines this with JDBC3 "
@@ -1400,20 +1397,20 @@
 "these insert statements are disabled due to a bug in the Oracle drivers."
 
 #. Tag: title
-#: basic_mapping.xml:703
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "algorithme Hi/lo"
 
 #. Tag: para
-#: basic_mapping.xml:704
-#, no-c-format
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "Les générateurs <literal>hilo</literal> et <literal>seqhilo</literal> "
 "proposent deux implémentations alternatives de l'algorithme hi/lo, une "
@@ -1423,7 +1420,7 @@
 "Oracle (quand la base sous-jacente le propose)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:711
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1436,7 +1433,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:713
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1448,14 +1445,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:715
-#, no-c-format
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "Malheureusement, vous ne pouvez pas utilisez <literal>hilo</literal> quand "
 "vous apportez votre propre <literal>Connection</literal> à Hibernate. Quand "
@@ -1464,19 +1461,19 @@
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:724
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID algorithm"
 
 #. Tag: para
-#: basic_mapping.xml:725
-#, no-c-format
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "Le contenu du UUID est : adresse IP, date de démarrage de la JVM (précis au "
 "quart de seconde), l'heure système et un compteur (unique au sein de la "
@@ -1484,20 +1481,20 @@
 "partir de Java, c'est donc le mieux que l'on puisse faire sans utiliser JNI."
 
 #. Tag: title
-#: basic_mapping.xml:734
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "Colonnes identifiantes et séquences"
 
 #. Tag: para
-#: basic_mapping.xml:735
-#, no-c-format
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "Pour les bases qui implémentent les colonnes \"identité\" (DB2, MySQL, "
 "Sybase, MS SQL), vous pouvez utiliser la génération de clef par "
@@ -1507,7 +1504,7 @@
 "nécessitent deux requêtes SQL pour insérer un objet."
 
 #. Tag: programlisting
-#: basic_mapping.xml:743
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1518,7 +1515,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:745
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1528,13 +1525,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:747
-#, no-c-format
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "Pour le développement multi-plateformes, la stratégie <literal>native</"
 "literal> choisira entre les méthodes <literal>identity</literal>, "
@@ -1542,21 +1539,21 @@
 "possibilités offertes par la base sous-jacente."
 
 #. Tag: title
-#: basic_mapping.xml:756
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "Identifiants assignés"
 
 #. Tag: para
-#: basic_mapping.xml:757
-#, no-c-format
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "Si vous souhaitez que l'application assigne des identifiants (par opposition "
@@ -1568,12 +1565,12 @@
 "pas d'élément <literal>&lt;generator&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:766
-#, no-c-format
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1584,22 +1581,22 @@
 "<literal>Interceptor.isUnsaved()</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:776
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "Clefs primaires assignées par trigger"
 
 #. Tag: para
-#: basic_mapping.xml:777
-#, no-c-format
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr ""
 "Pour les schémas de base hérités d'anciens systèmes uniquement (Hibernate ne "
 "génère pas de DDL avec des triggers)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:781
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1610,13 +1607,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:783
-#, no-c-format
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "Dans l'exemple ci-dessus, <literal>socialSecurityNumber</literal> a une "
 "valeur unique définie par la classe en tant que clef naturelle et "
@@ -1624,22 +1621,22 @@
 "générée par trigger."
 
 #. Tag: title
-#: basic_mapping.xml:795
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:797
-#, no-c-format
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1650,24 +1647,25 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:805
+#: basic_mapping.xml:803
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1687,24 +1685,24 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:819
-#, no-c-format
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:825
-#, no-c-format
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1713,13 +1711,13 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:832
-#, no-c-format
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
@@ -1727,11 +1725,11 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:839
-#, no-c-format
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1739,40 +1737,40 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:846
-#, no-c-format
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:853
+#: basic_mapping.xml:851
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>cascade</literal> (optionnel - par défaut à <literal>none</"
 "literal>) : le style de cascade."
 
 #. Tag: para
-#: basic_mapping.xml:860
+#: basic_mapping.xml:858
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1787,21 +1785,21 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:870
-#, no-c-format
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:876
-#, no-c-format
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1809,13 +1807,13 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:882
-#, no-c-format
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
@@ -1823,10 +1821,10 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:889
-#, no-c-format
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1835,63 +1833,64 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:896
-#, no-c-format
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:902
-#, no-c-format
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:908
-#, no-c-format
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:914
+#: basic_mapping.xml:912
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>cascade</literal> (optionnel - par défaut à <literal>none</"
 "literal>) : le style de cascade."
 
 #. Tag: title
-#: basic_mapping.xml:924
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:925
+#: basic_mapping.xml:923
 #, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1902,11 +1901,11 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:933
-#, no-c-format
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1914,13 +1913,13 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:939
-#, no-c-format
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1932,15 +1931,15 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:948
-#, no-c-format
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1950,13 +1949,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:961
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:963
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1975,10 +1974,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:965
-#, no-c-format
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1990,7 +1989,7 @@
 "literal> comme fils."
 
 #. Tag: programlisting
-#: basic_mapping.xml:972
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -2000,12 +1999,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:974
-#, no-c-format
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "Vos classes persistantes <emphasis>doivent</emphasis> surcharger les "
 "méthodes <literal>equals()</literal> et <literal>hashCode()</literal> pour "
@@ -2013,16 +2012,16 @@
 "l'interface <literal>Serializable</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:980
-#, no-c-format
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "Malheureusement cette approche sur les identifiants composés signifie qu'un "
 "objet persistant est son propre identifiant. Il n'y a pas d'autre moyen "
@@ -2034,7 +2033,7 @@
 "\" et ne la recommandons pas pour des applications complexes."
 
 #. Tag: para
-#: basic_mapping.xml:989
+#: basic_mapping.xml:987
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -2048,7 +2047,7 @@
 "particulière."
 
 #. Tag: programlisting
-#: basic_mapping.xml:995
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -2058,16 +2057,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:997
-#, no-c-format
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "Dans cet exemple, la classe d'identifiant composée,<literal>MedicareId</"
 "literal> et la classe mappée elle-même, possèdent les propriétés "
@@ -2077,7 +2075,7 @@
 "de cette approche est la duplication du code."
 
 #. Tag: para
-#: basic_mapping.xml:1006
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
@@ -2085,10 +2083,10 @@
 "Les attributs suivants servent à configurer un identifiant composé mappé :"
 
 #. Tag: para
-#: basic_mapping.xml:1012
-#, no-c-format
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -2099,20 +2097,20 @@
 "identifiante)."
 
 #. Tag: para
-#: basic_mapping.xml:1020
-#, no-c-format
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (optionnel, mais requis pour un identifiant composé "
 "mappé) : La classe composant utilisée comme identifiant composé."
 
 #. Tag: para
-#: basic_mapping.xml:1027
-#, no-c-format
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -2123,53 +2121,103 @@
 "s'appliquent que pour cette dernière approche :"
 
 #. Tag: para
-#: basic_mapping.xml:1035
-#, no-c-format
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (optionnel, requis pour cette approche) : une "
 "propriété de type composant qui contient l'identifiant composé (voir "
 "chapitre 9)."
 
 #. Tag: para
-#: basic_mapping.xml:1047
-#, no-c-format
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut <literal>property</"
+"literal>) : La stratégie que doit utiliser Hibernate pour accéder aux "
+"valeurs des propriétés.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - défaut à <literal>property</"
+"literal>) : La stratégie qu'Hibernate utilisera pour accéder à la valeur de "
+"la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>): Stratégie que Hibernate doit utiliser pour accéder à cette "
+"valeur.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de cette propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>formula</literal> (optionnel) : Presque toutes les associations one-"
+"to-one pointent sur la clef primaire de l'entité propriétaire. Dans les "
+"rares cas différents, vous devez donner une ou plusieurs autres colonnes ou "
+"expression à joindre par une formule SQL (voir <literal>org.hibernate.test."
+"onetooneformula</literal> pour un exemple).\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optionnel - par défaut à <literal>false</"
+"literal>) : Indique que ce composant doit être chargé au premier accès à la "
+"variable d'instance (nécessite une instrumentation du bytecode au moment du "
+"build).\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à cette "
+"propriété."
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (optionnel - défaut au type de la propriété "
 "déterminé par réflexion) : La classe composant utilisée comme identifiant "
 "(voir prochaine section)."
 
 #. Tag: para
-#: basic_mapping.xml:1054
-#, no-c-format
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "Cette dernière approche est celle que nous recommandons pour toutes vos "
 "applications."
 
 #. Tag: title
-#: basic_mapping.xml:1062
-#, no-c-format
-msgid "discriminator"
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "discriminator"
 
 #. Tag: para
-#: basic_mapping.xml:1064
-#, no-c-format
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2186,7 +2234,7 @@
 "<literal>yes_no</literal>, <literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1082
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2199,31 +2247,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1085
-#, no-c-format
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal> (optionnel - par défaut à <literal>class</"
 "literal>) le nom de la colonne discriminante."
 
 #. Tag: para
-#: basic_mapping.xml:1091
-#, no-c-format
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (optionnel - par défaut à <literal>string</literal>) "
 "un nom indiquant le type Hibernate."
 
 #. Tag: para
-#: basic_mapping.xml:1097
-#, no-c-format
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force</literal> (optionnel - par défaut à <literal>false</literal>) "
@@ -2231,13 +2279,13 @@
 "quand on récupère toutes les instances de la classe de base."
 
 #. Tag: para
-#: basic_mapping.xml:1104
-#, no-c-format
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (optionnel - par défaut à <literal>true</literal>) "
 "à passer à <literal>false</literal> si la colonne discriminante fait aussi "
@@ -2245,11 +2293,11 @@
 "la colonne dans les <literal>INSERT</literal> SQL)."
 
 #. Tag: para
-#: basic_mapping.xml:1112
-#, no-c-format
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (optionnel) une expression SQL arbitraire qui est "
@@ -2257,7 +2305,7 @@
 "le contenu."
 
 #. Tag: para
-#: basic_mapping.xml:1120
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2269,30 +2317,30 @@
 "class&gt;</literal> et <literal>&lt;subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1126
-#, no-c-format
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "L'attribut <literal>force</literal> n'est utile que si la table contient des "
 "lignes avec des valeurs \"extra\" discriminantes qui ne sont pas mappées à "
 "une classe persistante. Ce ne sera généralement pas le cas."
 
 #. Tag: para
-#: basic_mapping.xml:1132
-#, no-c-format
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "En utilisant l'attribut <literal>formula</literal> vous pouvez déclarer une "
 "expression SQL arbitraire qui sera utilisée pour évaluer le type d'une "
 "ligne :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1137
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2301,18 +2349,19 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1142
-#, no-c-format
-msgid "version (optional)"
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "version (optionnel)"
 
 #. Tag: para
-#: basic_mapping.xml:1144
-#, no-c-format
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "L'élément <literal>&lt;version&gt;</literal> est optionnel et indique que la "
 "table contient des données versionnées. C'est particulièrement utile si vous "
@@ -2320,7 +2369,7 @@
 "(voir plus-bas)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1160
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2336,42 +2385,89 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1163
-#, no-c-format
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal> (optionnel - par défaut égal au nom de la "
 "propriété) : Le nom de la colonne contenant le numéro de version."
 
 #. Tag: para
-#: basic_mapping.xml:1169
-#, no-c-format
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr ""
 "<literal>name</literal> : Le nom d'un attribut de la classe persistante."
 
 #. Tag: para
-#: basic_mapping.xml:1174
-#, no-c-format
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (optionnel - par défaut à <literal>integer</"
 "literal>) : Le type du numéro de version."
 
 #. Tag: para
-#: basic_mapping.xml:1186
-#, no-c-format
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut <literal>property</"
+"literal>) : La stratégie que doit utiliser Hibernate pour accéder aux "
+"valeurs des propriétés.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - défaut à <literal>property</"
+"literal>) : La stratégie qu'Hibernate utilisera pour accéder à la valeur de "
+"la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de la propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>): Stratégie que Hibernate doit utiliser pour accéder à cette "
+"valeur.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à la valeur "
+"de cette propriété.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>formula</literal> (optionnel) : Presque toutes les associations one-"
+"to-one pointent sur la clef primaire de l'entité propriétaire. Dans les "
+"rares cas différents, vous devez donner une ou plusieurs autres colonnes ou "
+"expression à joindre par une formule SQL (voir <literal>org.hibernate.test."
+"onetooneformula</literal> pour un exemple).\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optionnel - par défaut à <literal>false</"
+"literal>) : Indique que ce composant doit être chargé au premier accès à la "
+"variable d'instance (nécessite une instrumentation du bytecode au moment du "
+"build).\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (optionnel - par défaut à <literal>property</"
+"literal>) : La stratégie à utiliser par Hibernate pour accéder à cette "
+"propriété."
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (optionnel - par défaut à "
 "<literal>undefined</literal>) : Une valeur de la propriété d'identifiant qui "
@@ -2381,13 +2477,13 @@
 "valeur de l'atribut identifiant devrait être utilisé)."
 
 #. Tag: para
-#: basic_mapping.xml:1195
-#, no-c-format
+#: basic_mapping.xml:1193
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (optional - défaut à <literal>never</"
 "literal>) : Indique que la valeur de la propriété version est générée par la "
@@ -2395,13 +2491,13 @@
 "properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1202
-#, no-c-format
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "<literal>insert</literal> (optionnel - défaut à <literal>true</literal>) : "
 "Indique si la colonne de version doit être incluse dans les ordres insert. "
@@ -2410,10 +2506,10 @@
 "literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1212
-#, no-c-format
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2422,16 +2518,16 @@
 "<literal>timestamp</literal> ou <literal>calendar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1217
-#, no-c-format
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "Une propriété de version ou un timestamp ne doit jamais être null pour une "
 "instance détachée, ainsi Hibernate pourra détecter toute instance ayant une "
@@ -2443,20 +2539,19 @@
 "des clefs composées !</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1228
-#, no-c-format
-msgid "timestamp (optional)"
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp (optionnel)"
 
 #. Tag: para
-#: basic_mapping.xml:1230
-#, no-c-format
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "L'élément optionnel <literal>&lt;timestamp&gt;</literal> indique que la "
 "table contient des données horodatées (timestamp). Cela sert d'alternative à "
@@ -2465,7 +2560,7 @@
 "l'application peut parfois utiliser l'horodatage à d'autres fins."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1246
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2480,20 +2575,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1249
-#, no-c-format
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr ""
 "<literal>column</literal> (optionnel - par défaut à le nom de la "
 "propriété) : Le nom d'une colonne contenant le timestamp."
 
 #. Tag: para
-#: basic_mapping.xml:1255
-#, no-c-format
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2502,14 +2597,14 @@
 "persistante."
 
 #. Tag: para
-#: basic_mapping.xml:1268
-#, no-c-format
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (optionnel - par défaut à <literal>null</"
 "literal>) : Propriété dont la valeur est un numéro de version qui indique "
@@ -2519,17 +2614,17 @@
 "de l'attribut identifiant devrait être utilisée)."
 
 #. Tag: para
-#: basic_mapping.xml:1277
-#, no-c-format
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "<literal>source</literal> (optionnel - par défaut à <literal>vm</literal>) : "
 "D'où Hibernate doit-il récupérer la valeur du timestamp? Depuis la base de "
@@ -2541,48 +2636,54 @@
 "provoquant des erreurs de précision (Oracle 8 par exemple)."
 
 #. Tag: para
-#: basic_mapping.xml:1289
-#, no-c-format
+#: basic_mapping.xml:1287
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (optional - défaut à <literal>never</"
 "literal>) : Indique que la valeur de ce timestamp est générée par la base de "
 "données cf. <xref linkend=\"mapping-generated\">generated properties</xref>."
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1298
-#, no-c-format
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "Notez que <literal>&lt;timestamp&gt;</literal> est équivalent à <literal>&lt;"
 "version type=\"timestamp\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:1308
-#, no-c-format
-msgid "property"
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1310
-#, no-c-format
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "L'élément <literal>&lt;property&gt;</literal> déclare une propriété de la "
 "classe au sens JavaBean."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1332
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2608,7 +2709,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1335
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2618,11 +2719,11 @@
 "minuscule."
 
 #. Tag: para
-#: basic_mapping.xml:1341
-#, no-c-format
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal> (optionnel - par défaut au nom de la propriété) : "
@@ -2630,22 +2731,15 @@
 "élément(s) <literal>&lt;column&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1348
-#, no-c-format
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr "<literal>type</literal> (optionnel) : nom indiquant le type Hibernate."
-
-#. Tag: para
-#: basic_mapping.xml:1353
-#, no-c-format
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (optionnel - par défaut à <literal>true</"
 "literal>) : indique que les colonnes mappées devraient être incluses dans "
@@ -2654,7 +2748,7 @@
 "données (utile si vous savez qu'un trigger affectera la valeur à la colonne)."
 
 #. Tag: para
-#: basic_mapping.xml:1362
+#: basic_mapping.xml:1365
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2666,22 +2760,22 @@
 "calculées ne possède pas leur propre mapping."
 
 #. Tag: para
-#: basic_mapping.xml:1375
-#, no-c-format
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (optionnel - par défaut à <literal>false</literal>): "
 "Indique que cette propriété devrait être chargée en différé (lazy loading) "
 "quand on accède à la variable d'instance pour la première fois."
 
 #. Tag: para
-#: basic_mapping.xml:1382
-#, no-c-format
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2690,23 +2784,23 @@
 "<literal>property-ref</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1389
-#, no-c-format
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (optionnel): Génère le DDL d'une contrainte de "
 "non nullité pour les colonnes."
 
 #. Tag: para
-#: basic_mapping.xml:1395
-#, no-c-format
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (optionnel - par défaut à <literal>true</"
 "literal>): Indique que les mises à jour de cette propriété peuvent ou non "
@@ -2715,73 +2809,73 @@
 "propriété est marquée obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1403
-#, no-c-format
+#: basic_mapping.xml:1406
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (optional - défaut à<literal>never</literal>): "
 "Indique que la valeur de ce timestamp est générée par la base de données cf. "
 "<xref linkend=\"mapping-generated\">generated properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1412
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis> peut être:"
 
 #. Tag: para
-#: basic_mapping.xml:1418
-#, no-c-format
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "Nom d'un type basique Hibernate (ex: <literal>integer, string, character, "
 "date, timestamp, float, binary, serializable, object, blob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1424
-#, no-c-format
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "Nom d'une classe Java avec un type basique par défaut (ex: <literal>int, "
 "float, char, java.lang.String, java.util.Date, java.lang.Integer, java.sql."
 "Clob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1430
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "Nom d'une classe Java sérialisable."
 
 #. Tag: para
-#: basic_mapping.xml:1435
-#, no-c-format
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "Nom d'une classe ayant un type spécifique (ex: <literal>com.illflow.type."
 "MyCustomType</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1441
-#, no-c-format
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "Si vous n'indiquez pas un type, Hibernate utlisera la réflexion sur le nom "
 "de la propriété pour tenter de trouver le type Hibernate correct. Hibernate "
@@ -2793,14 +2887,14 @@
 "ou pour préciser un type spécifique)."
 
 #. Tag: para
-#: basic_mapping.xml:1451
-#, no-c-format
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2813,14 +2907,13 @@
 "<literal>org.hibernate.property.PropertyAccessor</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1460
-#, no-c-format
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "Une fonctionnalité particulièrement intéressante est les propriétés "
 "dérivées. Ces propriétés sont par définition en lecture seule, la valeur de "
@@ -2829,7 +2922,7 @@
 "literal> dans la requête SQL qui charge une instance :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1467
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2842,13 +2935,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1469
-#, no-c-format
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "Remarquez que vous pouvez référencer la propre table des entités en ne "
 "déclarant pas un alias sur une colonne particulière (<literal>customerId</"
@@ -2857,18 +2950,18 @@
 "l'attribut si vous le souhaitez."
 
 #. Tag: title
-#: basic_mapping.xml:1479
-#, no-c-format
-msgid "many-to-one"
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1481
-#, no-c-format
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "Une association ordinaire vers une autre classe persistante est déclarée en "
@@ -2877,7 +2970,7 @@
 "référence la ou les clef(s) primaire(s) dans la table cible."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1509
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2906,9 +2999,9 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
 #, fuzzy, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+msgid "<literal>name</literal>: the name of the property."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>name</literal> : Nom de la propriété.\n"
@@ -2920,11 +3013,11 @@
 "déterminé par réflexion) : le nom de la classe (fille) du composant."
 
 #. Tag: para
-#: basic_mapping.xml:1517 basic_mapping.xml:2308
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2937,11 +3030,11 @@
 "<literal>&lt;column&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1524 basic_mapping.xml:1698
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>class</literal> (optionnel - par défaut le type de la propriété "
@@ -2951,21 +3044,25 @@
 "être cascadées de l'objet père vers l'objet associé."
 
 #. Tag: para
-#: basic_mapping.xml:1530
-#, no-c-format
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade</literal> (optionnel) : Indique quelles opérations doivent "
-"être propagées de l'objet père vers les objets associés."
+"<literal>constrained</literal> (optionnel) : Indique qu'une contrainte de "
+"clef étrangère sur la clef primaire de la table mappée référence la table de "
+"la classe associée. Cette option affecte l'ordre dans lequel chaque "
+"<literal>save()</literal> et chaque <literal>delete()</literal> sont "
+"cascadés et détermine si l'association peut utiliser un proxy (aussi utilisé "
+"par l'outil d'export de schéma)."
 
 #. Tag: para
-#: basic_mapping.xml:1536 basic_mapping.xml:1719
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>fetch</literal> (optionnel - par défaut à <literal>select</"
@@ -2977,15 +3074,15 @@
 "n'est pas spécifié, la clef primaire de la classe associée est utilisée."
 
 #. Tag: para
-#: basic_mapping.xml:1542
-#, no-c-format
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (optionnel - par défaut à <literal>true</"
 "literal>) : indique que les colonnes mappées devraient être incluses dans "
@@ -2994,10 +3091,10 @@
 "données (utile si vous savez qu'un trigger affectera la valeur à la colonne)."
 
 #. Tag: para
-#: basic_mapping.xml:1551
-#, no-c-format
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -3006,13 +3103,13 @@
 "spécifié, la clef primaire de la classe associée est utilisée."
 
 #. Tag: para
-#: basic_mapping.xml:1564
-#, no-c-format
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal> (optionnel) : Génère le DDL d'une contrainte "
 "d'unicité pour la clef étrangère. Permet aussi d'en faire la cible d'un "
@@ -3020,39 +3117,24 @@
 "association one-to-one."
 
 #. Tag: para
-#: basic_mapping.xml:1572
-#, no-c-format
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (optionnel) : Génère le DDL pour une contrainte "
 "de non nullité pour la clef étrangère."
 
 #. Tag: para
-#: basic_mapping.xml:1578
-#, no-c-format
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (optionnel - par défaut à <literal>true</"
-"literal>) : Indique que les mises à jour de cette propriété requièrent ou "
-"non l'acquisition d'un verrou optimiste. En d'autres termes, détermine si un "
-"incrément de version doit avoir lieu quand la propriété est marquée obsolète "
-"(dirty)."
-
-#. Tag: para
-#: basic_mapping.xml:1586
-#, no-c-format
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal> (optionnel - par défaut à <literal>false</"
@@ -3065,12 +3147,12 @@
 "literal> indique que l'association sera toujours chargée."
 
 #. Tag: para
-#: basic_mapping.xml:1596
-#, no-c-format
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (optionnel - par défaut à <literal>exception</"
@@ -3079,10 +3161,10 @@
 "ligne manquante comme une association nulle."
 
 #. Tag: para
-#: basic_mapping.xml:1603 basic_mapping.xml:1757
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
 #, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -3092,7 +3174,7 @@
 "Il existe deux types d'associations one-to-one :"
 
 #. Tag: para
-#: basic_mapping.xml:1608
+#: basic_mapping.xml:1611
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -3102,20 +3184,20 @@
 "valeur pour une clé étrangère calculée."
 
 #. Tag: para
-#: basic_mapping.xml:1616
-#, no-c-format
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "Donner une valeur significative à l'attribut <literal>cascade</literal> "
 "autre que <literal>none</literal> propagera certaines opérations à l'objet "
@@ -3130,15 +3212,15 @@
 "supportent pas orphan delete."
 
 #. Tag: para
-#: basic_mapping.xml:1629
-#, no-c-format
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 "Une déclaration <literal>many-to-one</literal> typique est aussi simple que :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1633
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -3146,16 +3228,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1635
-#, no-c-format
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "L'attribut <literal>property-ref</literal> devrait être utilisé pour mapper "
 "seulement des données provenant d'un ancien système où les clefs étrangères "
@@ -3166,7 +3248,7 @@
 "literal> contrôle la génération DDL par Hibernate avec l'outil SchemaExport.)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1644
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -3174,13 +3256,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1646
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr "Ainsi le mapping pour <literal>OrderItem</literal> peut utiliser :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1650
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -3188,13 +3270,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1652
-#, no-c-format
-msgid "This is certainly not encouraged, however."
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "bien que ce ne soit certainement pas encouragé."
 
 #. Tag: para
-#: basic_mapping.xml:1656
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3206,15 +3288,15 @@
 "<literal>&lt;properties&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1661
-#, no-c-format
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr "one-to-one"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1665
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3222,15 +3304,15 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1670
-#, no-c-format
-msgid "one-to-one"
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr ""
 "Une association one-to-one vers une autre classe persistante est déclarée "
 "avec l'élément <literal>one-to-one</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1672
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3238,7 +3320,7 @@
 msgstr "<literal>name</literal> : Le nom de la propriété."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1690
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3259,39 +3341,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1704
-#, no-c-format
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>constrained</literal> (optionnel) : Indique qu'une contrainte de "
-"clef étrangère sur la clef primaire de la table mappée référence la table de "
-"la classe associée. Cette option affecte l'ordre dans lequel chaque "
-"<literal>save()</literal> et chaque <literal>delete()</literal> sont "
-"cascadés et détermine si l'association peut utiliser un proxy (aussi utilisé "
-"par l'outil d'export de schéma)."
-
-#. Tag: para
-#: basic_mapping.xml:1710
-#, no-c-format
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>fetch</literal> (optionnel - par défaut à <literal>select</"
 "literal>) : Choisit entre récupération par jointure externe ou select "
 "séquentiel."
 
 #. Tag: para
-#: basic_mapping.xml:1725
-#, no-c-format
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3300,14 +3368,14 @@
 "de la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:1738
-#, no-c-format
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>lazy</literal> (optionnel - par défaut <literal>proxy</literal>) : "
 "Par défaut, les associations simples sont soumise à proxy. <literal>lazy="
@@ -3319,35 +3387,35 @@
 "impossible et Hibernate chargera automatiquement l'association !</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1746
-#, no-c-format
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>entity-name</literal> (optional) : The entity name of the "
 "associated class."
 
 #. Tag: para
-#: basic_mapping.xml:1764
-#, no-c-format
-msgid "There are two varieties of one-to-one association:"
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "associations par clef primaire"
 
 #. Tag: para
-#: basic_mapping.xml:1768
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "primary key associations"
 msgstr "association par clef étrangère unique"
 
 #. Tag: para
-#: basic_mapping.xml:1771
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr ""
@@ -3359,24 +3427,23 @@
 "d'identifiant !"
 
 #. Tag: para
-#: basic_mapping.xml:1776
-#, no-c-format
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "Pour une association par clef primaire, ajoutez les mappings suivants à "
 "<literal>Employee</literal> et <literal>Person</literal>, respectivement."
 
 #. Tag: para
-#: basic_mapping.xml:1783
-#, no-c-format
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "Maintenant, vous devez faire en sorte que les clefs primaires des lignes "
 "liées dans les tables PERSON et EMPLOYEE sont égales. On utilise une "
@@ -3384,13 +3451,13 @@
 "<literal>foreign</literal> :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1788
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1789
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3398,12 +3465,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1791
-#, no-c-format
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "Une instance fraîchement enregistrée de <literal>Person</literal> se voit "
 "alors assignée la même valeur de clef primaire que l'instance de "
@@ -3411,7 +3478,7 @@
 "literal> de cette <literal>Person</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1797
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3428,31 +3495,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1799
-#, no-c-format
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "Alternativement, une clef étrangère avec contrainte d'unicité de "
 "<literal>Employee</literal> vers <literal>Person</literal> peut être "
 "indiquée ainsi :"
 
 #. Tag: para
-#: basic_mapping.xml:1805
-#, no-c-format
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "Et cette association peut être rendue bidirectionnelle en ajoutant ceci au "
 "mapping de <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1810
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3460,15 +3526,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1812
-#, no-c-format
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr "natural-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1817
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3476,9 +3542,9 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1822
-#, no-c-format
-msgid "natural-id"
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr ""
 "Bien que nous recommandions l'utilisation de clé primaire générée, vous "
 "devriez toujours essayer d'identifier des clé métier (naturelles) pour "
@@ -3490,7 +3556,7 @@
 "documentera."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1824
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3501,15 +3567,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1826
-#, no-c-format
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "Nous vous recommandons fortement d'implémenter <literal>equals()</literal> "
@@ -3517,10 +3583,10 @@
 "l'entité."
 
 #. Tag: para
-#: basic_mapping.xml:1835
-#, no-c-format
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3528,28 +3594,29 @@
 "clés naturelles."
 
 #. Tag: para
-#: basic_mapping.xml:1840
-#, no-c-format
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr ""
 "<literal>mutable</literal> (optionel, par défaut à <literal>false</"
 "literal>) : Par défaut, les identifiants naturels sont supposés être "
 "immuable (constants)."
 
 #. Tag: para
-#: basic_mapping.xml:1846
-#, no-c-format
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr "component, dynamic-component"
 
 #. Tag: title
-#: basic_mapping.xml:1856
-#, no-c-format
-msgid "component, dynamic-component"
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr ""
 "L'élément <literal>&lt;component&gt;</literal> mappe les propriétés d'un "
 "objet fils aux colonnes d'une classe parente. Les composants peuvent en "
@@ -3557,17 +3624,17 @@
 "\"Components\" plus bas."
 
 #. Tag: para
-#: basic_mapping.xml:1858
-#, no-c-format
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr "<literal>name</literal> : Nom de la propriété"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1876
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3589,21 +3656,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1884
-#, no-c-format
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>insert</literal> : Est ce que les colonnes mappées apparaissent "
 "dans les <literal>INSERT</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1890 basic_mapping.xml:1979
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
 #, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>update</literal>: Est ce que les colonnes mappées apparaissent dans "
@@ -3613,11 +3680,11 @@
 "dans les <literal>UPDATE</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1896 basic_mapping.xml:1985
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
 #, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>access</literal> (optionnel - par défaut à <literal>property</"
@@ -3631,12 +3698,12 @@
 "obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1908
-#, no-c-format
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>optimistic-lock</literal> (optionnel - par défaut à <literal>true</"
 "literal>) : Indique que les mises à jour sur ce composant nécessitent ou non "
@@ -3645,12 +3712,12 @@
 "obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1915
-#, no-c-format
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>unique</literal> (optionnel - par défaut à <literal>false</"
@@ -3658,11 +3725,11 @@
 "colonnes mappées de ce composant."
 
 #. Tag: para
-#: basic_mapping.xml:1923 basic_mapping.xml:1999
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
 #, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -3673,7 +3740,7 @@
 "literal> suivant :"
 
 #. Tag: para
-#: basic_mapping.xml:1932
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3684,7 +3751,7 @@
 "classe composant comme une référence arrière vers l'entité contenante."
 
 #. Tag: para
-#: basic_mapping.xml:1937
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3697,18 +3764,19 @@
 "\"components-dynamic\"/>."
 
 #. Tag: para
-#: basic_mapping.xml:1943
-#, no-c-format
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr "properties"
 
 #. Tag: title
-#: basic_mapping.xml:1952
-#, no-c-format
-msgid "properties"
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr ""
 "L'élément <literal>&lt;properties&gt;</literal> permet la définition d'un "
 "groupement logique nommé des propriétés d'une classe. L'utilisation la plus "
@@ -3717,20 +3785,20 @@
 "un moyen pratique de définir une contrainte d'unicité multi-colonnes."
 
 #. Tag: para
-#: basic_mapping.xml:1954
-#, no-c-format
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "<literal>name</literal> : Le nom logique d'un regroupement et <emphasis>non</"
 "emphasis> le véritable nom d'une propriété."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1970
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3748,22 +3816,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1973
-#, no-c-format
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>insert</literal> : Est-ce que les colonnes mappées apparaissent "
 "dans les <literal>INSERT</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1991
-#, no-c-format
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>unique</literal> (optionnel - par défaut à <literal>false</"
@@ -3771,7 +3839,7 @@
 "colonnes mappées de ce composant."
 
 #. Tag: para
-#: basic_mapping.xml:2008
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3782,11 +3850,12 @@
 "<literal>Person</literal> au lieu de la clef primaire :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2012
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3798,17 +3867,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2014
-#, no-c-format
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "Nous ne recommandons pas l'utilisation de ce genre de chose en dehors du "
 "contexte de mapping de données héritées d'anciens systèmes."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2019
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3820,17 +3889,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2021
-#, no-c-format
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr "subclass"
 
 #. Tag: title
-#: basic_mapping.xml:2029
-#, no-c-format
-msgid "subclass"
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr ""
 "Pour finir, la persistance polymorphique nécessite la déclaration de chaque "
 "sous-classe de la classe persistante de base. pour la stratégie de mapping "
@@ -3838,16 +3907,16 @@
 "subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:2031
-#, no-c-format
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr "<literal>name</literal> : Le nom complet de la sous-classe."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2044
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3867,10 +3936,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
 #, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>discriminator-value</literal> (optionnel - par défaut le nom de la "
@@ -3881,21 +3950,21 @@
 "<literal>name</literal> : Le nom Java complet de la sous-classe."
 
 #. Tag: para
-#: basic_mapping.xml:2052
-#, no-c-format
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>proxy</literal> (optionnel) : Indique une classe ou interface à "
 "utiliser pour les chargements à la demande des proxies (lazy)."
 
 #. Tag: para
-#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
+#: basic_mapping.xml:2061
 #, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>lazy</literal> (optionnel, par défaut à <literal>true</literal>) : "
@@ -3909,11 +3978,11 @@
 "le chargement différé des proxies."
 
 #. Tag: para
-#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
+#: basic_mapping.xml:2067
 #, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "Chaque sous-classe devrait déclarer ses propres propriétés persistantes et "
@@ -3932,42 +4001,42 @@
 "chargement à la demande."
 
 #. Tag: para
-#: basic_mapping.xml:2072
-#, no-c-format
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "Pour plus d'infos sur le mapping d'héritage, voir <xref linkend=\"inheritance"
 "\"/>."
 
 #. Tag: para
-#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
-#, no-c-format
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
+#, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr ""
 "Pour des informations sur les mappings d'héritage, voir <xref linkend="
 "\"inheritance\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:2087
-#, no-c-format
-msgid "joined-subclass"
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "joined-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2089
-#, no-c-format
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "Une autre façon possible de faire est la suivante, chaque sous-classe peut "
 "être mappée vers sa propre table (stratégie de mapping de type table-per-"
@@ -3975,7 +4044,7 @@
 "classe. L'élément <literal>&lt;joined-subclass&gt;</literal> est utilisé."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2102
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -4001,9 +4070,9 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2110 basic_mapping.xml:2173
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
 #, fuzzy, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>table</literal> : Le nom de la table de la sous-classe.\n"
@@ -4011,21 +4080,62 @@
 "<literal>table</literal> : nom de la table de la sous-classe."
 
 #. Tag: para
-#: basic_mapping.xml:2129
-#, no-c-format
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optionnel, par défaut à <literal>true</literal>) : "
+"Spécifier <literal>lazy=\"false\"</literal> désactive l'utilisation du "
+"chargement à la demande (lazy).\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (optionnel) : Indique une classe ou interface pour "
+"le chargement différé des proxies.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (optionnel) : Indique une classe ou interface pour "
+"le chargement différé des proxies."
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"Chaque sous-classe devrait déclarer ses propres propriétés persistantes et "
+"sous-classes. Les propriétés <literal>&lt;version&gt;</literal> et "
+"<literal>&lt;id&gt;</literal> sont implicitement hérités de la classe de "
+"base. Chaque sous-classe dans une hiérarchie doit définir une unique "
+"<literal>discriminator-value</literal>. Si aucune n'est spécifiée, le nom "
+"complet de la classe Java est utilisé.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optionnel, par défaut à <literal>true</literal>) : "
+"Indiquer <literal>lazy=\"false\"</literal> désactive l'utilisation du "
+"chargement à la demande.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optionnel, par défaut à <literal>true</literal>) : "
+"Indiquer <literal>lazy=\"false\"</literal> désactive l'utilisation du "
+"chargement à la demande."
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "Aucune colonne discriminante n'est nécessaire pour cette stratégie de "
 "mapping. Cependant, chaque sous-classe doit déclarer une colonne de table "
 "contenant l'objet identifiant qui utilise l'élément <literal>&lt;key&gt;</"
 "literal>. Le mapping au début de ce chapitre serait ré-écrit ainsi :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2136
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -4063,24 +4173,24 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2145
-#, no-c-format
-msgid "union-subclass"
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "union-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2147
-#, no-c-format
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "Une troisième option est de seulement mapper vers des tables les classes "
 "concrètes d'une hiérarchie d'héritage, (stratégie de type table-per-concrete-"
@@ -4093,7 +4203,7 @@
 "vous devez utiliser le mapping <literal>&lt;union-subclass&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2165
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -4118,7 +4228,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2192
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
@@ -4127,24 +4237,24 @@
 "stratégie de mapping."
 
 #. Tag: title
-#: basic_mapping.xml:2203
-#, no-c-format
-msgid "join"
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "join"
 
 #. Tag: para
-#: basic_mapping.xml:2205
-#, no-c-format
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "En utilisant l'élément <literal>&lt;join&gt;</literal>, il est possible de "
 "mapper des propriétés d'une classe sur plusieurs tables."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2219
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -4163,22 +4273,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2223
-#, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal> : Le nom de la table jointe."
 
 #. Tag: para
-#: basic_mapping.xml:2240
-#, no-c-format
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -4195,24 +4305,24 @@
 "ses super-classes."
 
 #. Tag: para
-#: basic_mapping.xml:2253
-#, no-c-format
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (optionnel - par défaut à <literal>false</"
 "literal>) : Si positionné à true, Hibernate n'essaiera pas d'insérer ou de "
 "mettre à jour les propriétés définies par cette jointure."
 
 #. Tag: para
-#: basic_mapping.xml:2260
-#, no-c-format
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optionnel</literal> (optionnel - par défaut à <literal>false</"
@@ -4221,18 +4331,18 @@
 "toujours une jointure externe pour charger les propriétés."
 
 #. Tag: para
-#: basic_mapping.xml:2269
-#, no-c-format
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "Par exemple, les informations d'adresse pour une personne peuvent être "
 "mappées vers une table séparée (tout en préservant des sémantiques de type "
 "valeur pour toutes ses propriétés) :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2274
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -4250,10 +4360,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2276
-#, no-c-format
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4265,19 +4375,19 @@
 "dans une hiérarchie simple ainsi qu'il est expliqué plus tard."
 
 #. Tag: title
-#: basic_mapping.xml:2286
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2288
-#, no-c-format
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "Nous avons rencontré l'élément <literal>&lt;key&gt;</literal> à plusieurs "
 "reprises maintenant. Il apparaît partout que l'élément de mapping parent "
@@ -4286,7 +4396,7 @@
 "d'origine."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2304
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4300,11 +4410,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2315
-#, no-c-format
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (optionnel, par défaut à <literal>noaction</"
@@ -4312,63 +4422,63 @@
 "possibilité au niveau base de données de suppression en cascade."
 
 #. Tag: para
-#: basic_mapping.xml:2322
-#, no-c-format
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (optionnel) : Indique que la clef étrangère "
 "fait référence à des colonnes qui ne sont pas la clef primaire de la table "
 "d'origine (Pour les données de systèmes legacy)."
 
 #. Tag: para
-#: basic_mapping.xml:2329
-#, no-c-format
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (optionnel) : Indique que les colonnes des clefs "
 "étrangères ne peuvent pas être nulles (c'est implicite si la clef étrangère "
 "fait partie de la clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2336
-#, no-c-format
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (optionnel) : Indique que la clef étrangère ne "
 "devrait jamais être mise à jour (implicite si celle-ci fait partie de la "
 "clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2343
-#, no-c-format
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (optionnel) : Indique que la clef étrangère doit "
 "posséder une contrainte d'unicité (implicite si la clef étrangère est aussi "
 "la clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2351
-#, no-c-format
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "Nous recommandons pour les systèmes où les suppressions doivent être "
 "performantes de définir toutes les clefs <literal>on-delete=\"cascade\"</"
@@ -4379,12 +4489,12 @@
 "versionnées."
 
 #. Tag: para
-#: basic_mapping.xml:2359
-#, no-c-format
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4395,19 +4505,19 @@
 "<literal>&lt;key not-null=\"true\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2369
-#, no-c-format
-msgid "column and formula elements"
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "éléments column et formula"
 
 #. Tag: para
-#: basic_mapping.xml:2370
-#, no-c-format
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "Tout élément de mapping qui accepte un attribut <literal>column</literal> "
 "acceptera alternativement un sous-élément <literal>&lt;column&gt;</literal>. "
@@ -4415,7 +4525,7 @@
 "l'attribut <literal>formula</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4433,16 +4543,16 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2378
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2380
-#, no-c-format
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4452,7 +4562,7 @@
 "exotiques."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2386
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4463,20 +4573,20 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2391
-#, no-c-format
-msgid "import"
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "import"
 
 #. Tag: para
-#: basic_mapping.xml:2393
-#, no-c-format
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "Supposez que votre application possède deux classes persistantes du même "
 "nom, et vous ne voulez pas préciser le nom Java complet (packages inclus) "
@@ -4486,13 +4596,13 @@
 "mappées explicitement."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2400
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2407
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4502,41 +4612,40 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2410
-#, no-c-format
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr "<literal>class</literal> : Nom Java complet de la classe."
 
 #. Tag: para
-#: basic_mapping.xml:2415
-#, no-c-format
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal> (optionnel - par défaut vaut le nom de la classe "
 "Java (sans package)) : Nom pouvant être utilisé dans le langage de requête."
 
 #. Tag: title
-#: basic_mapping.xml:2426
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2428
-#, no-c-format
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "Il existe encore un type de mapping de propriété. L'élément de mapping "
 "<literal>&lt;any&gt;</literal> définit une association polymorphique vers "
@@ -4550,11 +4659,11 @@
 "utilisateur, etc...)."
 
 #. Tag: para
-#: basic_mapping.xml:2438
-#, no-c-format
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4566,7 +4675,7 @@
 "partir de valeurs du méta-type sur les noms des classes."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2445
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4579,7 +4688,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2456
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4600,29 +4709,29 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2459
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal> : le nom de la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:2464
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal> : le type identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:2469
-#, no-c-format
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal> (optionnel - par défaut à <literal>string</"
 "literal>) : Tout type permis pour un mapping par discriminateur."
 
 #. Tag: para
-#: basic_mapping.xml:2475
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4632,12 +4741,12 @@
 "literal>) : le style de cascade."
 
 #. Tag: para
-#: basic_mapping.xml:2487
-#, no-c-format
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (optionnel - par défaut à <literal>true</"
@@ -4646,39 +4755,37 @@
 "incrément de version doit avoir lieu quand cette propriété est marquée dirty."
 
 #. Tag: title
-#: basic_mapping.xml:2502
-#, no-c-format
-msgid "Hibernate Types"
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Hibernate Types"
 
 #. Tag: title
-#: basic_mapping.xml:2505
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr "Entités et valeurs"
 
 #. Tag: para
-#: basic_mapping.xml:2507
+#: basic_mapping.xml:2510
 #, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"Pour comprendre le comportement des différents objets Java par rapport au "
-"service de persistance, nous avons besoin de les classer en deux groupes :"
 
 #. Tag: para
-#: basic_mapping.xml:2512
-#, no-c-format
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "Une <emphasis>entité</emphasis> existe indépendamment de tout autre objet "
@@ -4693,16 +4800,16 @@
 "partagées. Elles peuvent aussi être versionnées."
 
 #. Tag: para
-#: basic_mapping.xml:2523
-#, no-c-format
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4718,20 +4825,20 @@
 "entités ou collections."
 
 #. Tag: para
-#: basic_mapping.xml:2534
-#, no-c-format
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "Jusqu'à présent nous avons utilisé le terme \"classe persistante\" pour "
 "parler d'entités. Nous allons continuer à faire ainsi. Cependant, au sens "
@@ -4748,27 +4855,26 @@
 "value type."
 
 #. Tag: para
-#: basic_mapping.xml:2548
-#, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr ""
 "Nous nous pencherons sur ces deux concepts tout au long de la documentation."
 
 #. Tag: para
-#: basic_mapping.xml:2552
-#, no-c-format
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "Le défi est de mapper les type Javas (et la définition des développeurs des "
 "entités et valeurs types) sur les types du SQL ou des bases de données. Le "
@@ -4784,31 +4890,33 @@
 "tard."
 
 #. Tag: para
-#: basic_mapping.xml:2565
-#, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr ""
 "Tous les types proposés de base par Hibernate à part les collections "
 "autorisent la valeur null."
 
 #. Tag: title
-#: basic_mapping.xml:2572
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr "Basic value types"
 
 #. Tag: para
-#: basic_mapping.xml:2574
+#: basic_mapping.xml:2577
 #, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr ""
 "Les <emphasis>types basiques de mapping</emphasis> proposés de base peuvent "
 "grossièrement être rangés dans les catégories suivantes : <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2579
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4818,7 +4926,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2582
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4833,13 +4941,13 @@
 "<literal>java.lang.Boolean</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2591
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2593
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4849,13 +4957,13 @@
 "<literal>VARCHAR</literal> (ou le <literal>VARCHAR2</literal> Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2600
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2602
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4867,13 +4975,13 @@
 "<literal>TIMESTAMP</literal> (ou équivalent)."
 
 #. Tag: literal
-#: basic_mapping.xml:2610
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2612
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4883,13 +4991,13 @@
 "SQL <literal>TIMESTAMP</literal> et <literal>DATE</literal> (ou équivalent)."
 
 #. Tag: literal
-#: basic_mapping.xml:2620
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4901,13 +5009,13 @@
 "le <literal>NUMBER</literal> Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4925,13 +5033,13 @@
 "sont mappées sur leur <literal>ID</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2644
-#, fuzzy, no-c-format
-msgid "<literal>class</literal>"
-msgstr "<literal>all</literal> vérifie toutes les colonnes"
+#: basic_mapping.xml:2647
+#, no-c-format
+msgid "class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:2646
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4943,25 +5051,25 @@
 "objet <literal>Class</literal> est mappé sur son nom Java complet."
 
 #. Tag: literal
-#: basic_mapping.xml:2654
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2656
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "Mappe les tableaux de bytes vers le type binaire SQL approprié."
 
 #. Tag: literal
-#: basic_mapping.xml:2662
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2664
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4971,16 +5079,16 @@
 "<literal>CLOB</literal> ou <literal>TEXT</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2671
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2673
-#, no-c-format
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4990,19 +5098,19 @@
 "défaut un type de base."
 
 #. Tag: literal
-#: basic_mapping.xml:2682
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2684
-#, no-c-format
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "Mappings de type pour les classes JDBC <literal>java.sql.Clob</literal> and "
 "<literal>java.sql.Blob</literal>. Ces types peuvent ne pas convenir pour "
@@ -5011,7 +5119,7 @@
 "pilotes est moyennement bonne)."
 
 #. Tag: literal
-#: basic_mapping.xml:2694
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -5021,16 +5129,16 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2698
-#, no-c-format
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "Mappings de type pour ceux qui sont habituellement modifiable, pour lesquels "
 "Hibernate effectue certains optimisations convenant seulement aux types Java "
@@ -5041,12 +5149,13 @@
 "doit assigner un nouvel (non identique) objet à la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:2713
-#, no-c-format
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "Les identifiants uniques des entités et collections peuvent être de "
 "n'importe quel type de base excepté <literal>binary</literal>, "
@@ -5054,7 +5163,7 @@
 "composites sont aussi permis, voir plus bas)."
 
 #. Tag: para
-#: basic_mapping.xml:2719
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -5068,20 +5177,20 @@
 "<literal>string</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2728
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr "Types de valeur définis par l'utilisateur"
 
 #. Tag: para
-#: basic_mapping.xml:2730
-#, no-c-format
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -5099,14 +5208,14 @@
 "literal>, <literal>SURNAME</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:2741
-#, no-c-format
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "Pour implémenter votre propre type, vous pouvez soit implémenter "
 "<literal>org.hibernate.UserType</literal> soit <literal>org.hibernate."
@@ -5115,7 +5224,7 @@
 "DoubleStringType</literal> pour voir ce qu'il est possible de faire."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2749
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -5126,7 +5235,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2751
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -5136,7 +5245,7 @@
 "mapper une propriété sur des colonnes multiples."
 
 #. Tag: para
-#: basic_mapping.xml:2756
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -5150,10 +5259,10 @@
 "spécialisées."
 
 #. Tag: para
-#: basic_mapping.xml:2762
-#, no-c-format
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -5167,7 +5276,7 @@
 "vos fichiers de mapping."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2770
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -5178,7 +5287,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2772
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -5190,14 +5299,14 @@
 "<literal>Properties</literal> qui lui est passé."
 
 #. Tag: para
-#: basic_mapping.xml:2777
-#, no-c-format
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "Si vous utilisez fréquemment un <literal>UserType</literal>, cela peut être "
 "utile de lui définir un nom plus court. Vous pouvez faire cela en utilisant "
@@ -5206,7 +5315,7 @@
 "valeurs de paramètres par défaut si ce type est paramétré."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2784
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -5216,13 +5325,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2786
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2788
+#: basic_mapping.xml:2791
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -5232,18 +5341,17 @@
 "cas par cas en utilisant des paramètres type sur le mapping de la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:2793
-#, no-c-format
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "Bien que le fait que Hibernate propose de base une riche variété de types, "
 "et qu'il supporte les composants signifie que vous aurez très rarement "
@@ -5257,19 +5365,19 @@
 "futurs dans votre façon de représenter des valeurs monétaires."
 
 #. Tag: title
-#: basic_mapping.xml:2809
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "Mapper une classe plus d'une fois"
 
 #. Tag: para
-#: basic_mapping.xml:2810
-#, no-c-format
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -5282,7 +5390,7 @@
 "nommées."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -5305,30 +5413,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2820
-#, no-c-format
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "Remarquez comment les associations sont désormais spécifiées en utilisant "
 "<literal>entity-name</literal> au lieu de <literal>class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2828
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL quoted identifiers"
 
 #. Tag: para
-#: basic_mapping.xml:2829
-#, no-c-format
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "Vous pouvez forcer Hibernate à mettre un identifiant entre quotes dans le "
 "SQL généré en mettant le nom de la table ou de la colonne entre backticks "
@@ -5337,7 +5445,7 @@
 "mais des parenthèses pour SQL server et des backticks pour MySQL)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2836
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5349,36 +5457,36 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2842
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "alternatives Metadata"
 
 #. Tag: para
-#: basic_mapping.xml:2844
-#, no-c-format
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XML ne convient pas à tout le monde, il y a donc des moyens alternatifs pour "
 "définir des metatda de mappings O/R dans Hibernate."
 
 #. Tag: title
-#: basic_mapping.xml:2849
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "utilisation de XDoclet"
 
 #. Tag: para
-#: basic_mapping.xml:2851
-#, no-c-format
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "De nombreux utilisateurs de Hibernate préfèrent embarquer les informations "
 "de mappings directement au sein du code source en utilisant les tags XDoclet "
@@ -5388,7 +5496,7 @@
 "<literal>Cat</literal> avec des mappings XDoclet."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2858
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5498,31 +5606,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2860
-#, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr ""
 "Voyez le site web de Hibernate pour plus d'exemples sur XDoclet et Hibernate."
 
 #. Tag: title
-#: basic_mapping.xml:2867
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "Utilisation des annotations JDK 5.0"
 
 #. Tag: para
-#: basic_mapping.xml:2869
-#, no-c-format
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "Le JDK 5.0 introduit des annotations proches de celles de XDoclet au niveau "
@@ -5538,13 +5646,13 @@
 "télécharger. EJB3 (JSR-220) et les métadata Hibernate3 sont supportés."
 
 #. Tag: para
-#: basic_mapping.xml:2880
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr "Ceci est un exemple d'une classe POJO annotée comme un EJB entité :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2884
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5572,35 +5680,34 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2886
-#, no-c-format
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "Notez que le support des annotations JDK 5.0 (et de la JSR-220) est encore "
 "en cours et n'est pas terminé. Référez vous au module Hibernate Annotation "
 "pour plus de détails."
 
 #. Tag: title
-#: basic_mapping.xml:2895
-#, no-c-format
-msgid "Generated Properties"
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "Propriétés générées"
 
 #. Tag: para
-#: basic_mapping.xml:2896
-#, no-c-format
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "Les propriétés générées sont des propriétés dont les valeurs sont générées "
 "par la base de données. Typiquement, les applications Hibernate avaient "
@@ -5613,13 +5720,13 @@
 "pour récupérer les valeurs générées."
 
 #. Tag: para
-#: basic_mapping.xml:2905
-#, no-c-format
+#: basic_mapping.xml:2911
+#, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "Les propriétés marquées comme générées doivent de plus ne pas être "
@@ -5629,25 +5736,25 @@
 "\">simple properties</xref> peuvent être marqués comme générées."
 
 #. Tag: para
-#: basic_mapping.xml:2912
-#, no-c-format
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr ""
 "<literal>never</literal> (par défaut) - indique la valeur de la propriété "
 "n'est pas générée dans la base de données."
 
 #. Tag: para
-#: basic_mapping.xml:2916
-#, no-c-format
+#: basic_mapping.xml:2922
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - indique que la valeur de la propriété donnée est "
 "générée à l'insertion mais pas lors des futures mises à jour de "
@@ -5658,32 +5765,33 @@
 "comme générées, cette option n'est pas disponible à cet endroit..."
 
 #. Tag: para
-#: basic_mapping.xml:2924
-#, no-c-format
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr ""
 "<literal>always</literal> - indique que la valeur de la propriété est "
 "générée à l'insert comme aux updates."
 
 #. Tag: title
-#: basic_mapping.xml:2931
-#, no-c-format
-msgid "Auxiliary Database Objects"
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "Objets auxiliaires de la base de données"
 
 #. Tag: para
-#: basic_mapping.xml:2932
-#, no-c-format
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Permettent les ordres CREATE et DROP d'objets arbitraire de la base de "
 "donnéées, en conjonction avec les outils Hibernate d'évolutions de schéma, "
@@ -5695,17 +5803,17 @@
 "deux modes pour définir les objets auxiliaires de base de données..."
 
 #. Tag: para
-#: basic_mapping.xml:2941
-#, no-c-format
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr ""
 "Le premier mode est de lister explicitement les commandes CREATE et DROP "
 "dans le fichier de mapping:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2945
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5718,12 +5826,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2946
-#, no-c-format
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "Le second mode est de fournir une classe particulière qui connait comment "
 "construire les commandes CREATE et DROP. Cette classe particulière doit "
@@ -5731,7 +5839,7 @@
 "AuxiliaryDatabaseObject</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2951
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5743,32 +5851,66 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2952
-#, no-c-format
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr ""
 "Additionnellement, ces objets de base de données peuvent être "
 "optionnellement traités selon l'utilisation de dialectes particuliers.."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2956
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
-#~ msgid "class"
-#~ msgstr "class"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr ""
+#~ "<literal>type</literal> (optionnel) : Nom indiquant le type Hibernate."
 
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade</literal> (optionnel) : Indique quelles opérations "
+#~ "doivent être propagées de l'objet père vers les objets associés."
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (optionnel - par défaut à "
+#~ "<literal>true</literal>) : Indique que les mises à jour de cette "
+#~ "propriété requièrent ou non l'acquisition d'un verrou optimiste. En "
+#~ "d'autres termes, détermine si un incrément de version doit avoir lieu "
+#~ "quand la propriété est marquée obsolète (dirty)."
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "Pour comprendre le comportement des différents objets Java par rapport au "
+#~ "service de persistance, nous avons besoin de les classer en deux groupes :"
+
+#, fuzzy
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>all</literal> vérifie toutes les colonnes"
+
 #~ msgid "id"
 #~ msgstr "id"
 

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,9 +18,9 @@
 
 #. Tag: para
 #: batch.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "Une approche naïve pour insérer 100 000 lignes dans la base de données en "
@@ -42,12 +42,12 @@
 
 #. Tag: para
 #: batch.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "Ceci devrait s'écrouler avec une <literal>OutOfMemoryException</literal> "
 "quelque part aux alentours de la 50 000ème ligne. C'est parce qu'Hibernate "
@@ -55,13 +55,13 @@
 "insérées dans le cache de second niveau."
 
 #. Tag: para
-#: batch.xml:44
-#, no-c-format
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "Dans ce chapitre nous montrerons comment éviter ce problème. D'abord, "
 "cependant, si vous faites des traitements par batch, il est absolument "
@@ -71,37 +71,37 @@
 "50) :"
 
 #. Tag: programlisting
-#: batch.xml:51
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:53
-#, no-c-format
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "Vous pourriez aussi vouloir faire cette sorte de travail dans un traitement "
 "où l'interaction avec le cache de second niveau est complètement désactivé :"
 
 #. Tag: para
-#: batch.xml:58
-#, no-c-format
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr "Insertions en paquet"
 
 #. Tag: programlisting
-#: batch.xml:63
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:65
+#: batch.xml:66
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -113,18 +113,18 @@
 "literal> sur la session, pour contrôler la taille du cache de premier niveau."
 
 #. Tag: title
-#: batch.xml:71
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr "Paquet de mises à jour"
 
 #. Tag: para
-#: batch.xml:73
-#, no-c-format
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "Pour récupérer et mettre à jour des données les mêmes idées s'appliquent. En "
 "plus, vous avez besoin d'utiliser <literal>scroll()</literal> pour tirer "
@@ -132,7 +132,7 @@
 "de lignes de données."
 
 #. Tag: programlisting
-#: batch.xml:79
+#: batch.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -153,18 +153,18 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:84
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr "L'interface StatelessSession"
 
 #. Tag: para
-#: batch.xml:86
-#, no-c-format
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "Alternativement, Hibernate fournit une API orientée commande qui peut être "
 "utilisée avec des flux de données pour et en provenance de la base de "
@@ -184,7 +184,7 @@
 "proche de la couche JDBC sous-jacente."
 
 #. Tag: programlisting
-#: batch.xml:92
+#: batch.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -209,7 +209,7 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:97
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr ""
@@ -218,22 +218,22 @@
 "sont jamais associées à un contexte de persistance."
 
 #. Tag: para
-#: batch.xml:98
-#, no-c-format
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "Les opérations <literal>insert()</literal>, <literal>update()</literal> et "
 "<literal>delete()</literal> définies par l'interface "
@@ -246,7 +246,7 @@
 "par l'interface <literal>Session</literal>."
 
 #. Tag: programlisting
-#: batch.xml:113
+#: batch.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -265,26 +265,25 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:115
-#, no-c-format
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr "Opérations de style DML"
 
 #. Tag: para
-#: batch.xml:121
-#, no-c-format
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "Comme déjà discuté avant, le mapping objet/relationnel automatique et "
 "transparent est intéressé par la gestion de l'état de l'objet. Ceci implique "
@@ -297,7 +296,7 @@
 "(<xref linkend=\"queryhql\">HQL</xref>)."
 
 #. Tag: title
-#: batch.xml:134
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr ""
@@ -307,27 +306,27 @@
 "noter :"
 
 #. Tag: para
-#: batch.xml:136
-#, no-c-format
+#: batch.xml:137
+#, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr "Dans la clause from, le mot-clef FROM est optionnel"
 
 #. Tag: para
 #: batch.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "Il ne peut y avoir qu'une seule entité nommée dans la clause from ; elle "
 "peut optionnellement avoir un alias. Si le nom de l'entité a un alias, alors "
@@ -336,8 +335,14 @@
 "n'importe quelle référence de propriété d'être qualifiée."
 
 #. Tag: para
-#: batch.xml:154
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr ""
 "Aucune jointure (implicite ou explicite) ne peut être spécifiée dans une "
@@ -345,22 +350,22 @@
 "les sous-requêtes, elles-mêmes, peuvent contenir des jointures."
 
 #. Tag: para
-#: batch.xml:159
-#, no-c-format
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr "La clause where est aussi optionnelle."
 
 #. Tag: para
-#: batch.xml:167
-#, no-c-format
+#: batch.xml:170
+#, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "Par exemple, pour exécuter un <literal>UPDATE</literal> HQL, utilisez la "
 "méthode <literal>Query.executeUpdate()</literal> (la méthode est données "
@@ -368,7 +373,7 @@
 "</literal> de JDBC) :"
 
 #. Tag: para
-#: batch.xml:174
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr ""
@@ -376,13 +381,13 @@
 "<literal>Query.executeUpdate()</literal> :"
 
 #. Tag: para
-#: batch.xml:180
-#, no-c-format
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "La valeur du <literal>int</literal> retourné par la méthode <literal>Query."
 "executeUpdate()</literal> indique le nombre d'entités affectées par "
@@ -398,7 +403,7 @@
 "hiérarchie d'héritage."
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -417,16 +422,16 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
-#, no-c-format
+#: batch.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -435,7 +440,7 @@
 "Quelques points sont à noter :"
 
 #. Tag: programlisting
-#: batch.xml:198
+#: batch.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -451,18 +456,18 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:200
-#, no-c-format
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "Seule la forme INSERT INTO ... SELECT ... est supportée ; pas la forme "
 "INSERT INTO ... VALUES ... ."
 
 #. Tag: para
-#: batch.xml:205
+#: batch.xml:208
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -478,7 +483,7 @@
 "expressions <literal>INSERT</literal> par nature non polymorphiques."
 
 #. Tag: programlisting
-#: batch.xml:210
+#: batch.xml:213
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -494,19 +499,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:212
-#, no-c-format
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "select_statement peut être n'importe quelle requête de sélection HQl valide, "
 "avec l'avertissement que les types de retour doivent correspondre aux types "
@@ -522,7 +527,7 @@
 "gérer la conversion."
 
 #. Tag: para
-#: batch.xml:223
+#: batch.xml:226
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -546,7 +551,7 @@
 "select."
 
 #. Tag: para
-#: batch.xml:231
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -561,28 +566,28 @@
 "VersionType</literal> est utilisée)."
 
 #. Tag: para
-#: batch.xml:234
-#, no-c-format
+#: batch.xml:237
+#, fuzzy, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 "Un exemple d'exécution d'une expression <literal>INSERT</literal> HQL :"
 
 #. Tag: para
-#: batch.xml:244
-#, no-c-format
+#: batch.xml:247
+#, fuzzy, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
@@ -590,44 +595,46 @@
 msgstr "translator-credits"
 
 #. Tag: para
-#: batch.xml:256
+#: batch.xml:259
 #, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:271
+#: batch.xml:274
 #, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:281
+#: batch.xml:284
 #, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:285
+#: batch.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: term
 #: best_practices.xml:33
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "Découpez finement vos classes et mappez les en utilisant <literal>&lt;"
 "component&gt;</literal>."
@@ -41,17 +41,17 @@
 
 #. Tag: term
 #: best_practices.xml:43
-#, no-c-format
-msgid "Declare identifier properties on persistent classes."
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "Déclarez des propriétés d'identifiants dans les classes persistantes."
 
 #. Tag: para
 #: best_practices.xml:45
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "Hibernate rend les propriétés d'identifiants optionnelles. Il existe "
 "beaucoup de raisons pour lesquelles vous devriez les utiliser. Nous "
@@ -60,8 +60,8 @@
 
 #. Tag: term
 #: best_practices.xml:53
-#, no-c-format
-msgid "Identify natural keys."
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "Identifiez les clefs naturelles."
 
 #. Tag: para
@@ -80,17 +80,17 @@
 
 #. Tag: term
 #: best_practices.xml:63
-#, no-c-format
-msgid "Place each class mapping in its own file."
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "Placez chaque mapping de classe dans son propre fichier."
 
 #. Tag: para
 #: best_practices.xml:65
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "N'utilisez pas un unique document de mapping. Mappez <literal>com.eg.Foo</"
 "literal> dans le fichier <literal>com/eg/Foo.hbm.xml</literal>. Cela prend "
@@ -98,8 +98,8 @@
 
 #. Tag: term
 #: best_practices.xml:73
-#, no-c-format
-msgid "Load mappings as resources."
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "Chargez les mappings comme des ressources."
 
 #. Tag: para
@@ -110,17 +110,17 @@
 
 #. Tag: term
 #: best_practices.xml:81
-#, no-c-format
-msgid "Consider externalising query strings."
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "Pensez à externaliser les chaînes de caractères."
 
 #. Tag: para
 #: best_practices.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "Ceci est une bonne habitude si vos requêtes appellent des fonctions SQL qui "
 "ne sont pas au standard ANSI. Cette externalisation dans les fichiers de "
@@ -134,11 +134,11 @@
 
 #. Tag: para
 #: best_practices.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "Comme en JDBC, remplacez toujours les valeurs non constantes par \"?\". "
 "N'utilisez jamais la manipulation des chaînes de caractères pour remplacer "
@@ -147,18 +147,18 @@
 
 #. Tag: term
 #: best_practices.xml:101
-#, no-c-format
-msgid "Don't manage your own JDBC connections."
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "Ne gérez pas vous même les connexions JDBC."
 
 #. Tag: para
 #: best_practices.xml:103
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "Hibernate laisse l'application gérer les connexions JDBC. Vous ne devriez "
 "gérer vos connexions qu'en dernier recours. Si vous ne pouvez pas utiliser "
@@ -168,19 +168,19 @@
 
 #. Tag: term
 #: best_practices.xml:111
-#, no-c-format
-msgid "Consider using a custom type."
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "Pensez à utiliser les types utilisateurs."
 
 #. Tag: para
 #: best_practices.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "Supposez que vous ayez une type Java, de telle bibliothèque, qui a besoin "
 "d'être persisté mais qui ne fournit pas les accesseurs nécessaires pour le "
@@ -190,21 +190,21 @@
 
 #. Tag: term
 #: best_practices.xml:122
-#, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "Utilisez du JDBC pur dans les goulets d'étranglement."
 
 #. Tag: para
 #: best_practices.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "Dans certaines parties critiques de votre système d'un point de vue "
 "performance, quelques opérations peuvent tirer partie d'un appel JDBC natif. "
@@ -217,18 +217,18 @@
 
 #. Tag: term
 #: best_practices.xml:134
-#, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "Comprendre le flush de <literal>Session</literal>."
 
 #. Tag: para
 #: best_practices.xml:136
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "De temps en temps la Session synchronise ses états persistants avec la base "
@@ -239,21 +239,21 @@
 
 #. Tag: term
 #: best_practices.xml:145
-#, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr ""
 "Dans une architecture à trois couches, pensez à utiliser "
 "<literal>saveOrUpdate()</literal>."
 
 #. Tag: para
 #: best_practices.xml:147
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "Quand vous utilisez une architecture à base de servlet / session bean, vous "
 "pourriez passer des objets chargés dans le bean session vers et depuis la "
@@ -264,27 +264,27 @@
 
 #. Tag: term
 #: best_practices.xml:156
-#, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr ""
 "Dans une architecture à deux couches, pensez à utiliser la déconnexion de "
 "session."
 
 #. Tag: para
 #: best_practices.xml:158
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "Les transactions de bases de données doivent être aussi courtes que possible "
@@ -303,19 +303,19 @@
 
 #. Tag: term
 #: best_practices.xml:172
-#, no-c-format
-msgid "Don't treat exceptions as recoverable."
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "Considérez que les exceptions ne sont pas rattrapables."
 
 #. Tag: para
 #: best_practices.xml:174
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -329,21 +329,21 @@
 
 #. Tag: term
 #: best_practices.xml:184
-#, no-c-format
-msgid "Prefer lazy fetching for associations."
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "Préférez le chargement tardif des associations."
 
 #. Tag: para
 #: best_practices.xml:186
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "Utilisez le chargement complet avec modération. Utilisez les proxies et les "
 "collections chargées tardivement pour la plupart des associations vers des "
@@ -357,10 +357,10 @@
 
 #. Tag: term
 #: best_practices.xml:196
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "Utilisez le pattern <emphasis>d'une ouverture de session dans une vue</"
 "emphasis>, ou une <emphasis>phase d'assemblage</emphasis> disciplinée pour "
@@ -368,7 +368,7 @@
 
 #. Tag: para
 #: best_practices.xml:201
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -376,12 +376,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernate libère les développeurs de l'écriture fastidieuse des "
 "<emphasis>objets de transfert de données (NdT : Data Transfer Objects)</"
@@ -399,20 +399,20 @@
 
 #. Tag: term
 #: best_practices.xml:215
-#, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "Pensez à abstraite votre logique métier d'Hibernate."
 
 #. Tag: para
 #: best_practices.xml:217
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "Cachez le mécanisme d'accès aux données (Hibernate) derrière une interface. "
 "Combinez les patterns <emphasis>DAO</emphasis> et <emphasis>Thread Local "
@@ -423,20 +423,20 @@
 
 #. Tag: term
 #: best_practices.xml:227
-#, no-c-format
-msgid "Don't use exotic association mappings."
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "N'utilisez pas d'associations de mapping exotiques."
 
 #. Tag: para
 #: best_practices.xml:229
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "De bons cas d'utilisation pour de vraies associations plusieurs-vers-"
 "plusieurs sont rares. La plupart du temps vous avez besoin d'informations "
@@ -449,8 +449,8 @@
 
 #. Tag: term
 #: best_practices.xml:239
-#, no-c-format
-msgid "Prefer bidirectional associations."
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "Préférez les associations bidirectionnelles."
 
 #. Tag: para

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,9 +12,9 @@
 
 #. Tag: title
 #: collection_mapping.xml:29
-#, no-c-format
-msgid "Collection Mapping"
-msgstr "Mapping des collections"
+#, fuzzy, no-c-format
+msgid "Collection mapping"
+msgstr "Mapper une collection"
 
 #. Tag: title
 #: collection_mapping.xml:32
@@ -24,10 +24,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "Hibernate requiert que les champs contenant des collections persistantes "
 "soient déclarés comme des types d'interface, par exemple :"
@@ -49,14 +49,14 @@
 
 #. Tag: para
 #: collection_mapping.xml:41
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "L'interface réelle devrait être <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
@@ -68,15 +68,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:50
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "Notez comment nous avons initialisé les variables d'instance avec une "
 "instance de <literal>HashSet</literal>. C'est le meilleur moyen pour "
@@ -103,12 +103,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "Les collections persistantes injectées par Hibernate se comportent de la "
 "même manière que <literal>HashMap</literal>, <literal>HashSet</literal>, "
@@ -117,15 +117,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "Les instances des collections ont le comportement habituel des types des "
@@ -141,11 +141,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:80
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "Vous ne devriez pas vous préoccuper trop de ça. Utilisez les collections "
 "persistantes de la même manière que vous utilisez des collections Java "
@@ -160,12 +160,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:92
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
 msgstr ""
 "Il y a pas mal de variétés de mappings qui peuvent être générés pour les "
 "collections, couvrant beaucoup des modèles relationnels communs. Nous vous "
@@ -175,11 +175,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:99
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "L'élément de mapping d'Hibernate utilisé pour mapper une collection dépend "
 "du type de l'interface. Par exemple, un élément <literal>&lt;set&gt;</"
@@ -246,17 +246,17 @@
 
 #. Tag: para
 #: collection_mapping.xml:135
-#, no-c-format
-msgid "<literal>name</literal> the collection property name"
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr ""
 "<literal>name</literal> : le nom de la propriété contenant la collection"
 
 #. Tag: para
 #: collection_mapping.xml:140
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (optionnel - par défaut = nom de la propriété) : le "
 "nom de la table de la collection (non utilisé pour les associations one-to-"
@@ -264,9 +264,9 @@
 
 #. Tag: para
 #: collection_mapping.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (optionnel) : le nom du schéma pour surcharger le "
@@ -274,12 +274,13 @@
 
 #. Tag: para
 #: collection_mapping.xml:152
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (optionnel - par défaut = <literal>true</literal>) : "
 "peut être utilisé pour désactiver l'initialisation tardive et spécifier que "
@@ -289,10 +290,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:161
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (optionnel - par défaut = <literal>false</"
 "literal>) : définit cette collection comme l'extrêmité \"inverse\" de "
@@ -300,20 +302,20 @@
 
 #. Tag: para
 #: collection_mapping.xml:167
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (optionnel - par défaut = <literal>none</"
 "literal>) : active les opérations de cascade vers les entités filles"
 
 #. Tag: para
 #: collection_mapping.xml:173
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal> (optionnel) : spécifie une collection triée via un "
 "ordre de tri <literal>naturel</literal>, ou via une classe comparateur "
@@ -321,12 +323,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:179
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (optionnel, seulement à partir du JDK1.4) : "
 "spécifie une colonne de table (ou des colonnes) qui définit l'ordre "
@@ -335,11 +337,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:186
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (optionnel) : spécifie une condition SQL arbitraire "
 "<literal>WHERE</literal> à utiliser au chargement ou à la suppression d'une "
@@ -348,10 +351,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:193
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal> (optionnel, par défaut = <literal>select</"
@@ -361,10 +364,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:200
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (optionnel, par défaut = <literal>1</"
 "literal>) : une taille de batch (batch size) utilisée pour charger plusieurs "
@@ -372,11 +375,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:206
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal> (optionnel - par défaut = <literal>property</"
 "literal>) : La stratégie qu'Hibernate doit utiliser pour accéder à la valeur "
@@ -384,12 +387,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:212
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>optimistic-lock</literal> (optionnel - par défaut = <literal>true</"
 "literal>) : spécifie que changer l'état de la collection entraîne "
@@ -398,11 +401,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:220
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable</literal> (optionnel - par défaut = <literal>true</"
 "literal>) : une valeur à <literal>false</literal> spécifie que les éléments "
@@ -417,11 +421,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -433,11 +437,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:240
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "Il peut y avoir une contrainte de nullité sur la colonne de la clef "
@@ -453,9 +457,9 @@
 
 #. Tag: para
 #: collection_mapping.xml:249
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 "La contraite de la clef étrangère peut utiliser <literal>ON DELETE CASCADE</"
 "literal>."
@@ -484,15 +488,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:265
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "Les collections peuvent contenir la plupart des autres types Hibernate, dont "
 "tous les types basiques, les types utilisateur, les composants, et bien sûr, "
@@ -530,19 +534,19 @@
 
 #. Tag: para
 #: collection_mapping.xml:288
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "Tous les mappings de collection, exceptés ceux avec les sémantiques "
 "d'ensemble (NdT : set) et de sac (NdT : bag), ont besoin d'une "
@@ -567,10 +571,10 @@
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -581,11 +585,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -595,24 +599,24 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:380
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "Si votre table n'a pas de colonne d'index, et que vous souhaitez tout de "
 "même utiliser <literal>List</literal> comme type de propriété, vous devriez "
@@ -628,11 +632,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:392
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr ""
 "N'importe quelle collection de valeurs ou association plusieurs-vers-"
@@ -643,10 +647,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:399
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr ""
 "Pour une collection de valeurs, nous utilisons la balise <literal>&lt;"
 "element&gt;</literal>."
@@ -668,11 +672,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -693,30 +697,30 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
@@ -725,11 +729,17 @@
 #. Tag: para
 #: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
-msgstr "Quelques exemples, d'abord, un ensemble de chaînes de caractères :"
+msgid "Here are some examples."
+msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:510
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -739,17 +749,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:512
-#, no-c-format
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "Un bag contenant des entiers (avec un ordre d'itération déterminé par "
 "l'attribut <literal>order-by</literal>) :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:517
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -761,15 +771,15 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:519
-#, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr ""
 "Un tableau d'entités - dans ce cas, une association plusieurs-vers-"
 "plusieurs :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:523
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -782,13 +792,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:525
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "Une map de chaînes de caractères vers des dates :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:529
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -802,13 +812,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:531
-#, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr "Une liste de composants (discute dans le prochain chapitre) :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:535
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -824,18 +834,18 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:540
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr "Association un-vers-plusieurs"
 
 #. Tag: para
-#: collection_mapping.xml:542
-#, no-c-format
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr ""
 "Une <emphasis>association un vers plusieurs</emphasis> lie les tables de "
 "deux classes par une clef étrangère, sans l'intervention d'une table de "
@@ -843,33 +853,33 @@
 "normales :"
 
 #. Tag: para
-#: collection_mapping.xml:550
-#, no-c-format
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr ""
 "Une instance de la classe de l'entité contenue ne peut pas appartenir à plus "
 "d'une instance de la collection"
 
 #. Tag: para
-#: collection_mapping.xml:556
-#, no-c-format
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "Une instance de la classe de l'entité contenue ne peut pas apparaître plus "
 "plus d'une valeur d'index de la collection"
 
 #. Tag: para
-#: collection_mapping.xml:563
-#, no-c-format
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr ""
 "Une association de <literal>Product</literal> vers <literal>Part</literal> "
 "requiert l'existence d'une clef étrangère et possiblement une colonne "
@@ -877,7 +887,7 @@
 "to-many&gt;</literal> indique que c'est une association un vers plusieurs."
 
 #. Tag: programlisting
-#: collection_mapping.xml:576
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -890,18 +900,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:579
-#, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+#: collection_mapping.xml:582
+#, fuzzy, no-c-format
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr "<literal>class</literal> (requis) : le nom de la classe associée"
 
 #. Tag: para
-#: collection_mapping.xml:584
-#, no-c-format
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (optionnel - par défaut <literal>exception</"
@@ -910,10 +920,10 @@
 "ligne manquante comme une association nulle"
 
 #. Tag: para
-#: collection_mapping.xml:591
+#: collection_mapping.xml:594
 #, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -924,28 +934,27 @@
 "associée, comme une alternative à <literal>class</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:599
-#, no-c-format
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "Notez que l'élément <literal>&lt;one-to-many&gt;</literal> n'a pas besoin de "
 "déclarer de colonnes. Il n'est pas non plus nécessaire de spécifier le nom "
 "de la table nulle part."
 
 #. Tag: para
-#: collection_mapping.xml:605
-#, no-c-format
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>Note très importante :</emphasis> si la colonne de la clef d'une "
 "association <literal>&lt;one-to-many&gt;</literal> est déclarée <literal>NOT "
@@ -956,19 +965,19 @@
 "associations bidirectionnelles plus tard dans ce chapitre."
 
 #. Tag: para
-#: collection_mapping.xml:614
-#, no-c-format
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "Cet exemple montre une map d'entités <literal>Part</literal> par nom (où "
 "<literal>partName</literal> est une propriété persistante de <literal>Part</"
 "literal>). Notez l'utilisation d'un index basé sur une formule."
 
 #. Tag: programlisting
-#: collection_mapping.xml:620
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -980,19 +989,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:626
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "Mappings de collection avancés"
 
 #. Tag: title
-#: collection_mapping.xml:629
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr "Collections triées"
 
 #. Tag: para
-#: collection_mapping.xml:631
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -1004,7 +1013,7 @@
 "spécifier un comparateur dans le fichier de mapping :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:636
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -1022,7 +1031,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:638
+#: collection_mapping.xml:643
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -1034,7 +1043,7 @@
 "classe implémentant <literal>java.util.Comparator</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:644
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -1044,15 +1053,15 @@
 "TreeSet</literal> ou <literal>java.util.TreeMap</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:649
-#, no-c-format
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "Si vous voulez que la base de données elle-même ordonne les éléments de la "
 "collection, utilisez l'attribut <literal>order-by</literal> des mappings "
@@ -1063,7 +1072,7 @@
 "pas en mémoire."
 
 #. Tag: programlisting
-#: collection_mapping.xml:658
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1079,28 +1088,34 @@
 "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:660
-#, no-c-format
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "Notez que la valeur de l'attribut <literal>order-by</literal> est un ordre "
 "SQL, pas un ordre HQL !"
 
 #. Tag: para
-#: collection_mapping.xml:665
-#, no-c-format
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "Les associations peuvent même être triées sur des critères arbitraires à "
 "l'exécution en utilisant un <literal>filter()</literal> de collection."
 
 #. Tag: programlisting
-#: collection_mapping.xml:670
+#: collection_mapping.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1108,13 +1123,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:675
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "Associations bidirectionnelles"
 
 #. Tag: para
-#: collection_mapping.xml:677
+#: collection_mapping.xml:685
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1126,37 +1141,36 @@
 "bidirectionnelles sont supportées : <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:684
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr "un-vers-plusieurs (NdT : one-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:686
-#, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "ensemble ou sac à une extrémité, une seule valeur à l'autre"
 
 #. Tag: term
-#: collection_mapping.xml:692
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr "plusieurs-vers-plusieurs (NdT : many-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:694
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "ensemble ou sac aux deux extrémités"
 
 #. Tag: para
-#: collection_mapping.xml:703
-#, no-c-format
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "Vous pouvez spécifier une association plusieurs-vers-plusieurs "
 "bidirectionnelle simplement en mappant deux associations plusieurs-vers-"
@@ -1165,18 +1179,19 @@
 "ne peut pas être une collection indexée)."
 
 #. Tag: para
-#: collection_mapping.xml:710
-#, no-c-format
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "Voici un exemple d'association bidirectionnelle plusieurs-vers-plusieurs ; "
 "chaque catégorie peut avoir plusieurs objets et chaque objet peut être dans "
 "plusieurs catégories :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:715
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1201,14 +1216,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:717
-#, no-c-format
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "Les changements faits uniquement sur l'extréminté inverse de l'association "
 "<emphasis>ne sont pas</emphasis> persistés. Ceci signifie qu'Hibernate a "
@@ -1218,7 +1233,7 @@
 "plusieurs-vers-plusieurs en Java :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:725
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1233,7 +1248,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:727
+#: collection_mapping.xml:735
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1243,10 +1258,10 @@
 "mémoire dans la base de données."
 
 #. Tag: para
-#: collection_mapping.xml:731
-#, no-c-format
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1256,7 +1271,7 @@
 "valuée <literal>inverse=\"true\"</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:737
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1279,31 +1294,31 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:739
-#, no-c-format
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "Mapper une extrémité d'une association avec <literal>inverse=\"true\"</"
 "literal> n'affecte pas l'opération de cascades, ce sont des concepts "
 "orthogonaux !"
 
 #. Tag: title
-#: collection_mapping.xml:747
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "Associations bidirectionnelles avec des collections indexées"
 
 #. Tag: para
-#: collection_mapping.xml:748
-#, no-c-format
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "Une association bidirectionnelle où une extrémité est représentée comme une "
 "<literal>&lt;list&gt;</literal> ou une <literal>&lt;map&gt;</literal> "
@@ -1313,7 +1328,7 @@
 "la collection :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1340,14 +1355,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:757
-#, no-c-format
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "Mais, si il n'y a pas de telle prorpriété sur la classe enfant, nous ne "
 "pouvons pas penser à l'association comme vraiment bidirectionnelle (il y a "
@@ -1357,7 +1372,7 @@
 "pourrions utiliser le mapping suivant :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:764
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1385,36 +1400,35 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:766
-#, no-c-format
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "Notez que dans ce mapping, l'extrémité de l'association contenant la "
 "collection est responsable des mises à jour de la clef étrangère. À faire : "
 "cela entraîne-t-il réellement des expressions updates inutiles ?"
 
 #. Tag: title
-#: collection_mapping.xml:774
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr "Associations ternaires"
 
 #. Tag: para
-#: collection_mapping.xml:776
-#, no-c-format
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "Il y a trois approches possibles pour mapper une association ternaire. L'une "
 "est d'utiliser une <literal>Map</literal> avec une association en tant "
 "qu'index :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:781
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1425,7 +1439,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:783
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1436,44 +1450,43 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:785
-#, no-c-format
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "Une seconde approche est simplement de remodeler l'association comme une "
 "classe d'entité. C'est l'approche la plus commune."
 
 #. Tag: para
-#: collection_mapping.xml:790
-#, no-c-format
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr ""
 "Une alternative finale est d'utiliser des éléments composites, dont nous "
 "discuterons plus tard."
 
 #. Tag: literal
-#: collection_mapping.xml:797
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "Utiliser un <literal>&lt;idbag&gt;</literal>"
 
 #. Tag: para
-#: collection_mapping.xml:799
-#, no-c-format
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "Si vous embrassez pleinement notre vue que les clefs composées sont une "
 "mauvaise chose et que des entités devraient avoir des identifiants "
@@ -1488,18 +1501,18 @@
 "valeurs vers une table avec une clef subrogée."
 
 #. Tag: para
-#: collection_mapping.xml:810
-#, no-c-format
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "L'élément <literal>&lt;idbag&gt;</literal> vous laisse mapper une "
 "<literal>List</literal> (ou une <literal>Collection</literal>) avec une "
 "sémantique de sac."
 
 #. Tag: programlisting
-#: collection_mapping.xml:815
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1512,13 +1525,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:817
-#, no-c-format
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "Comme vous pouvez voir, un <literal>&lt;idbag&gt;</literal> a un généréteur "
 "d'id artificiel, comme une classe d'entité ! Une clef subrogée différente "
@@ -1527,13 +1540,13 @@
 "ligne particulière."
 
 #. Tag: para
-#: collection_mapping.xml:824
-#, no-c-format
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "Notez que les performances de la mise à jour d'un <literal>&lt;idbag&gt;</"
 "literal> sont <emphasis>bien</emphasis> meilleures qu'un <literal>&lt;bag&gt;"
@@ -1542,7 +1555,7 @@
 "liste, une map ou un ensemble."
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:837
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1554,23 +1567,26 @@
 "identifiants de collection <literal>&lt;idbag&gt;</literal>."
 
 #. Tag: title
-#: collection_mapping.xml:855
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr "Exemples de collections"
 
 #. Tag: para
-#: collection_mapping.xml:857
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "Exemples de collections"
+
+#. Tag: para
+#: collection_mapping.xml:867
 #, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
+"The following class has a collection of <literal>Child</literal> instances:"
 msgstr ""
-"Les sections précédentes sont assez confuses. Donc prenons un exemple. Cette "
-"classe :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:862
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1592,18 +1608,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:864
-#, no-c-format
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "a une collection d'instances de <literal>Child</literal>. Si chaque enfant a "
 "au plus un parent, le mapping le plus naturel est une association un-vers-"
 "plusieurs :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:870
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1629,13 +1645,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:872
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "Ceci mappe les définitions de tables suivantes :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:876
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1645,7 +1661,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:878
+#: collection_mapping.xml:887
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1655,7 +1671,7 @@
 "vers-plusieurs unidirectionnelle :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:883
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1683,13 +1699,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:885
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "Notez la contrainte <literal>NOT NULL</literal> :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:889
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1701,19 +1717,19 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:891
-#, no-c-format
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "Alternativement, si vous insistez absolument pour que cette association soit "
 "unidirectionnelle, vous pouvez déclarer la contrainte <literal>NOT NULL</"
 "literal> sur le mapping <literal>&lt;key&gt;</literal> :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:897
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1739,17 +1755,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:899
-#, no-c-format
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr ""
 "D'un autre côté, si un enfant pouvait avoir plusieurs parent, une "
 "association plusieurs-vers-plusieurs est plus appropriée :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:904
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1775,13 +1791,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:906
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr "Définitions des tables :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:910
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1796,26 +1812,37 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:912
-#, no-c-format
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "Pour plus d'exemples et une revue complète du mapping de la relation parent/"
 "enfant, voir see <xref linkend=\"example-parentchild\"/>."
 
 #. Tag: para
-#: collection_mapping.xml:917
-#, no-c-format
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr ""
 "Des mappings d'association plus exotiques sont possibles, nous cataloguerons "
 "toutes les possibilités dans le prochain chapitre."
 
+#~ msgid "Collection Mapping"
+#~ msgstr "Mapping des collections"
+
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr "Quelques exemples, d'abord, un ensemble de chaînes de caractères :"
+
 #~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr ""
+#~ "Les sections précédentes sont assez confuses. Donc prenons un exemple. "
+#~ "Cette classe :"
+
+#~ msgid ""
 #~ "<literal>column_name</literal> (required): The name of the column holding "
 #~ "the collection index values."
 #~ msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: para
 #: component_mapping.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "La notion de <emphasis>composants</emphasis> est réutilisé dans différents "
 "contextes, avec différents objectifs, à travers Hibernate."
@@ -34,12 +34,12 @@
 
 #. Tag: para
 #: component_mapping.xml:39
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "Le composant est un objet inclu dans un autre qui est sauvegardé comme une "
 "valeur, et non pas comme une entité. Le composant fait référence à la notion "
@@ -109,12 +109,12 @@
 
 #. Tag: para
 #: component_mapping.xml:49
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "Maintenant <literal>Name</literal> peut-être sauvegardé comme un composant "
 "de <literal>Person</literal>. Remarquer que <literal>Name</literal> définit "
@@ -124,8 +124,8 @@
 
 #. Tag: para
 #: component_mapping.xml:56
-#, no-c-format
-msgid "Our Hibernate mapping would look like:"
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "Nous serions alors amené à mapper ce composant de cette façon:"
 
 #. Tag: programlisting
@@ -160,15 +160,15 @@
 
 #. Tag: para
 #: component_mapping.xml:70
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "Comme tous les types valeurs, les composants ne supportent pas les "
 "références partagés. En d'autres mots, deux instances de person peuvent "
@@ -181,13 +181,13 @@
 "programmatif devrait être satisfaisant dans la plupart des cas."
 
 #. Tag: para
-#: component_mapping.xml:79
-#, no-c-format
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "Les propriétés d'un composant peuvent être de tous les types qu'Hibernate "
 "supporte habituellement (collections, many-to-one associations, autres "
@@ -196,7 +196,7 @@
 "supporter un modèle objet très granulaire."
 
 #. Tag: para
-#: component_mapping.xml:86
+#: component_mapping.xml:85
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -207,7 +207,7 @@
 "propriétés une référence au <literal>&lt;parent&gt;</literal> conteneur."
 
 #. Tag: programlisting
-#: component_mapping.xml:92
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -226,19 +226,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:97
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "Collection d'objets dépendants"
 
 #. Tag: para
-#: component_mapping.xml:99
-#, no-c-format
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "Les collections d'objets dépendants sont supportés (exemple: un tableau de "
 "type <literal>Name</literal>). Déclarer la collection de composants en "
@@ -246,7 +246,7 @@
 "composite-element&gt;</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:106
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -261,28 +261,27 @@
 
 #. Tag: para
 #: component_mapping.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "Remarque: Si vous définissez un <literal>Set</literal> d'élément composite, "
 "il est très important d'implémenter la méthode <literal>equals()</literal> "
 "et <literal>hashCode()</literal> correctement."
 
 #. Tag: para
-#: component_mapping.xml:114
-#, no-c-format
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "Les élements composite peuvent aussi contenir des composants mais pas des "
 "collections. Si votre élément composite contient aussi des composants, "
@@ -295,17 +294,16 @@
 "différentes)"
 
 #. Tag: para
-#: component_mapping.xml:126
-#, no-c-format
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "Remarque, le mapping d'éléments composites ne supporte pas la nullité des "
 "propriétés lorsqu'on utilise un <literal>&lt;set&gt;</literal>. Hibernate "
@@ -318,14 +316,14 @@
 "literal> ou <literal>&lt;idbag&gt;</literal>."
 
 #. Tag: para
-#: component_mapping.xml:137
-#, no-c-format
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -339,7 +337,7 @@
 "de l'association."
 
 #. Tag: programlisting
-#: component_mapping.xml:147
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -358,14 +356,14 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:149
-#, no-c-format
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "Bien sûr, il ne peut pas y avoir de référence à l'achat (purchase) depuis "
 "l'article (item), pour pouvoir naviguer de façon bidirectionnelle dans "
@@ -373,13 +371,13 @@
 "n'autorise pas les références partagées."
 
 #. Tag: para
-#: component_mapping.xml:157
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "Même les associations ternaires ou quaternaires sont possibles:"
 
 #. Tag: programlisting
-#: component_mapping.xml:159
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -395,27 +393,27 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:161
-#, no-c-format
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr ""
 "Les éléments composites peuvent apparaître dans les requêtes en utilisant la "
 "même syntaxe que associations"
 
 #. Tag: title
-#: component_mapping.xml:169
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "Utiliser les composants comme index de map"
 
 #. Tag: para
-#: component_mapping.xml:171
-#, no-c-format
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -425,53 +423,59 @@
 "<literal>equals()</literal> dans la classe du composant."
 
 #. Tag: title
-#: component_mapping.xml:180
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr "Utiliser un composant comme identifiant"
 
 #. Tag: para
-#: component_mapping.xml:182
-#, no-c-format
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "Vous pouvez utiliser un composant comme identifiant d'une entité. Mais pour "
 "cela la classe du composant doit respecter certaines règles."
 
 #. Tag: para
-#: component_mapping.xml:189
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "Elle doit implémenter <literal>java.io.Serializable</literal>."
 
 #. Tag: para
-#: component_mapping.xml:194
-#, no-c-format
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "Elle doit redéfinir <literal>equals()</literal> et <literal>hashCode()</"
 "literal>, de façon cohérente avec le fait qu'elle définit une clé composite "
 "dans la base de données."
 
-#. Tag: emphasis
-#: component_mapping.xml:203
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "Remarque: avec hibernate3, la seconde règle n'est plus absolument necessaire "
 "mais faîtes le quand même."
 
 #. Tag: para
-#: component_mapping.xml:207
-#, no-c-format
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "Vous ne pouvez pas utiliser de <literal>IdentifierGenerator</literal> pour "
@@ -479,11 +483,11 @@
 "identifiants."
 
 #. Tag: para
-#: component_mapping.xml:212
-#, no-c-format
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -495,36 +499,36 @@
 "<literal>Order</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:220
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:222
-#, no-c-format
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "Maintenant toutes clés étrangères référençant la table <literal>OrderLine</"
 "literal> devra aussi être composite. Vous devez en tenir compte lorsque vous "
@@ -532,7 +536,7 @@
 "<literal>OrderLine</literal> devrait être mappé de la façon suivante :"
 
 #. Tag: programlisting
-#: component_mapping.xml:228
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -544,17 +548,17 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:230
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(Remarque: l'élément <literal>&lt;column&gt;</literal> est une alternative à "
-"l'attribut <literal>column</literal> que l'on utilise partout.)"
 
 #. Tag: para
-#: component_mapping.xml:235
+#: component_mapping.xml:244
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -564,7 +568,7 @@
 "<literal>OrderLine</literal> utilisera aussi une clé étrangère composite:"
 
 #. Tag: programlisting
-#: component_mapping.xml:240
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -578,7 +582,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:242
+#: component_mapping.xml:251
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -588,7 +592,7 @@
 "literal> utilisera:"
 
 #. Tag: programlisting
-#: component_mapping.xml:247
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -601,17 +605,15 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:249
-#, no-c-format
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 "(L'élément <literal>&lt;one-to-many&gt;</literal>, comme d'habitude, ne "
 "déclare pas de colonne.)"
 
 #. Tag: para
-#: component_mapping.xml:253
+#: component_mapping.xml:262
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -621,7 +623,7 @@
 "aura aussi une clé composite étrangère."
 
 #. Tag: programlisting
-#: component_mapping.xml:258
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -642,19 +644,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:263
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr "Composant Dynamique"
 
 #. Tag: para
-#: component_mapping.xml:265
-#, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr "Vous pouvez même mapper une propriété de type <literal>Map</literal>:"
 
 #. Tag: programlisting
-#: component_mapping.xml:269
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -665,16 +667,16 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:271
-#, no-c-format
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "La sémantique de l'association à un <literal>&lt;dynamic-component&gt;</"
 "literal> est identique à celle que l'on utilise pour les composants. "
@@ -685,3 +687,11 @@
 "Il ya même mieux, vous pouvez accéder (et changer) le metamodel de "
 "configuration d'hibernate en utilisant l'objet <literal>Configuration</"
 "literal>"
+
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(Remarque: l'élément <literal>&lt;column&gt;</literal> est une "
+#~ "alternative à l'attribut <literal>column</literal> que l'on utilise "
+#~ "partout.)"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,14 +18,14 @@
 
 #. Tag: para
 #: configuration.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "Parce qu'Hibernate est conçu pour fonctionner dans différents "
 "environnements, il existe beaucoup de paramètres de configuration. "
@@ -48,7 +48,7 @@
 "An instance of <classname>org.hibernate.cfg.Configuration</classname> "
 "represents an entire set of mappings of an application's Java types to an "
 "SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
-"used to build an (immutable) <interfacename>org.hibernate.SessionFactory</"
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
 "interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "Une instance de <literal>org.hibernate.cfg.Configuration</literal> "
@@ -61,10 +61,10 @@
 #: configuration.xml:49
 #, fuzzy, no-c-format
 msgid ""
-"You may obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
 "instance by instantiating it directly and specifying XML mapping documents. "
 "If the mapping files are in the classpath, use <literal>addResource()</"
-"literal>:"
+"literal>. For example:"
 msgstr ""
 "Vous pouvez obtenir une instance de <literal>Configuration</literal> en "
 "l'instanciant directement et en spécifiant la liste des documents XML de "
@@ -82,10 +82,10 @@
 
 #. Tag: para
 #: configuration.xml:57
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "Une alternative (parfois meilleure) est de spécifier les classes mappées et "
 "de laisser Hibernate trouver les documents de mapping pour vous :"
@@ -103,7 +103,7 @@
 #: configuration.xml:64
 #, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <filename>/org/hibernate/"
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
 "auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
 "xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
@@ -118,7 +118,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
-"specify configuration properties:"
+"specify configuration properties. For example:"
 msgstr ""
 "Une <literal>Configuration</literal> vous permet également de préciser des "
 "propriétés de configuration :"
@@ -139,10 +139,10 @@
 
 #. Tag: para
 #: configuration.xml:77
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr ""
 "Ce n'est pas le seul moyen de passer des propriétés de configuration à "
 "Hibernate. Les différentes options sont :"
@@ -179,10 +179,10 @@
 
 #. Tag: para
 #: configuration.xml:100
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "Inclure des éléments <literal>&lt;property&gt;</literal> dans le fichier "
 "<literal>hibernate.cfg.xml</literal> (voir plus loin)."
@@ -191,8 +191,8 @@
 #: configuration.xml:107
 #, fuzzy, no-c-format
 msgid ""
-"<filename>hibernate.properties</filename> is the easiest approach if you "
-"want to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
 "L'utilisation d'<literal>hibernate.properties</literal> est l'approche la "
 "plus simple si vous voulez démarrer rapidement"
@@ -202,7 +202,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
-"startup-time object, to be discarded once a <literal>SessionFactory</"
+"startup-time object that will be discarded once a <literal>SessionFactory</"
 "literal> is created."
 msgstr ""
 "La <literal>Configuration</literal> est un objet de démarrage qui sera "
@@ -256,7 +256,7 @@
 #: configuration.xml:140
 #, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <interfacename>org.hibernate.SessionFactory</"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
 "interfacename> create and pool JDBC connections for you. If you take this "
 "approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
 "as simple as:"
@@ -274,9 +274,9 @@
 
 #. Tag: para
 #: configuration.xml:148
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "Dès que vous ferez quelquechose qui requiert un accès à la base de données, "
@@ -286,10 +286,11 @@
 #: configuration.xml:153
 #, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <classname>org.hibernate.cfg.Environment</classname>. We will now "
-"describe the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "Pour faire cela, il faut passer les propriétés de la connexion JDBC à "
 "Hibernate. Tous les noms des propriétés Hibernate et leur signification sont "
@@ -301,7 +302,7 @@
 #: configuration.xml:159
 #, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <classname>java.sql."
+"Hibernate will obtain and pool connections using <classname>java.sql."
 "DriverManager</classname> if you set the following properties:"
 msgstr ""
 "Hibernate obtiendra des connexions (et les mettra dans un pool) en utilisant "
@@ -422,13 +423,13 @@
 #: configuration.xml:220
 #, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
 "replace the <property>hibernate.connection.pool_size</property> property "
 "with connection pool specific settings. This will turn off Hibernate's "
-"internal pool. For example, you might like to use C3P0."
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "L'algorithme natif de pool de connexions d'Hibernate est plutôt "
 "rudimentaire. Il a été fait dans le but de vous aider à démarrer et "
@@ -448,7 +449,7 @@
 "in the <filename>lib</filename> directory. Hibernate will use its "
 "<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
 "connection pooling if you set <property>hibernate.c3p0.*</property> "
-"properties. If you'd like to use Proxool refer to the packaged "
+"properties. If you would like to use Proxool, refer to the packaged "
 "<filename>hibernate.properties</filename> and the Hibernate web site for "
 "more information."
 msgstr ""
@@ -464,7 +465,8 @@
 #: configuration.xml:238
 #, fuzzy, no-c-format
 msgid ""
-"Here is an example <filename>hibernate.properties</filename> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr ""
 "Voici un exemple de fichier <literal>hibernate.properties</literal> pour "
 "C3P0:"
@@ -490,8 +492,8 @@
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. "
-"You'll need to set at least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "Dans le cadre de l'utilisation au sein d'un serveur d'applications, vous "
 "devriez quasiment toujours configurer Hibernate pour qu'il obtienne ses "
@@ -559,7 +561,7 @@
 #: configuration.xml:306
 #, fuzzy, no-c-format
 msgid ""
-"Here's an example <filename>hibernate.properties</filename> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "Voici un exemple de fichier <literal>hibernate.properties</literal> pour "
@@ -592,9 +594,9 @@
 #: configuration.xml:318
 #, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
+"Arbitrary connection properties can be given by prepending "
 "\"<literal>hibernate.connection</literal>\" to the connection property name. "
-"For example, you may specify a <property>charSet</property> connection "
+"For example, you can specify a <property>charSet</property> connection "
 "property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "Des propriétés supplémentaires de connexion peuvent être passées en "
@@ -606,7 +608,7 @@
 #: configuration.xml:324
 #, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
+"You can define your own plugin strategy for obtaining JDBC connections by "
 "implementing the interface <interfacename>org.hibernate.connection."
 "ConnectionProvider</interfacename>, and specifying your custom "
 "implementation via the <property>hibernate.connection.provider_class</"
@@ -626,9 +628,9 @@
 
 #. Tag: para
 #: configuration.xml:335
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "Il y a un certain nombre d'autres propriétés qui contrôlent le "
@@ -636,14 +638,14 @@
 "comme valeurs par défaut des valeurs \"raisonnables\" pour un fonctionnement "
 "nominal."
 
-#. Tag: para
-#: configuration.xml:340
+#. Tag: warning
+#: configuration.xml:341
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <filename>hibernate.properties</filename>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>Attention : Certaines de ces propriétés sont uniquement de niveau "
 "System.</emphasis> Les propriétés de niveau System ne peuvent être "
@@ -680,8 +682,8 @@
 #: configuration.xml:365
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -727,9 +729,9 @@
 #: configuration.xml:369
 #, no-c-format
 msgid ""
-"In most cases Hibernate will actually be able to chose the correct "
-"<classname>org.hibernate.dialect.Dialect</classname> implementation to use "
-"based on the <literal>JDBC metadata</literal> returned by the JDBC driver."
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
 msgstr ""
 
 #. Tag: property
@@ -758,7 +760,7 @@
 #: configuration.xml:1011
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -833,7 +835,8 @@
 #. Tag: para
 #: configuration.xml:409
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -885,7 +888,7 @@
 #: configuration.xml:419
 #, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 "Qualifie les noms de tables non qualifiées avec ce catalogue dans le SQL "
 "généré. <placeholder-1/>"
@@ -894,7 +897,7 @@
 #: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -956,7 +959,7 @@
 #: configuration.xml:435 configuration.xml:877
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1009,7 +1012,7 @@
 #: configuration.xml:445
 #, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -1020,9 +1023,9 @@
 
 #. Tag: para
 #: configuration.xml:449
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ex.</emphasis> valeurs recommandées entre "
@@ -1037,16 +1040,16 @@
 #. Tag: entry
 #: configuration.xml:460
 #, fuzzy, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr ""
 "Définit une taille par défaut pour le chargement par lot des associations "
 "<placeholder-1/>"
 
 #. Tag: para
 #: configuration.xml:462
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ex.</emphasis> Valeurs recommandées : <literal>4</"
@@ -1062,7 +1065,7 @@
 #: configuration.xml:473
 #, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "Définit un mode de représentation par défaut des entités pour toutes les "
@@ -1088,7 +1091,7 @@
 #: configuration.xml:486
 #, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
@@ -1183,9 +1186,9 @@
 
 #. Tag: para
 #: configuration.xml:568
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ex.</emphasis> les valeurs recommandées entre "
@@ -1202,8 +1205,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "Paramétrez cette propriété à <placeholder-1/> si votre pilote JDBC retourne "
@@ -1232,7 +1235,7 @@
 #: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1286,7 +1289,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "Active l'utilisation par Hibernate des resultsets scrollables de JDBC2. "
@@ -1322,10 +1325,10 @@
 #: configuration.xml:633
 #, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "Active l'utilisation de <placeholder-1/> de JDBC3 pour récupérer nativement "
@@ -1338,7 +1341,7 @@
 #: configuration.xml:639 configuration.xml:769 configuration.xml:781
 #: configuration.xml:795 configuration.xml:833
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -1401,7 +1404,7 @@
 #: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1454,8 +1457,8 @@
 #: configuration.xml:662
 #, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <interfacename>java.sql."
-"Connection</interfacename> for meaningful values but note that most "
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
 "databases do not support all isolation levels and some define additional, "
 "non-standard isolations."
 msgstr ""
@@ -1467,7 +1470,7 @@
 #. Tag: para
 #: configuration.xml:666
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -1518,7 +1521,7 @@
 #. Tag: entry
 #: configuration.xml:676
 #, fuzzy, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "Active le mode de commit automatique (autocommit) pour les connexions JDBC "
 "du pool (non recommandé). <placeholder-1/>"
@@ -1533,16 +1536,15 @@
 #: configuration.xml:688
 #, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "Spécifie à quel moment Hibernate doit relacher les connexion JDBC. Par "
 "défaut une connexion JDBC est conservée jusqu'à ce que la session soit "
@@ -1558,8 +1560,8 @@
 #: configuration.xml:699
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">ex.</emphasis><literal>on_close</literal> "
@@ -1570,8 +1572,8 @@
 #: configuration.xml:704
 #, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -1638,7 +1640,7 @@
 #: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1691,7 +1693,7 @@
 #: configuration.xml:764
 #, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1710,7 +1712,7 @@
 #: configuration.xml:779
 #, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 "Activer le cache de requête, les requêtes individuelles doivent tout de même "
 "être déclarées comme pouvant être mise en cache. <placeholder-1/>"
@@ -1725,7 +1727,7 @@
 #: configuration.xml:791
 #, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1753,7 +1755,7 @@
 #: configuration.xml:808
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1813,7 +1815,7 @@
 #. Tag: para
 #: configuration.xml:820
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">ex.</emphasis><literal>true</literal> | "
@@ -1899,7 +1901,7 @@
 #: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1968,9 +1970,9 @@
 #: configuration.xml:887
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "Le nom de la classe du <placeholder-1/> - requis lorsque le cache de niveau "
 "JVM est activé ou lorsque l'on utilise un générateur hilo dans un "
@@ -1980,7 +1982,7 @@
 #: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2054,7 +2056,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -2078,7 +2080,7 @@
 #: configuration.xml:947
 #, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -2090,7 +2092,7 @@
 #: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -2113,7 +2115,7 @@
 #: configuration.xml:965
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -2131,8 +2133,8 @@
 #: configuration.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "Lien entre les tokens de requêtes Hibernate et les tokens SQL (les tokens "
 "peuvent être des fonctions ou des noms littéraux par exemple). <placeholder-"
@@ -2142,7 +2144,7 @@
 #: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2195,7 +2197,7 @@
 #: configuration.xml:989
 #, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -2209,7 +2211,7 @@
 #: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
@@ -2227,10 +2229,10 @@
 #: configuration.xml:1006
 #, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "Active l'utilisation de CGLIB à la place de la réflexion à l'exécution "
 "(Propriété de niveau système). La réflexion peut parfois être utile pour "
@@ -2246,13 +2248,13 @@
 
 #. Tag: para
 #: configuration.xml:1024
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "Vous devriez toujours positionner la propriété <literal>hibernate.dialect</"
 "literal> à la sous-classe de <literal>org.hibernate.dialect.Dialect</"
@@ -2380,189 +2382,201 @@
 
 #. Tag: entry
 #: configuration.xml:1070
-#, no-c-format
-msgid "Oracle 9i/10g"
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
 #: configuration.xml:1070
-#, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
 #: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1079
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1082
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1085
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1088
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1091
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1094
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1094
+#: configuration.xml:1097
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1094
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1097
+#: configuration.xml:1100
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1097
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1100
+#: configuration.xml:1103
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1100
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1103
+#: configuration.xml:1106
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1103
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1106
+#: configuration.xml:1109
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1106
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1109
+#: configuration.xml:1112
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1109
+#: configuration.xml:1112
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1118
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "Chargement par Jointure Ouverte"
 
 #. Tag: para
-#: configuration.xml:1120
-#, no-c-format
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "Si votre base de données supporte les outer joins de type ANSI, Oracle ou "
 "Sybase, <emphasis>le chargement par jointure ouverte</emphasis> devrait "
@@ -2573,13 +2587,13 @@
 "un d'être chargé en un seul <literal>SELECT</literal> SQL."
 
 #. Tag: para
-#: configuration.xml:1129
-#, no-c-format
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "Le chargement par jointure ouverte peut être désactiver "
@@ -2590,7 +2604,7 @@
 "<literal>fetch=\"join\"</literal>."
 
 #. Tag: para
-#: configuration.xml:1137
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr ""
@@ -2598,17 +2612,17 @@
 "d'information."
 
 #. Tag: title
-#: configuration.xml:1144
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr "Flux binaires"
 
 #. Tag: para
-#: configuration.xml:1146
-#, no-c-format
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -2621,18 +2635,18 @@
 "niveau système uniquement.</emphasis>"
 
 #. Tag: title
-#: configuration.xml:1157
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "Cache de second niveau et cache de requêtes"
 
 #. Tag: para
-#: configuration.xml:1159
-#, no-c-format
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "Les propriétés préfixées par <literal>hibernate.cache</literal> vous "
 "permettent d'utiliser un système de cache de second niveau. Ce cache peut "
@@ -2641,16 +2655,16 @@
 "pour plus de détails."
 
 #. Tag: title
-#: configuration.xml:1169
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "Substitution dans le langage de requêtage"
 
 #. Tag: para
-#: configuration.xml:1171
-#, no-c-format
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "Vous pouvez définir de nouveaux tokens dans les requêtes Hibernate en "
@@ -2658,48 +2672,49 @@
 "exemple :"
 
 #. Tag: programlisting
-#: configuration.xml:1176
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions vrai=1, faux=0"
 
 #. Tag: para
-#: configuration.xml:1178
-#, no-c-format
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "remplacerait les tokens <literal>vrai</literal> et <literal>faux</literal> "
 "par des entiers dans le SQL généré."
 
 #. Tag: programlisting
-#: configuration.xml:1183
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1185
-#, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
 "permettrait de renommer la fonction SQL <literal>LOWER</literal> en "
 "<literal>toLowercase</literal>"
 
 #. Tag: title
-#: configuration.xml:1192
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Statistiques Hibernate"
 
 #. Tag: para
-#: configuration.xml:1194
-#, no-c-format
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -2711,34 +2726,34 @@
 "<literal>org.hibernate.stats</literal> pour plus d'informations."
 
 #. Tag: title
-#: configuration.xml:1206
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr "Tracer"
 
 #. Tag: para
-#: configuration.xml:1208
+#: configuration.xml:1211
 #, no-c-format
 msgid ""
 "Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
 "Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
 "can direct your logging output to several logging frameworks (NOP, Simple, "
 "log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
-"binding. In order to setup logging properly you will need <filename>slf4j-"
-"api.jar</filename> in your classpath together with the jar file for your "
-"preferred binding - <filename>slf4j-log4j12.jar</filename> in the case of "
-"Log4J. See the SLF4J <ulink url=\"http://www.slf4j.org/manual.html"
-"\">documentation</ulink> for more detail. To use Log4j you will also need to "
-"place a <filename>log4j.properties</filename> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1219
-#, no-c-format
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -2751,31 +2766,31 @@
 "suivantes :"
 
 #. Tag: title
-#: configuration.xml:1228
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Catégories de trace d'Hibernate"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr "Catégorie"
 
 #. Tag: entry
-#: configuration.xml:1235
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr "Fonction"
 
 #. Tag: literal
-#: configuration.xml:1240
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1241
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr ""
@@ -2783,25 +2798,25 @@
 "exécutées"
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "Trace tous les paramètres JDBC"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr ""
@@ -2809,13 +2824,13 @@
 "base) qui sont exécutées"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1256
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2825,49 +2840,49 @@
 "avec la session hibernate au moment du flush"
 
 #. Tag: literal
-#: configuration.xml:1259
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1260
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "Trace toute l'activité du cache de second niveau"
 
 #. Tag: literal
-#: configuration.xml:1263
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1264
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "Trace toute l'activité relative aux transactions"
 
 #. Tag: literal
-#: configuration.xml:1267
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1268
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "Trace toute acquisition de ressource JDBC"
 
 #. Tag: literal
-#: configuration.xml:1271
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast.AST"
 
 #. Tag: entry
-#: configuration.xml:1272
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
@@ -2875,34 +2890,35 @@
 "des requêtes"
 
 #. Tag: literal
-#: configuration.xml:1277
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1278
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "Trace toutes les demandes d'autorisation JAAS"
 
 #. Tag: literal
-#: configuration.xml:1281
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1282
-#, no-c-format
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr ""
 "Trace tout (beaucoupe d'informations, mais très utile pour résoudre les "
 "problèmes)."
 
 #. Tag: para
-#: configuration.xml:1291
+#: configuration.xml:1294
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2916,13 +2932,13 @@
 "propriété <literal>hibernate.show_sql</literal> activée."
 
 #. Tag: title
-#: configuration.xml:1301
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "Implémenter une <literal>NamingStrategy</literal>"
 
 #. Tag: para
-#: configuration.xml:1303
+#: configuration.xml:1306
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2933,10 +2949,10 @@
 "de données."
 
 #. Tag: para
-#: configuration.xml:1308
-#, no-c-format
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -2952,10 +2968,10 @@
 "utilisée par Hibernate est minimale."
 
 #. Tag: para
-#: configuration.xml:1317
-#, no-c-format
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "Vous pouvez définir une stratégie différente en appelant "
@@ -2963,7 +2979,7 @@
 "mappings :"
 
 #. Tag: programlisting
-#: configuration.xml:1322
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2974,7 +2990,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1324
+#: configuration.xml:1327
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2985,13 +3001,13 @@
 "applications."
 
 #. Tag: title
-#: configuration.xml:1332
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr "Fichier de configuration XML"
 
 #. Tag: para
-#: configuration.xml:1334
+#: configuration.xml:1337
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -3006,17 +3022,17 @@
 "présents."
 
 #. Tag: para
-#: configuration.xml:1341
-#, no-c-format
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "Le fichier de configuration XML doit par défaut se placer à la racine du "
 "<literal>CLASSPATH</literal>. En voici un exemple :"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -3060,15 +3076,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
-#, no-c-format
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "Commme vous pouvez le voir, l'avantage de cette approche est "
 "l'externalisation des noms des fichiers de mapping de la configuration. Le "
@@ -3080,15 +3096,15 @@
 "dessus."
 
 #. Tag: para
-#: configuration.xml:1357
-#, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr ""
 "Avec la configuration XML, démarrer Hibernate devient donc aussi simple que "
 "ceci :"
 
 #. Tag: programlisting
-#: configuration.xml:1361
+#: configuration.xml:1364
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -3096,13 +3112,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1363
-#, no-c-format
-msgid "You can pick a different XML configuration file using"
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "You can pick a different XML configuration file using"
 
 #. Tag: programlisting
-#: configuration.xml:1367
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -3111,29 +3127,29 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1372
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "Intégration à un serveur d'application J2EE"
 
 #. Tag: para
-#: configuration.xml:1374
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr ""
 "Hibernate possède les points suivants d'intégration à l'infrastructure J2EE :"
 
 #. Tag: para
-#: configuration.xml:1380
-#, no-c-format
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>Source de données gérée par le conteneur</emphasis> : Hibernate "
@@ -3148,7 +3164,7 @@
 "de votre code entre plusieurs serveurs d'application."
 
 #. Tag: para
-#: configuration.xml:1395
+#: configuration.xml:1398
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -3158,15 +3174,15 @@
 "sa <literal>SessionFactory</literal> à JNDI après le démarrage."
 
 #. Tag: para
-#: configuration.xml:1404
-#, no-c-format
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>Association de la Session à JTA:</emphasis> La <literal>Session</"
@@ -3179,16 +3195,16 @@
 "descripteurs de déploiement."
 
 #. Tag: para
-#: configuration.xml:1417
-#, no-c-format
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>Déploiement JMX :</emphasis>Si vous avez un serveur d'application "
 "compatible JMX (JBoss AS par exemple), vous pouvez choisir de déployer "
@@ -3200,7 +3216,7 @@
 "disponible avant qu'Hibernate ne démarre, etc)."
 
 #. Tag: para
-#: configuration.xml:1428
+#: configuration.xml:1431
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -3213,18 +3229,18 @@
 "containment\"."
 
 #. Tag: title
-#: configuration.xml:1435
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "Configuration de la stratégie transactionnelle"
 
 #. Tag: para
-#: configuration.xml:1437
-#, no-c-format
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -3239,7 +3255,7 @@
 "literal> lorsque cela est nécessaire."
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1448
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -3258,74 +3274,74 @@
 "literal>."
 
 #. Tag: para
-#: configuration.xml:1452
-#, no-c-format
-msgid "There are three standard (built-in) choices:"
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "Il existe trois choix standards (fournis) :"
 
 #. Tag: literal
-#: configuration.xml:1458
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "net.sf.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1460
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr ""
 "délègue aux transactions de la base de données (JDBC). Valeur par défaut."
 
 #. Tag: literal
-#: configuration.xml:1464
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1466
-#, no-c-format
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "délègue à CMT si une transaction existante est sous ce contexte (ex: méthode "
 "d'un EJB session), sinon une nouvelle transaction est entamée et une "
 "transaction gérée par le bean est utilisée."
 
 #. Tag: literal
-#: configuration.xml:1474
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1476
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "délègue à aux transactions JTA gérées par le conteneur"
 
 #. Tag: para
-#: configuration.xml:1481
-#, no-c-format
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr ""
 "Vous pouvez également définir votre propre stratégie transactionnelle (pour "
 "un service de transaction CORBA par exemple)."
 
 #. Tag: para
-#: configuration.xml:1486
-#, no-c-format
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Certaines fonctionnalités d'Hibernate (i.e. le cache de second niveau, "
 "l'association automatique des Session à JTA, etc.) nécessitent l'accès au "
@@ -3335,157 +3351,157 @@
 "J2EE ne fournit pas un seul mécanisme standard."
 
 #. Tag: title
-#: configuration.xml:1494
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "TransactionManagers JTA"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "Fabrique de Transaction"
 
 #. Tag: entry
-#: configuration.xml:1501
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr "Serveur d'application"
 
 #. Tag: literal
-#: configuration.xml:1506
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1507
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1510
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1511
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1514
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1515
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1518
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1519
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1522
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1523
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1526
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1527
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1530
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1531
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1534
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1535
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1538
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1539
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1542
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1543
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1552
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "<literal>SessionFactory</literal> associée au JNDI"
 
 #. Tag: para
-#: configuration.xml:1554
-#, no-c-format
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "Une <literal>SessionFactory</literal> Hibernate associée au JNDI peut "
 "simplifier l'accès à la fabrique et donc la création de nouvelles "
@@ -3494,15 +3510,15 @@
 "même registre."
 
 #. Tag: para
-#: configuration.xml:1561
-#, no-c-format
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "Si vous désirez associer la <literal>SessionFactory</literal> à un nom JNDI, "
 "spécifiez un nom (ex. <literal>java:hibernate/SessionFactory</literal>) en "
@@ -3513,7 +3529,7 @@
 "Tomcat)."
 
 #. Tag: para
-#: configuration.xml:1569
+#: configuration.xml:1572
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -3528,14 +3544,15 @@
 "literal> par défaut sera utilisé."
 
 #. Tag: para
-#: configuration.xml:1576
-#, no-c-format
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "Hibernate va automatiquement placer la <literal>SessionFactory</literal> "
 "dans JNDI après avoir appelé <literal>cfg.buildSessionFactory()</literal>. "
@@ -3545,22 +3562,23 @@
 "plus tard dans ce document."
 
 #. Tag: para
-#: configuration.xml:1583
-#, no-c-format
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "Si vous utilisez <literal>SessionFactory</literal> JNDI, un EJB ou n'importe "
 "quelle autre classe peut obtenir la <literal>SessionFactory</literal> en "
 "utilisant un lookup JNDI."
 
 #. Tag: para
-#: configuration.xml:1588
-#, no-c-format
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -3577,33 +3595,34 @@
 "voir chapitre 1."
 
 #. Tag: title
-#: configuration.xml:1600
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "Association automatique de la Session à JTA"
 
 #. Tag: para
-#: configuration.xml:1602
-#, no-c-format
+#: configuration.xml:1605
+#, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <link linkend=\"architecture-current-session\">current "
-"sessions</link>. Using the <literal>\"jta\"</literal> session context, if "
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
 "there is no Hibernate <literal>Session</literal> associated with the current "
 "JTA transaction, one will be started and associated with that JTA "
 "transaction the first time you call <literal>sessionFactory.getCurrentSession"
 "()</literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "Le moyen le plus simple de gérer les <literal>Session</literal>s et "
 "transactions est la gestion automatique de session \"courante\" offerte par "
@@ -3627,20 +3646,20 @@
 "avec CMT est recommandée."
 
 #. Tag: title
-#: configuration.xml:1625
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr "Déploiement JMX"
 
 #. Tag: para
-#: configuration.xml:1627
-#, no-c-format
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "La ligne <literal>cfg.buildSessionFactory()</literal> doit toujours être "
 "exécutée quelque part pour avoir une <literal>SessionFactory</literal> dans "
@@ -3650,12 +3669,12 @@
 "managé</emphasis>."
 
 #. Tag: para
-#: configuration.xml:1635
-#, no-c-format
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "Hibernate est distribué avec <literal>org.hibernate.jmx.HibernateService</"
@@ -3665,7 +3684,7 @@
 "d'exemple pour JBoss 4.0.x:"
 
 #. Tag: programlisting
-#: configuration.xml:1642
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3716,15 +3735,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1644
-#, no-c-format
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,11 +18,11 @@
 
 #. Tag: para
 #: events.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "Il est souvent utile pour l'application de réagir à certains événements qui "
 "surviennent dans Hibernate. Cela autorise l'implémentation de certaines "
@@ -37,10 +37,10 @@
 
 #. Tag: para
 #: events.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -61,10 +61,10 @@
 
 #. Tag: para
 #: events.xml:51
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "Vous pouvez soit implémenter <literal>Interceptor</literal> directement ou "
 "(mieux) étendre <literal>EmptyInterceptor</literal>."
@@ -160,9 +160,9 @@
 
 #. Tag: para
 #: events.xml:58
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "Interceptors come in two flavors: <literal>Session</literal>-scoped and "
@@ -188,16 +188,16 @@
 
 #. Tag: para
 #: events.xml:71
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
@@ -223,11 +223,11 @@
 
 #. Tag: para
 #: events.xml:87
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "Si vous devez réagir à des événements particuliers dans votre couche de "
 "persistance, vous pouvez aussi utiliser l'architecture "
@@ -236,19 +236,19 @@
 
 #. Tag: para
 #: events.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -271,11 +271,10 @@
 
 #. Tag: para
 #: events.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "Les listeners devraient effectivement être considérés comme des singletons ; "
 "dans le sens où ils sont partagés entre des requêtes, et donc ne devraient "
@@ -283,15 +282,15 @@
 
 #. Tag: para
 #: events.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "Un listener personnalisé devrait implémenter l'interface appropriée pour "
@@ -348,8 +347,8 @@
 
 #. Tag: para
 #: events.xml:132
-#, no-c-format
-msgid "Instead, you may register it programmatically:"
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "Vous pouvez aussi l'inscrire par programmation :"
 
 #. Tag: programlisting
@@ -364,13 +363,13 @@
 
 #. Tag: para
 #: events.xml:138
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "Les listeners inscrits déclarativement ne peuvent pas partager d'instances. "
 "Si le même nom de classe est utilisée dans plusieurs éléments <literal>&lt;"
@@ -381,11 +380,11 @@
 
 #. Tag: para
 #: events.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -403,12 +402,12 @@
 
 #. Tag: para
 #: events.xml:157
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "Généralement, la sécurité déclarative dans les applications Hibernate est "
 "gérée dans la couche de session. Maintenant, Hibernate3 permet à certaines "
@@ -442,12 +441,12 @@
 
 #. Tag: para
 #: events.xml:170
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "Notez que <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> "
 "est juste un raccourci pour <literal>&lt;event type=\"...\"&gt;&lt;listener "
@@ -456,10 +455,10 @@
 
 #. Tag: para
 #: events.xml:176
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "Ensuite, toujours dans <literal>hibernate.cfg.xml</literal>, lier les "
 "permissions aux rôles :"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,26 +17,26 @@
 msgstr "Exemple : quelques mappings"
 
 #. Tag: para
-#: example_mappings.xml:31
-#, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr "Ce chapitre montre quelques mappings plus complexes."
 
 #. Tag: title
-#: example_mappings.xml:36
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employeur/Employé (Employer/Employee)"
 
 #. Tag: para
-#: example_mappings.xml:38
-#, no-c-format
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "Le modèle suivant de relation entre <literal>Employer</literal> et "
 "<literal>Employee</literal> utilise une vraie classe entité "
@@ -46,13 +46,13 @@
 "monétaires et les noms des employés."
 
 #. Tag: para
-#: example_mappings.xml:55
-#, no-c-format
-msgid "Heres a possible mapping document:"
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "Voici un document de mapping possible :"
 
 #. Tag: programlisting
-#: example_mappings.xml:59
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -108,15 +108,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:61
-#, no-c-format
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr ""
 "Et voici le schéma des tables générées par <literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:65
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -157,22 +156,22 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:70
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr "Auteur/Travail (Author/Work)"
 
 #. Tag: para
-#: example_mappings.xml:72
-#, no-c-format
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "Soit le modèle de la relation entre <literal>Work</literal>, "
 "<literal>Author</literal> et <literal>Person</literal>. Nous représentons la "
@@ -183,14 +182,14 @@
 "<literal>Author</literal> hérite de <literal>Person</literal>."
 
 #. Tag: para
-#: example_mappings.xml:90
+#: example_mappings.xml:91
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr "Le mapping suivant représente exactement ces relations :"
 
 #. Tag: programlisting
-#: example_mappings.xml:94
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -247,14 +246,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:96
-#, no-c-format
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "Il y a quatre tables dans ce mapping. <literal>works</literal>, "
 "<literal>authors</literal> et <literal>persons</literal> qui contiennent "
@@ -263,7 +262,7 @@
 "schéma de tables, généré par <literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:104
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -304,24 +303,24 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:109
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Client/Commande/Produit (Customer/Order/Product)"
 
 #. Tag: para
-#: example_mappings.xml:111
-#, no-c-format
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "Imaginons maintenant le modèle de relation entre <literal>Customer</"
 "literal>, <literal>Order</literal>, <literal>LineItem</literal> et "
@@ -335,13 +334,13 @@
 "composite."
 
 #. Tag: para
-#: example_mappings.xml:131
-#, no-c-format
-msgid "The mapping document:"
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "Le document de mapping :"
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -384,7 +383,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:137
+#: example_mappings.xml:138
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -398,7 +397,7 @@
 "literal> est aussi la table d'association liant orders à products."
 
 #. Tag: programlisting
-#: example_mappings.xml:144
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -438,37 +437,31 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:149
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "Divers mappings d'exemple"
 
 #. Tag: para
-#: example_mappings.xml:151
-#, no-c-format
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "Ces exemples sont tous pris de la suite de tests d'Hibernate. Vous en "
 "trouverez beaucoup d'autres. Regardez dans le dossier <literal>test</"
 "literal> de la distribution d'Hibernate."
 
-#. Tag: para
-#: example_mappings.xml:157
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr "TODO: put words around this stuff"
-
 #. Tag: title
-#: example_mappings.xml:160
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "\"Typed\" one-to-one association"
 
 #. Tag: programlisting
-#: example_mappings.xml:161
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -500,13 +493,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:165
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr "Exemple de clef composée"
 
 #. Tag: programlisting
-#: example_mappings.xml:166
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -625,13 +618,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:170
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr "Many-to-many avec une clef composée partagée"
 
 #. Tag: programlisting
-#: example_mappings.xml:171
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -672,13 +665,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:175
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "Contenu basé sur une discrimination"
 
 #. Tag: programlisting
-#: example_mappings.xml:176
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -734,13 +727,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:180
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Associations sur des clefs alternées"
 
 #. Tag: programlisting
-#: example_mappings.xml:181
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -793,3 +786,6 @@
 "    \n"
 "</class>]]>"
 msgstr ""
+
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "TODO: put words around this stuff"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,21 @@
 
 #. Tag: para
 #: example_parentchild.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "L'une des premières choses que les nouveaux utilisateurs essaient de faire "
 "avec Hibernate est de modéliser une relation père/fils. Il y a deux "
@@ -59,11 +58,11 @@
 
 #. Tag: para
 #: example_parentchild.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Les collections Hibernate sont considérées comme étant une partie logique de "
 "l'entité dans laquelle elles sont contenues ; jamais des entités qu'elle "
@@ -72,9 +71,9 @@
 
 #. Tag: para
 #: example_parentchild.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr ""
 "Quand nous ajoutons / retirons un objet d'une collection, le numéro de "
@@ -82,10 +81,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:60
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -98,14 +97,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "Si une entité est enlevée d'une collection (association un-vers-plusieurs ou "
 "plusieurs-vers-plusieurs), par défaut, elle ne sera pas effacée. Ce "
@@ -116,13 +114,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:78
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "Le comportement par défaut est donc que l'ajout d'une entité dans une "
 "collection créé simplement le lien entre les deux entités, et qu'effacer une "
@@ -158,8 +156,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:97
-#, no-c-format
-msgid "If we were to execute the following code"
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "Si nous executions le code suivant"
 
 #. Tag: programlisting
@@ -200,10 +198,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:119
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -230,12 +228,12 @@
 
 #. Tag: para
 #: example_parentchild.xml:130
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "La cause sous jacente à ce comportement est que le lien (la clé étrangère "
@@ -255,21 +253,21 @@
 
 #. Tag: para
 #: example_parentchild.xml:139
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(Nous avons aussi besoin d'ajouter la propriété <literal>parent</literal> "
 "dans la classe <literal>Child</literal>)."
 
 #. Tag: para
 #: example_parentchild.xml:143
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "Maintenant que l'état du lien est géré par l'entité <literal>Child</"
 "literal>, nous spécifions à la collection de ne pas mettre à jour le lien. "
@@ -287,8 +285,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:150
-#, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr ""
 "Le code suivant serait utilisé pour ajouter un nouveau <literal>Child</"
 "literal>"
@@ -307,16 +305,16 @@
 
 #. Tag: para
 #: example_parentchild.xml:156
-#, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr "Maintenant, seul un <literal>INSERT</literal> SQL est nécessaire !"
 
 #. Tag: para
 #: example_parentchild.xml:160
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "Pour alléger encore un peu les choses, nous devrions créer une méthode "
 "<literal>addChild()</literal> dans <literal>Parent</literal>."
@@ -333,8 +331,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:167
-#, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr "Le code d'ajout d'un <literal>Child</literal> serait alors"
 
 #. Tag: programlisting
@@ -356,10 +354,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:178
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "L'appel explicite de <literal>save()</literal> est un peu fastidieux. Nous "
 "pouvons simplifier cela en utilisant les cascades."
@@ -376,8 +374,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:185
-#, no-c-format
-msgid "This simplifies the code above to"
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "Simplifie le code précédent en"
 
 #. Tag: programlisting
@@ -392,9 +390,9 @@
 
 #. Tag: para
 #: example_parentchild.xml:191
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -413,8 +411,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:198
-#, no-c-format
-msgid "However, this code"
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "Par contre, ce code"
 
 #. Tag: programlisting
@@ -430,11 +428,11 @@
 
 #. Tag: para
 #: example_parentchild.xml:204
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "n'effacera pas <literal>c</literal> de la base de données, il enlèvera "
@@ -456,12 +454,12 @@
 
 #. Tag: para
 #: example_parentchild.xml:212
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "Dans notre cas, un <literal>Child</literal> ne peut pas vraiment exister "
 "sans son père. Si nous effacons un <literal>Child</literal> de la "
@@ -481,13 +479,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:220
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "A noter : même si le mapping de la collection spécifie <literal>inverse="
 "\"true\"</literal>, les cascades sont toujours assurées par l'itération sur "
@@ -504,20 +502,21 @@
 
 #. Tag: para
 #: example_parentchild.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "Supposons que nous ayons chargé un <literal>Parent</literal> dans une "
 "<literal>Session</literal>, que nous l'ayons ensuite modifié et que voulions "
@@ -536,10 +535,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:244
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "Le code suivant mettra à jour <literal>parent</literal> et <literal>child</"
 "literal> et insérera <literal>newChild</literal>."
@@ -558,16 +557,15 @@
 
 #. Tag: para
 #: example_parentchild.xml:251
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "Ceci est très bien pour des identifiants générés, mais qu'en est-il des "
 "identifiants assignés et des identifiants composés ? C'est plus difficile, "
@@ -586,11 +584,11 @@
 
 #. Tag: para
 #: example_parentchild.xml:286
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "Il y a quelques principes à maîtriser dans ce chapitre et tout cela peut "
 "paraître déroutant la première fois. Cependant, dans la pratique, tout "
@@ -599,13 +597,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:291
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "Nous avons évoqué une alternative dans le premier paragraphe. Aucun des "

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,11 +24,11 @@
 
 #. Tag: para
 #: example_weblog.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "Les classes persistantes representent un weblog, et un article posté dans un "
 "weblog. Il seront modélisés comme une relation père/fils standard, mais nous "
@@ -125,8 +125,8 @@
 
 #. Tag: para
 #: example_weblog.xml:49
-#, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "Le mapping XML doit maintenant être relativement simple à vos yeux."
 
 #. Tag: programlisting
@@ -231,10 +231,10 @@
 
 #. Tag: para
 #: example_weblog.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr ""
 "La classe suivante montre quelques utilisations que nous pouvons faire de "
 "ces classes."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,11 +18,11 @@
 
 #. Tag: para
 #: filters.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "Hibernate3 fournit une nouvelle approche innovatrice pour gérer des données "
@@ -38,16 +38,16 @@
 
 #. Tag: para
 #: filters.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "Hibernate3 ajoute la capacité de prédéfinir des critères de filtre et "
 "d'attacher ces filtres à une classe ou à une collection. Un critère de "
@@ -84,8 +84,8 @@
 
 #. Tag: para
 #: filters.xml:58
-#, no-c-format
-msgid "Then, this filter can be attached to a class:"
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "Puis, ce filtre peut être attaché à une classe :"
 
 #. Tag: programlisting
@@ -101,8 +101,8 @@
 
 #. Tag: para
 #: filters.xml:64
-#, no-c-format
-msgid "or, to a collection:"
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "ou à une collection :"
 
 #. Tag: programlisting
@@ -117,8 +117,8 @@
 
 #. Tag: para
 #: filters.xml:70
-#, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr "ou même aux deux (ou à plusieurs de chaque) en même temps."
 
 #. Tag: para
@@ -128,11 +128,11 @@
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enableFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "Les méthodes sur <literal>Session</literal> sont : <literal>enableFilter"
 "(String filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
@@ -153,19 +153,20 @@
 
 #. Tag: para
 #: filters.xml:85
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "Notez que des méthodes sur l'interface org.hibernate.Filter autorisent le "
 "chaînage de beaucoup de méthodes communes d'Hibernate."
 
 #. Tag: para
 #: filters.xml:89
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr ""
 "Un exemple complet, utilisant des données temporelles avec une structure de "
 "date d'enregistrement effectif :"
@@ -210,11 +211,10 @@
 
 #. Tag: para
 #: filters.xml:95
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "Puis, afin de s'assurer que vous pouvez toujours récupérer les "
 "enregistrements actuellement effectifs, activez simplement le filtre sur la "
@@ -236,12 +236,12 @@
 
 #. Tag: para
 #: filters.xml:102
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "Dans le HQL ci-dessus, bien que nous ayons seulement mentionné une "
 "contrainte de salaire sur les resultats, à cause du filtre activé, la "
@@ -250,12 +250,12 @@
 
 #. Tag: para
 #: filters.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "A noter : si vous prévoyez d'utiliser des filtres avec des jointures "
 "externes (soit à travers HQL, soit par le chargement) faites attention à la "
@@ -265,13 +265,13 @@
 
 #. Tag: para
 #: filters.xml:115
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr "translator-credits"
 
 #. Tag: programlisting
@@ -287,8 +287,8 @@
 #: filters.xml:124
 #, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,14 +12,14 @@
 
 #. Tag: title
 #: inheritance_mapping.xml:29
-#, no-c-format
-msgid "Inheritance Mapping"
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "Mapping d'héritage de classe"
 
 #. Tag: title
 #: inheritance_mapping.xml:32
-#, no-c-format
-msgid "The Three Strategies"
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "Les trois stratégies"
 
 #. Tag: para
@@ -68,18 +68,18 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "Il est possible d'utiliser différentes stratégies de mapping pour "
 "différentes branches d'une même hiérarchie d'héritage, et alors d'employer "
@@ -95,18 +95,18 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "Il est possible de définir des mappings de <literal>subclass</literal>, "
 "<literal>union-subclass</literal>, et <literal>joined-subclass</literal> "
@@ -141,12 +141,12 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:100
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "Supposons que nous ayons une interface <literal>Payment</literal>, "
 "implémentée par <literal>CreditCardPayment</literal>, <literal>CashPayment</"
@@ -179,11 +179,11 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:109
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "Une seule table est requise. Une grande limitation de cette stratégie est "
 "que les colonnes déclarées par les classes filles, telles que "
@@ -198,8 +198,8 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:120
-#, no-c-format
-msgid "A table per subclass mapping would look like:"
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "La stratégie une table par classe fille serait :"
 
 #. Tag: programlisting
@@ -230,11 +230,11 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:126
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "Quatre tables sont requises. Les trois tables des classes filles ont une clé "
 "primaire associée à la table classe mère (le modèle relationnel est une "
@@ -242,22 +242,22 @@
 
 #. Tag: title
 #: inheritance_mapping.xml:135
-#, no-c-format
-msgid "Table per subclass, using a discriminator"
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "Une table par classe fille, en utilisant un discriminant"
 
 #. Tag: para
 #: inheritance_mapping.xml:137
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "Notez que l'implémentation Hibernate de la stratégie un table par classe "
 "fille ne nécessite pas de colonne discriminante dans la table classe mère. "
@@ -325,10 +325,10 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:162
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "Vous pouvez même mélanger les stratégies d'une table par hiérarchie de "
 "classe et d'une table par classe fille en utilisant cette approche :"
@@ -387,10 +387,10 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:182
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "Il y a deux manières d'utiliser la stratégie d'une table par classe "
 "concrète. La première est d'employer <literal>&lt;union-subclass&gt;</"
@@ -432,13 +432,13 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:194
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "La limitation de cette approche est que si une propriété est mappée sur la "
 "classe mère, le nom de la colonne doit être le même pour toutes les classes "
@@ -450,12 +450,12 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:203
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "Si votre classe mère est abstraite, mappez la avec <literal>abstract=\"true"
 "\"</literal>. Bien sûr, si elle n'est pas abstraite, une table "
@@ -464,8 +464,8 @@
 
 #. Tag: title
 #: inheritance_mapping.xml:213
-#, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "Une table par classe concrète, en utilisant le polymorphisme implicite"
 
 #. Tag: para
@@ -505,14 +505,14 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:221
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "Notez que nulle part nous ne mentionnons l'interface <literal>Payment</"
 "literal> explicitement. Notez aussi que des propriétés de <literal>Payment</"
@@ -565,14 +565,13 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:248
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "Il y a une chose supplémentaire à noter à propos de ce mapping. Puisque les "
 "classes filles sont chacune mappées avec leur propre élément <literal>&lt;"
@@ -616,14 +615,14 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:258
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "Encore une fois, nous ne mentionnons pas explicitement <literal>Payment</"
@@ -643,12 +642,11 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:275
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "Il y a certaines limitations à l'approche du \"polymorphisme implicite\" "
 "pour la stratégie de mapping d'une table par classe concrète. Il y a plutôt "
@@ -672,122 +670,122 @@
 msgstr "Caractéristiques du mapping d'héritage"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "Stratégie d'héritage"
 
 #. Tag: entry
-#: inheritance_mapping.xml:301
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "many-to-one polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:302
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "one-to-one polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:303
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "one-to-many polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:304
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "many-to-many polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:305
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:306
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Requêtes polymorphiques"
 
 #. Tag: entry
-#: inheritance_mapping.xml:307
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "Jointures polymorphiques"
 
 #. Tag: entry
-#: inheritance_mapping.xml:308
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "Récupération par jointure externe"
 
 #. Tag: entry
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "une table par hiérarchie de classe"
 
 #. Tag: literal
-#: inheritance_mapping.xml:314 inheritance_mapping.xml:325
-#: inheritance_mapping.xml:336
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
-#: inheritance_mapping.xml:337
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
-#: inheritance_mapping.xml:339
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
-#: inheritance_mapping.xml:340
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
-#: inheritance_mapping.xml:341 inheritance_mapping.xml:352
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
 #. Tag: literal
-#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
-#: inheritance_mapping.xml:342
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
-#: inheritance_mapping.xml:343
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr "supportée"
 
 #. Tag: entry
-#: inheritance_mapping.xml:324
+#: inheritance_mapping.xml:325
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -797,13 +795,13 @@
 "une table par classe fille"
 
 #. Tag: entry
-#: inheritance_mapping.xml:335
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "une table par classe concrète (union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:338
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -811,20 +809,20 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:346
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "une table par classe concrète (polymorphisme implicite)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:347
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:348 inheritance_mapping.xml:349
-#: inheritance_mapping.xml:353 inheritance_mapping.xml:354
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, fuzzy, no-c-format
 msgid "not supported"
 msgstr ""
@@ -838,13 +836,13 @@
 "non supportée"
 
 #. Tag: literal
-#: inheritance_mapping.xml:350
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:351
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,12 +24,12 @@
 
 #. Tag: para
 #: performance.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "Une <emphasis>stratégie de chargement</emphasis> est une stratégie "
 "qu'Hibernate va utiliser pour récupérer des objets associés si l'application "
@@ -46,9 +46,9 @@
 
 #. Tag: para
 #: performance.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -58,12 +58,12 @@
 
 #. Tag: para
 #: performance.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>Chargement par select</emphasis> - Un second <literal>SELECT</"
 "literal> est utilisé pour récupérer l'instance associée ou la collection. A "
@@ -73,13 +73,13 @@
 
 #. Tag: para
 #: performance.xml:63
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>Chargement par sous-select</emphasis> - Un second <literal>SELECT</"
 "literal> est utilisé pour récupérer les associations pour toutes les entités "
@@ -90,11 +90,11 @@
 
 #. Tag: para
 #: performance.xml:72
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>Chargement par lot</emphasis> - Il s'agit d'une stratégie "
@@ -110,10 +110,10 @@
 
 #. Tag: para
 #: performance.xml:87
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>Chargement immédiat</emphasis> - Une association, une collection "
 "ou un attribut est chargé immédiatement lorsque l'objet auquel appartient "
@@ -121,11 +121,11 @@
 
 #. Tag: para
 #: performance.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>Chargement tardif d'une collection</emphasis> - Une collection est "
 "chargée lorque l'application invoque une méthode sur cette collection (il "
@@ -133,12 +133,12 @@
 
 #. Tag: para
 #: performance.xml:100
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>Chargement \"super tardif\" d'une collection</emphasis> - les "
 "éléments de la collection sont récupérés individuellement depuis la base de "
@@ -148,9 +148,9 @@
 
 #. Tag: para
 #: performance.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -160,14 +160,14 @@
 
 #. Tag: para
 #: performance.xml:115
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>Chargement \"sans proxy\"</emphasis> - une association vers un "
 "seul objet est chargée lorsque l'on accède à cet objet. Par rapport au "
@@ -179,9 +179,9 @@
 
 #. Tag: para
 #: performance.xml:125
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -191,13 +191,14 @@
 
 #. Tag: para
 #: performance.xml:134
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "Nous avons ici deux notions orthogonales : <emphasis>quand</emphasis> "
 "l'association est chargée et <emphasis>comment</emphasis> (quelle requête "
@@ -214,11 +215,11 @@
 
 #. Tag: para
 #: performance.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "Par défaut, Hibernate3 utilise le chargement tardif par select pour les "
 "collections et le chargement tardif par proxy pour les associations vers un "
@@ -227,12 +228,11 @@
 
 #. Tag: para
 #: performance.xml:151
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>Note :</emphasis> si vous définissez <literal>hibernate."
 "default_batch_fetch_size</literal>, Hibernate va utiliser l'optimisation du "
@@ -241,11 +241,10 @@
 
 #. Tag: para
 #: performance.xml:158
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "Cependant, le chargement tardif pose un problème qu'il faut connaitre. "
 "L'accès à une association définie comme \"tardive\", hors du contexte d'une "
@@ -270,13 +269,13 @@
 
 #. Tag: para
 #: performance.xml:166
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "Etant donné que la collection des permissions n'a pas été initialisée avant "
 "que la <literal>Session</literal> soit fermée, la collection n'est pas "
@@ -286,14 +285,14 @@
 
 #. Tag: para
 #: performance.xml:174
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "Une autre alternative est d'utiliser une collection ou une association non "
 "\"tardive\" en spécifiant <literal>lazy=\"false\"</literal> dans le mapping "
@@ -305,13 +304,13 @@
 
 #. Tag: para
 #: performance.xml:183
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "D'un autre côté, on veut souvent choisir un chargement par jointure (qui est "
 "par défaut non tardif) à la place du chargement par select dans une "
@@ -394,10 +393,10 @@
 
 #. Tag: para
 #: performance.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "Quelle que soit la stratégie de chargement que vous utilisez, la partie du "
@@ -407,10 +406,10 @@
 
 #. Tag: para
 #: performance.xml:238
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -426,11 +425,11 @@
 
 #. Tag: para
 #: performance.xml:247
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "Si vous ne vous sentez pas prêt à modifier la stratégie de chargement "
 "utilisé par <literal>get()</literal> ou <literal>load()</literal>, vous "
@@ -449,19 +448,19 @@
 
 #. Tag: para
 #: performance.xml:255
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(Il s'agit de l'équivalent pour Hibernate de ce que d'autres outils de "
 "mapping appellent un \"fetch plan\" ou \"plan de chargement\")"
 
 #. Tag: para
 #: performance.xml:259
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr ""
 "Une autre manière complètement différente d'éviter le problème des N+1 "
@@ -475,14 +474,14 @@
 
 #. Tag: para
 #: performance.xml:269
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "Le chargement tardif des collections est implémenté par Hibernate en "
 "utilisant ses propres implémentations pour des collections persistantes. Si "
@@ -494,9 +493,9 @@
 
 #. Tag: para
 #: performance.xml:277
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -506,13 +505,13 @@
 
 #. Tag: para
 #: performance.xml:283
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "Le fichier de mapping peut déclarer une interface qui sera utilisée par le "
 "proxy d'interfaçage pour cette classe à l'aide de l'attribut <literal>proxy</"
@@ -524,16 +523,16 @@
 
 #. Tag: para
 #: performance.xml:290
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr ""
 "Il y a quelques précautions à prendre lorsque l'on étend cette approche à "
 "des classes polymorphiques, exemple :"
 
 #. Tag: programlisting
-#: performance.xml:295
+#: performance.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -545,7 +544,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:297
+#: performance.xml:296
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -557,7 +556,7 @@
 "jacente est une instance de <literal>DomesticCat</literal> :"
 
 #. Tag: programlisting
-#: performance.xml:303
+#: performance.xml:302
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -570,15 +569,15 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:305
-#, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr ""
 "Deuxièmement, il est possible de casser la notion d'<literal>==</literal> "
 "des proxy."
 
 #. Tag: programlisting
-#: performance.xml:309
+#: performance.xml:308
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -590,7 +589,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:311
+#: performance.xml:310
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -602,7 +601,7 @@
 "quand même le même objet :"
 
 #. Tag: programlisting
-#: performance.xml:316
+#: performance.xml:315
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -610,10 +609,10 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:318
-#, no-c-format
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr ""
 "Troisièmement, vous ne pourrez pas utiliser un proxy CGLIB pour une classe "
@@ -621,12 +620,12 @@
 "<literal>final</literal>."
 
 #. Tag: para
-#: performance.xml:323
-#, no-c-format
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "Enfin, si votre objet persistant obtient une ressource à l'instanciation "
@@ -635,13 +634,16 @@
 "vraiment une sous classe de la classe persistante."
 
 #. Tag: para
-#: performance.xml:329
-#, no-c-format
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "Ces problèmes sont tous dus aux limitations fondamentales du modèle "
 "d'héritage unique de Java. Si vous souhaitez éviter ces problèmes, vos "
@@ -650,7 +652,7 @@
 "fichier de mapping :"
 
 #. Tag: programlisting
-#: performance.xml:335
+#: performance.xml:336
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -662,25 +664,19 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:337
-#, no-c-format
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"où <literal>CatImpl</literal> implémente l'interface <literal>Cat</literal> "
-"et <literal>DomesticCatImpl</literal> implémente l'interface "
-"<literal>DomesticCat</literal>. Ainsi, des proxys pour les instances de "
-"<literal>Cat</literal> et <literal>DomesticCat</literal> pourraient être "
-"retournées par <literal>load()</literal> ou <literal>iterate()</literal> "
-"(Notez que <literal>list()</literal> ne retourne généralement pas de proxy)."
+"Tout d'abord, les instances de <literal>Cat</literal> ne pourront jamais "
+"être \"castées\" en <literal>DomesticCat</literal>, même si l'instance sous "
+"jacente est une instance de <literal>DomesticCat</literal> :"
 
 #. Tag: programlisting
-#: performance.xml:345
+#: performance.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -689,8 +685,20 @@
 "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
 #: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "Les requêtes de type <literal>Criteria</literal>"
+
+#. Tag: para
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -702,40 +710,40 @@
 "et non <literal>CatImpl</literal>."
 
 #. Tag: para
-#: performance.xml:352
-#, no-c-format
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr "Certaines opérations ne nécessitent pas l'initialisation du proxy"
 
 #. Tag: para
-#: performance.xml:358
-#, no-c-format
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal>, si la classe persistante ne surcharge pas "
 "<literal>equals()</literal>"
 
 #. Tag: para
-#: performance.xml:364
-#, no-c-format
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal>, si la classe persistante ne surcharge pas "
 "<literal>hashCode()</literal>"
 
 #. Tag: para
-#: performance.xml:370
+#: performance.xml:375
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "Le getter de l'identifiant"
 
 #. Tag: para
-#: performance.xml:376
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -745,13 +753,13 @@
 "ou <literal>hashCode()</literal>."
 
 #. Tag: para
-#: performance.xml:381
-#, no-c-format
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "Eh choisissant <literal>lazy=\"no-proxy\"</literal> au lieu de <literal>lazy="
 "\"proxy\"</literal> qui est la valeur par défaut, il est possible d'éviter "
@@ -760,19 +768,19 @@
 "en une initialisation du proxy."
 
 #. Tag: title
-#: performance.xml:391
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "Initialisation des collections et des proxys"
 
 #. Tag: para
-#: performance.xml:393
-#, no-c-format
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "Une exception de type <literal>LazyInitializationException</literal> sera "
 "renvoyée par hibernate si une collection ou un proxy non initialisé est "
@@ -781,14 +789,14 @@
 "proxy est dans l'état \"détachée\"."
 
 #. Tag: para
-#: performance.xml:399
-#, no-c-format
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "Parfois, nous devons nous assurer qu'un proxy ou une collection est "
 "initialisée avant de fermer la <literal>Session</literal>. Bien sûr, nous "
@@ -798,11 +806,11 @@
 "code et n'est pas très générique."
 
 #. Tag: para
-#: performance.xml:406
-#, no-c-format
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -818,11 +826,11 @@
 "literal> a le même effet sur la collection kittens."
 
 #. Tag: para
-#: performance.xml:415
-#, no-c-format
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -839,11 +847,11 @@
 "initialisée. Il y a deux moyens de traiter ce problème :"
 
 #. Tag: para
-#: performance.xml:426
-#, no-c-format
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -863,21 +871,20 @@
 "Hibernate pour des exemples sur le pattern \"Open Session in View\"."
 
 #. Tag: para
-#: performance.xml:439
-#, no-c-format
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "Dans une application avec une couche métier séparée, la couche contenant la "
 "logique métier doit \"préparer\" toutes les collections qui seront "
@@ -895,14 +902,14 @@
 "<emphasis>Session Facade</emphasis>."
 
 #. Tag: para
-#: performance.xml:454
-#, no-c-format
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "Vous pouvez également attacher à une <literal>Session</literal> un objet "
 "chargé au préalable à l'aide des méthodes <literal>merge()</literal> ou "
@@ -912,18 +919,19 @@
 "ad hoc."
 
 #. Tag: para
-#: performance.xml:464
-#, no-c-format
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "Parfois, vous ne voulez pas initialiser une grande collection mais vous avez "
 "quand même besoin d'informations sur elle (comme sa taille) ou un sous "
 "ensemble de ses données"
 
 #. Tag: para
-#: performance.xml:469
+#: performance.xml:474
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -933,7 +941,7 @@
 "l'initialiser :"
 
 #. Tag: programlisting
-#: performance.xml:473
+#: performance.xml:478
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -941,7 +949,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:475
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -953,7 +961,7 @@
 "besoin de l'initialiser dans son ensemble."
 
 #. Tag: programlisting
-#: performance.xml:480
+#: performance.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -961,20 +969,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:485
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "Utiliser le chargement par lot"
 
 #. Tag: para
-#: performance.xml:487
-#, no-c-format
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "Pour améliorer les performances, Hibernate peut utiliser le chargement par "
 "lot ce qui veut dire qu'Hibernate peut charger plusieurs proxys (ou "
@@ -984,19 +991,19 @@
 "le chargement par lot : au niveau de la classe et au niveau de la collection."
 
 #. Tag: para
-#: performance.xml:493
-#, no-c-format
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "Le chargement par lot pour les classes/entités est plus simple à comprendre. "
 "Imaginez que vous ayez la situation suivante à l'exécution : vous avez 25 "
@@ -1011,25 +1018,25 @@
 "size</literal> (taille du lot) dans le mapping de <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: performance.xml:503
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:505
-#, no-c-format
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 "Hibernate exécutera désormais trois requêtes, en chargeant respectivement "
 "10, 10, et 5 entités."
 
 #. Tag: para
-#: performance.xml:509
+#: performance.xml:514
 #, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
 "and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
@@ -1047,7 +1054,7 @@
 "literal>, Hibernate pourra précharger les collections :"
 
 #. Tag: programlisting
-#: performance.xml:518
+#: performance.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1058,7 +1065,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:520
+#: performance.xml:525
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -1073,13 +1080,13 @@
 "particulière."
 
 #. Tag: para
-#: performance.xml:526
-#, no-c-format
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "Le chargement par lot de collections est particulièrement utile si vous avez "
 "des arborescenses récursives d'éléments (typiquement, le schéma facture de "
@@ -1088,18 +1095,18 @@
 "pour des arbres principalement en lecture.)"
 
 #. Tag: title
-#: performance.xml:535
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "Utilisation du chargement par sous select"
 
 #. Tag: para
-#: performance.xml:537
-#, no-c-format
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "Si une collection ou un proxy vers un objet doit être chargé, Hibernate va "
 "tous les charger en ré-exécutant la requête orignial dans un sous select. "
@@ -1107,22 +1114,22 @@
 "possibilité de fragmenter le chargement."
 
 #. Tag: title
-#: performance.xml:548
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "Utiliser le chargement tardif des propriétés"
 
 #. Tag: para
-#: performance.xml:550
-#, no-c-format
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "Hibernate3 supporte le chargement tardif de propriétés individuelles. La "
 "technique d'optimisation est également connue sous le nom de <emphasis>fetch "
@@ -1135,7 +1142,7 @@
 "modèle de données ne peut pas être amélioré."
 
 #. Tag: para
-#: performance.xml:559
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1145,7 +1152,7 @@
 "<literal>lazy</literal> sur une propriété particulière du mapping :"
 
 #. Tag: programlisting
-#: performance.xml:564
+#: performance.xml:569
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1161,12 +1168,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:566
-#, no-c-format
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "Le chargement tardif des propriétés requiert une instrumentation du bytecode "
 "lors de la compilation ! Si les classes persistantes ne sont pas "
@@ -1174,7 +1181,7 @@
 "retombera dans le mode de chargement immédiat."
 
 #. Tag: para
-#: performance.xml:572
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr ""
@@ -1182,7 +1189,7 @@
 "suivante :"
 
 #. Tag: programlisting
-#: performance.xml:576
+#: performance.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1202,13 +1209,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:578
+#: performance.xml:583
 #, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a preferred solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "Une autre façon (meilleure ?) pour éviter de lire plus de colonnes que "
 "nécessaire au moins pour des transactions en lecture seule est d'utiliser "
@@ -1217,32 +1224,32 @@
 "solution préférable."
 
 #. Tag: para
-#: performance.xml:585
-#, no-c-format
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "Vous pouvez forcer le mode de chargement agressif des propriétés en "
 "utilisant <literal>fetch all properties</literal> dans les requêts HQL."
 
 #. Tag: title
-#: performance.xml:595
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "Le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:597
-#, no-c-format
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "Une <literal>Session</literal> Hibernate est un cache de niveau "
 "transactionnel des données persistantes. Il est possible de configurer un "
@@ -1255,17 +1262,16 @@
 "cache)."
 
 #. Tag: para
-#: performance.xml:605
-#, no-c-format
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "Par défaut, Hibernate utilise EHCache comme cache de niveau JVM (le support "
 "de JCS est désormais déprécié et sera enlevé des futures versions "
@@ -1275,43 +1281,43 @@
 "literal>."
 
 #. Tag: title
-#: performance.xml:616
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr "Fournisseur de cache"
 
 #. Tag: entry
-#: performance.xml:625 performance.xml:813
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr "Cache"
 
 #. Tag: entry
-#: performance.xml:626
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr "Classe pourvoyeuse"
 
 #. Tag: entry
-#: performance.xml:627
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
 #. Tag: entry
-#: performance.xml:628
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "Support en Cluster"
 
 #. Tag: entry
-#: performance.xml:629
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "Cache de requêtes supporté"
 
 #. Tag: entry
-#: performance.xml:634 performance.xml:822
+#: performance.xml:639 performance.xml:827
 #, fuzzy, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr ""
@@ -1321,138 +1327,138 @@
 "Hashtable (ne pas utilser en production)"
 
 #. Tag: literal
-#: performance.xml:635
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:636
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr "mémoire"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:645 performance.xml:652
-#: performance.xml:823 performance.xml:824 performance.xml:825
-#: performance.xml:830 performance.xml:831 performance.xml:832
-#: performance.xml:837 performance.xml:838 performance.xml:839
-#: performance.xml:844 performance.xml:845 performance.xml:851
-#: performance.xml:854 performance.xml:858 performance.xml:861
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:641 performance.xml:829
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:642
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:643 performance.xml:650
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr "mémoire, disque"
 
 #. Tag: entry
-#: performance.xml:648 performance.xml:836
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:649
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:655 performance.xml:843
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:656
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:657
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "en cluster (multicast ip)"
 
 #. Tag: entry
-#: performance.xml:658
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "oui (invalidation de cluster)"
 
 #. Tag: entry
-#: performance.xml:662 performance.xml:850
+#: performance.xml:667 performance.xml:855
 #, fuzzy, no-c-format
 msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:663
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:664 performance.xml:671
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "en cluster (multicast ip), transactionnel"
 
 #. Tag: entry
-#: performance.xml:665
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr "oui (replication)"
 
 #. Tag: entry
-#: performance.xml:666 performance.xml:673
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "oui (horloge sync. nécessaire)"
 
 #. Tag: entry
-#: performance.xml:669 performance.xml:857
+#: performance.xml:674 performance.xml:862
 #, fuzzy, no-c-format
 msgid "JBoss Cache 2"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:670
+#: performance.xml:675
 #, fuzzy, no-c-format
-msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:672
+#: performance.xml:677
 #, fuzzy, no-c-format
 msgid "yes (replication or invalidation)"
 msgstr "oui (invalidation de cluster)"
 
 #. Tag: title
-#: performance.xml:680
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr "Mapping de Cache"
 
 #. Tag: para
-#: performance.xml:682
+#: performance.xml:687
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1462,7 +1468,7 @@
 "à la forme suivante :"
 
 #. Tag: programlisting
-#: performance.xml:693
+#: performance.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1473,7 +1479,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:701
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1486,23 +1492,23 @@
 "literal>"
 
 #. Tag: para
-#: performance.xml:705
-#, no-c-format
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (optionnel, par défaut il s'agit du nom de la "
 "classe ou du nom de role de la collection) spécifie le nom de la région du "
 "cache de second niveau"
 
 #. Tag: para
-#: performance.xml:712
-#, no-c-format
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (optionnel, par défaut <literal>all</literal>) "
@@ -1511,19 +1517,19 @@
 "lorsque le chargement tardif des attributs est activé."
 
 #. Tag: para
-#: performance.xml:722
+#: performance.xml:727
 #, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "Alternativement (voir préférentiellement), vous pouvez spécifier les "
 "éléments <literal>&lt;class-cache&gt;</literal> et <literal>&lt;collection-"
 "cache&gt;</literal> dans <literal>hibernate.cfg.xml</literal>."
 
 #. Tag: para
-#: performance.xml:727
+#: performance.xml:732
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1533,18 +1539,18 @@
 "concurrence d'accès au cache</emphasis>."
 
 #. Tag: title
-#: performance.xml:734
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "Strategie : lecture seule"
 
 #. Tag: para
-#: performance.xml:736
-#, no-c-format
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "Si votre application a besoin de lire mais ne modifie jamais les instances "
@@ -1553,7 +1559,7 @@
 "parfaitement sûre dans un cluster."
 
 #. Tag: programlisting
-#: performance.xml:742
+#: performance.xml:747
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1563,26 +1569,26 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:748
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "Stratégie : lecture/écriture"
 
 #. Tag: para
-#: performance.xml:750
-#, no-c-format
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "Si l'application a besoin de mettre à jour des données, un cache "
 "<literal>read-write</literal> peut être approprié. Cette stratégie ne "
@@ -1599,7 +1605,7 @@
 "fournis."
 
 #. Tag: programlisting
-#: performance.xml:761
+#: performance.xml:766
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1613,18 +1619,18 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:766
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "Stratégie : lecture/écriture non stricte"
 
 #. Tag: para
-#: performance.xml:768
-#, no-c-format
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1642,18 +1648,18 @@
 "close()</literal> ou <literal>Session.disconnect()</literal>"
 
 #. Tag: title
-#: performance.xml:780
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "Stratégie : transactionelle"
 
 #. Tag: para
-#: performance.xml:782
-#, no-c-format
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "La stratégie de cache <literal>transactional</literal> supporte un cache "
@@ -1662,13 +1668,13 @@
 "spécifier <literal>hibernate.transaction.manager_lookup_class</literal>."
 
 #. Tag: title
-#: performance.xml:791
+#: performance.xml:796
 #, fuzzy, no-c-format
 msgid "Cache-provider/concurrency-strategy compatibility"
 msgstr "Stratégie de concurrence du cache"
 
 #. Tag: para
-#: performance.xml:794
+#: performance.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "None of the cache providers support all of the cache concurrency strategies."
@@ -1678,7 +1684,7 @@
 "de concurrence."
 
 #. Tag: para
-#: performance.xml:799
+#: performance.xml:804
 #, fuzzy, no-c-format
 msgid ""
 "The following table shows which providers are compatible with which "
@@ -1689,47 +1695,47 @@
 "de concurrence."
 
 #. Tag: title
-#: performance.xml:804
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "Stratégie de concurrence du cache"
 
 #. Tag: entry
-#: performance.xml:814
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr "read-only (lecture seule)"
 
 #. Tag: entry
-#: performance.xml:815
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write (lecture-écriture non stricte)"
 
 #. Tag: entry
-#: performance.xml:816
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr "read-write (lecture-ériture)"
 
 #. Tag: entry
-#: performance.xml:817
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr "transactional (transactionnel)"
 
 #. Tag: title
-#: performance.xml:872
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr "Gérer les caches"
 
 #. Tag: para
-#: performance.xml:874
-#, no-c-format
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1743,14 +1749,14 @@
 "interne de la <literal>Session</literal>."
 
 #. Tag: para
-#: performance.xml:881
-#, no-c-format
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "Lorsqu'il y a un appel à la méthode <literal>flush()</literal>, l'état de "
@@ -1761,7 +1767,7 @@
 "l'objet et ses collections dépendantes du cache de la session"
 
 #. Tag: programlisting
-#: performance.xml:889
+#: performance.xml:894
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1774,7 +1780,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:891
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1784,17 +1790,17 @@
 "</literal> pour déterminer si une instance appartient au cache de la session."
 
 #. Tag: para
-#: performance.xml:896
-#, no-c-format
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "Pour retirer tous les objets du cache session, appelez <literal>Session.clear"
 "()</literal>"
 
 #. Tag: para
-#: performance.xml:900
+#: performance.xml:905
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1807,7 +1813,7 @@
 "collection."
 
 #. Tag: programlisting
-#: performance.xml:906
+#: performance.xml:911
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1819,54 +1825,54 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:908
-#, no-c-format
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "Le <literal>CacheMode</literal> contrôle comme une session particulière "
 "interragit avec le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:915
-#, no-c-format
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr ""
 "<literal>CacheMode.NORMAL</literal> - lit et écrit les items dans le cache "
 "de second niveau"
 
 #. Tag: para
-#: performance.xml:920
-#, no-c-format
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - lit les items dans le cache de second "
 "niveau mais ne les écrit pas sauf dans le cache d'une mise à jour d'une "
 "donnée"
 
 #. Tag: para
-#: performance.xml:926
-#, no-c-format
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - écrit les items dans le cache de second "
 "niveau mais ne les lit pas dans le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:932
-#, no-c-format
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - écrit les items dans le cache de "
 "second niveau mais ne les lit pas dans le cache de second niveau, outrepasse "
@@ -1874,7 +1880,7 @@
 "rafraîchissement du cache de second niveau pour chaque item lu dans la base"
 
 #. Tag: para
-#: performance.xml:940
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1885,7 +1891,7 @@
 "API:"
 
 #. Tag: programlisting
-#: performance.xml:945
+#: performance.xml:950
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1894,18 +1900,18 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:947
-#, no-c-format
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "Vous devez pour cela activer les statistiques et optionnellement forcer "
 "Hibernate à conserver les entrées dans le cache sous un format plus "
 "compréhensible pour l'utilisateur :"
 
 #. Tag: programlisting
-#: performance.xml:952
+#: performance.xml:957
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1913,41 +1919,40 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:957
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr "Le cache de requêtes"
 
 #. Tag: para
-#: performance.xml:959
-#, no-c-format
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "Les résultats d'une requête peuvent aussi être placés en cache. Ceci n'est "
 "utile que pour les requêtes qui sont exécutées avec les mêmes paramètres. "
 "Pour utiliser le cache de requêtes, vous devez d'abord l'activer :"
 
 #. Tag: programlisting
-#: performance.xml:964
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:966
-#, no-c-format
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "Ce paramètre amène la création de deux nouvelles régions dans le cache, une "
 "qui va conserver le résultat des requêtes mises en cache (<literal>org."
@@ -1960,10 +1965,10 @@
 "second niveau pour être efficace."
 
 #. Tag: para
-#: performance.xml:976
-#, no-c-format
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1975,11 +1980,11 @@
 "résultats si la requête est exécutée."
 
 #. Tag: para
-#: performance.xml:983
-#, no-c-format
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "Si vous avez besoin de contrôler finement les délais d'expiration du cache, "
@@ -1987,7 +1992,7 @@
 "particulière en appelant <literal>Query.setCacheRegion()</literal>."
 
 #. Tag: programlisting
-#: performance.xml:989
+#: performance.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -2000,7 +2005,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:996
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -2021,54 +2026,52 @@
 "<literal>SessionFactory.evictQueries()</literal>."
 
 #. Tag: title
-#: performance.xml:1003
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "Comprendre les performances des Collections"
 
 #. Tag: para
-#: performance.xml:1005
+#: performance.xml:1010
 #, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"Nous avons déjà passé du temps à discuter des collections. Dans cette "
-"section, nous allons traiter du comportement des collections à l'exécution."
 
 #. Tag: title
-#: performance.xml:1012
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr "Classification"
 
 #. Tag: para
-#: performance.xml:1014
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate définit trois types de collections :"
 
 #. Tag: para
-#: performance.xml:1018
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr "les collections de valeurs"
 
 #. Tag: para
-#: performance.xml:1021
-#, no-c-format
-msgid "one to many associations"
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "les associations un-vers-plusieurs"
 
 #. Tag: para
-#: performance.xml:1024
-#, no-c-format
-msgid "many to many associations"
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "les associations plusieurs-vers-plusieurs"
 
 #. Tag: para
-#: performance.xml:1028
+#: performance.xml:1033
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -2087,31 +2090,31 @@
 "amène aux classifications suivantes :"
 
 #. Tag: para
-#: performance.xml:1039
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr "collections indexées"
 
 #. Tag: para
-#: performance.xml:1042
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr "sets"
 
 #. Tag: para
-#: performance.xml:1045
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr "bags"
 
 #. Tag: para
-#: performance.xml:1049
-#, no-c-format
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "Toutes les collections indexées (maps, lists, arrays) ont une clé primaire "
@@ -2122,18 +2125,18 @@
 "efficacement lorsqu'Hibernate essaie de le mettre à jour ou de le supprimer."
 
 #. Tag: para
-#: performance.xml:1057
+#: performance.xml:1062
 #, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficiently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "Les Sets ont une clé primaire composée de <literal>&lt;key&gt;</literal> et "
 "des colonnes représentant l'élément. Elle est donc moins efficace pour "
@@ -2149,25 +2152,25 @@
 "literal>)."
 
 #. Tag: para
-#: performance.xml:1068
-#, no-c-format
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "Le mapping à l'aide d'<literal>&lt;idbag&gt;</literal> définit une clé de "
 "substitution ce qui leur permet d'être très efficaces lors de la mise à "
 "jour. En fait il s'agit du meilleur cas de mise à jour d'une collection"
 
 #. Tag: para
-#: performance.xml:1073
-#, no-c-format
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "Le pire cas intervient pour les Bags. Dans la mesure où un bag permet la "
 "duplications des éléments et n'a pas de colonne d'index, aucune clé primaire "
@@ -2178,13 +2181,13 @@
 "très inefficace."
 
 #. Tag: para
-#: performance.xml:1081
-#, no-c-format
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "Notez que pour une relation un-vers-plusieurs, la \"clé primaire\" peut ne "
 "pas être la clé primaire de la table en base de données - mais même dans ce "
@@ -2192,7 +2195,7 @@
 "Hibernate \"localise\" chaque enregistrement de la collection)."
 
 #. Tag: title
-#: performance.xml:1091
+#: performance.xml:1096
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
@@ -2201,28 +2204,28 @@
 "efficaces pour la mise à jour"
 
 #. Tag: para
-#: performance.xml:1093
-#, no-c-format
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "La discussion précédente montre clairement que les collections indexées et "
 "(la plupart du temps) les sets, permettent de réaliser le plus efficacement "
 "les opérations d'ajout, de suppression ou de modification d'éléments."
 
 #. Tag: para
-#: performance.xml:1099
-#, no-c-format
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "Il existe un autre avantage qu'ont les collections indexées sur les Sets "
 "dans le cadre d'une association plusieurs vers plusieurs ou d'une collection "
@@ -2234,12 +2237,12 @@
 "pas aux associations un vers plusieurs."
 
 #. Tag: para
-#: performance.xml:1108
-#, no-c-format
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -2251,14 +2254,14 @@
 "\"set\" est la plus naturelle dans le modèle relationnel."
 
 #. Tag: para
-#: performance.xml:1116
-#, no-c-format
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "Cependant, dans des modèles objet bien conçus avec Hibernate, on voit "
 "souvent que la plupart des collections sont en fait des associations \"un-"
@@ -2268,25 +2271,24 @@
 "des collections ne s'appliquent tout simplement pas dans ces cas là."
 
 #. Tag: title
-#: performance.xml:1126
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr ""
 "Les Bags et les lists sont les plus efficaces pour les collections inverse"
 
 #. Tag: para
-#: performance.xml:1128
-#, no-c-format
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "Avant que vous n'oubliez les bags pour toujours, il y a un cas précis où les "
 "bags (et les lists) sont bien plus performants que les sets. Pour une "
@@ -2300,7 +2302,7 @@
 "suivant beaucoup plus rapide."
 
 #. Tag: programlisting
-#: performance.xml:1138
+#: performance.xml:1143
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2311,20 +2313,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1143
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr "Suppression en un coup"
 
 #. Tag: para
-#: performance.xml:1145
-#, no-c-format
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "Parfois, effacer les éléments d'une collection un par un peut être "
 "extrêmement inefficace. Hibernate n'est pas totalement stupide, il sait "
@@ -2334,13 +2335,13 @@
 "fait !"
 
 #. Tag: para
-#: performance.xml:1152
-#, no-c-format
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "Supposons que nous ajoutions un élément dans une collection de taille vingt "
 "et que nous enlevions ensuite deux éléments. Hibernate effectuera un "
@@ -2348,7 +2349,7 @@
 "la collection ne soit un bag). Ce qui est souhaitable."
 
 #. Tag: para
-#: performance.xml:1158
+#: performance.xml:1163
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2359,28 +2360,28 @@
 "moyens de procéder."
 
 #. Tag: para
-#: performance.xml:1165
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "effacer dix huit enregistrements un à un puis en insérer trois"
 
 #. Tag: para
-#: performance.xml:1168
-#, no-c-format
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr ""
 "effacer la totalité de la collection (en un <literal>DELETE</literal> SQL) "
 "puis insérer les cinq éléments restant un à un"
 
 #. Tag: para
-#: performance.xml:1173
-#, no-c-format
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernate n'est pas assez intelligent pour savoir que, dans ce cas, la "
 "seconde méthode est plus rapide (Il plutôt heureux qu'Hibernate ne soit pas "
@@ -2388,13 +2389,12 @@
 "triggers de bases de données plutôt aléatoire, etc...)."
 
 #. Tag: para
-#: performance.xml:1179
-#, no-c-format
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "Heureusement, vous pouvez forcer ce comportement lorsque vous le souhaitez, "
 "en liberant (c'est-à-dire en déréférençant) la collection initiale et en "
@@ -2402,23 +2402,23 @@
 "restants. Ceci peut être très pratique et très puissant de temps en temps."
 
 #. Tag: para
-#: performance.xml:1185
-#, no-c-format
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "Bien sûr, la suppression en un coup ne s'applique pas pour les collections "
 "qui sont mappées avec <literal>inverse=\"true\"</literal>."
 
 #. Tag: title
-#: performance.xml:1194
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "Moniteur de performance"
 
 #. Tag: para
-#: performance.xml:1196
+#: performance.xml:1201
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2432,13 +2432,13 @@
 "<literal>SessionFactory</literal>."
 
 #. Tag: title
-#: performance.xml:1203
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "Suivi d'une SessionFactory"
 
 #. Tag: para
-#: performance.xml:1205
+#: performance.xml:1210
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2451,11 +2451,11 @@
 "literal> vous même."
 
 #. Tag: para
-#: performance.xml:1211
-#, no-c-format
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2465,7 +2465,7 @@
 "factory. Voici un code qui montre un exemple de configuration minimaliste :"
 
 #. Tag: programlisting
-#: performance.xml:1218
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2481,7 +2481,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1221
+#: performance.xml:1226
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2495,30 +2495,16 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1223
-#, no-c-format
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"TODO: Cela n'a pas de sens : dans le premier cs on récupère et on utilise le "
-"MBean directement. Dans le second, on doit fournir le nom JNDI sous lequel "
-"est retenu la fabrique de session avant de l'utiliser. Pour cela il faut "
-"utiliser <literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name"
-"\")</literal>"
-
-#. Tag: para
-#: performance.xml:1228
-#, no-c-format
-msgid ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
 "Vous pouvez (dés)activer le suivi pour une <literal>SessionFactory</literal>"
 
 #. Tag: para
-#: performance.xml:1233
+#: performance.xml:1238
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2528,7 +2514,7 @@
 "generate_statistics</literal> à <literal>false</literal>"
 
 #. Tag: para
-#: performance.xml:1240
+#: performance.xml:1245
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2538,7 +2524,7 @@
 "literal> ou <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
 
 #. Tag: para
-#: performance.xml:1247
+#: performance.xml:1252
 #, fuzzy, no-c-format
 msgid ""
 "Statistics can be reset programmatically using the <literal>clear()</"
@@ -2551,19 +2537,19 @@
 "literal>"
 
 #. Tag: title
-#: performance.xml:1256
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr "Métriques"
 
 #. Tag: para
-#: performance.xml:1258
-#, no-c-format
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "Hibernate fournit un certain nombre de métriques, qui vont des informations "
 "très basiques aux informations très spécialisées qui ne sont appropriées que "
@@ -2571,7 +2557,7 @@
 "l'API de l'interface <literal>Statistics</literal> dans trois catégories :"
 
 #. Tag: para
-#: performance.xml:1265
+#: performance.xml:1270
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2582,17 +2568,17 @@
 "récupérées, etc..."
 
 #. Tag: para
-#: performance.xml:1271
-#, no-c-format
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr ""
 "Les métriques relatives aux entités, collections, requêtes et caches dans "
 "leur ensemble (métriques globales),"
 
 #. Tag: para
-#: performance.xml:1277
+#: performance.xml:1282
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2602,14 +2588,14 @@
 "ou une région de cache particulière."
 
 #. Tag: para
-#: performance.xml:1284
+#: performance.xml:1289
 #, fuzzy, no-c-format
 msgid ""
 "For example, you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "Par exemple, vous pouvez vérifier l'accès au cache ainsi que le taux "
 "d'éléments manquants et de mise à jour des entités, collections et requêtes "
@@ -2619,8 +2605,8 @@
 "n'offre qu'une précision de l'ordre de 10 secondes."
 
 #. Tag: para
-#: performance.xml:1291
-#, no-c-format
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2629,7 +2615,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "Des accesseurs simples sont utilisés pour accéder aux métriques globales (e."
@@ -2644,7 +2630,7 @@
 "simple :"
 
 #. Tag: programlisting
-#: performance.xml:1301
+#: performance.xml:1306
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2666,12 +2652,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1303
-#, no-c-format
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2682,5 +2668,43 @@
 "<literal>getCollectionRoleNames()</literal>, et "
 "<literal>getSecondLevelCacheRegionNames()</literal>."
 
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "où <literal>CatImpl</literal> implémente l'interface <literal>Cat</"
+#~ "literal> et <literal>DomesticCatImpl</literal> implémente l'interface "
+#~ "<literal>DomesticCat</literal>. Ainsi, des proxys pour les instances de "
+#~ "<literal>Cat</literal> et <literal>DomesticCat</literal> pourraient être "
+#~ "retournées par <literal>load()</literal> ou <literal>iterate()</literal> "
+#~ "(Notez que <literal>list()</literal> ne retourne généralement pas de "
+#~ "proxy)."
+
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "Nous avons déjà passé du temps à discuter des collections. Dans cette "
+#~ "section, nous allons traiter du comportement des collections à "
+#~ "l'exécution."
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "TODO: Cela n'a pas de sens : dans le premier cs on récupère et on utilise "
+#~ "le MBean directement. Dans le second, on doit fournir le nom JNDI sous "
+#~ "lequel est retenu la fabrique de session avant de l'utiliser. Pour cela "
+#~ "il faut utiliser <literal>hibernateStatsBean.setSessionFactoryJNDIName"
+#~ "(\"my/JNDI/Name\")</literal>"
+
 #~ msgid "yes"
 #~ msgstr "oui"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,13 @@
 
 #. Tag: para
 #: persistent_classes.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "Les classes persistantes sont les classes d'une application qui implémentent "
 "les entités d'un problème métier (ex. Client et Commande dans une "
@@ -33,13 +34,13 @@
 
 #. Tag: para
 #: persistent_classes.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "Hibernate fonctionne de manière optimale lorsque ces classes suivent "
 "quelques règles simples, aussi connues comme le modèle de programmation "
@@ -57,8 +58,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:49
-#, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr ""
 "Toute bonne application Java nécessite une classe persistante représentant "
 "les félins."
@@ -150,8 +153,10 @@
 #. Tag: para
 #: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
-msgstr "Il y a quatre règles à suivre ici :"
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
 #. Tag: title
 #: persistent_classes.xml:61
@@ -161,12 +166,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:63
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -186,15 +191,15 @@
 
 #. Tag: para
 #: persistent_classes.xml:75
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal> possède une propriété appelée <literal>id</literal>. "
 "Cette propriété mappe la valeur de la colonne de clé primaire de la table "
@@ -221,9 +226,9 @@
 
 #. Tag: para
 #: persistent_classes.xml:89
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr ""
 "En fait, quelques fonctionnalités ne sont disponibles que pour les classes "
@@ -254,11 +259,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "Nous recommandons que vous déclariez les propriétés d'identifiant de manière "
 "uniforme. Nous recommandons également que vous utilisiez un type nullable "
@@ -284,11 +288,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:126
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "Vous pouvez persister, grâce à Hibernate, les classes <literal>final</"
 "literal> qui n'implémentent pas d'interface, mais vous ne pourrez pas "
@@ -318,16 +323,15 @@
 
 #. Tag: para
 #: persistent_classes.xml:141
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal> déclare des mutateurs pour toutes ses champs "
 "persistants. Beaucoup d'autres solutions de mapping Objet/relationnel "
@@ -360,10 +364,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:164
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "Une sous-classe doit également suivre la première et la seconde règle. Elle "
 "hérite sa propriété d'identifiant de <literal>Cat</literal>."
@@ -396,20 +400,20 @@
 
 #. Tag: para
 #: persistent_classes.xml:175
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "Vous devez surcharger les méthodes <literal>equals()</literal> et "
 "<literal>hashCode()</literal> si vous"
 
 #. Tag: para
 #: persistent_classes.xml:181
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "avez l'intention de mettre des instances de classes persistantes dans un "
@@ -424,12 +428,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:194
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernate garantit l'équivalence de l'identité persistante (ligne de base de "
@@ -441,23 +445,22 @@
 
 #. Tag: para
 #: persistent_classes.xml:202
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "La manière la plus évidente est d'implémenter <literal>equals()</literal>/"
 "<literal>hashCode()</literal> en comparant la valeur de l'identifiant des "
@@ -479,13 +482,14 @@
 
 #. Tag: para
 #: persistent_classes.xml:216
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "Nous recommandons donc d'implémenter <literal>equals()</literal> et "
 "<literal>hashCode()</literal> en utilisant <emphasis> l'égalité par clé "
@@ -525,12 +529,11 @@
 
 #. Tag: para
 #: persistent_classes.xml:226
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "Notez qu'une clef métier ne doit pas être solide comme une clef primaire de "
 "base de données (voir <xref linkend=\"transactions-basics-identity\"/>). Les "
@@ -543,25 +546,31 @@
 msgid "Dynamic models"
 msgstr "Modèles dynamiques"
 
-#. Tag: emphasis
+#. Tag: title
 #: persistent_classes.xml:239
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: emphasis
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr ""
 "Notez que la fonctionnalités suivantes sont actuellement considérées comme "
 "expérimentales et peuvent changer dans un futur proche."
 
 #. Tag: para
-#: persistent_classes.xml:243
-#, no-c-format
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "Les entités persistantes ne doivent pas nécessairement être représentées "
 "comme des classes POJO ou des objets JavaBean à l'exécution. Hibernate "
@@ -571,13 +580,13 @@
 "classes persistantes, seulement des fichiers de mapping."
 
 #. Tag: para
-#: persistent_classes.xml:251
-#, no-c-format
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "Par défaut, Hibernate fonctionne en mode POJO normal. Vous pouvez paramétrer "
 "un mode de représentation d'entité par défaut pour une "
@@ -586,12 +595,12 @@
 "\"configuration-optional-properties\"/>)."
 
 #. Tag: para
-#: persistent_classes.xml:258
-#, no-c-format
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "Les exemples suivants démontrent la représentation utilisant des "
 "<literal>Map</literal>s. D'abord, dans le fichier de mapping, un "
@@ -599,7 +608,7 @@
 "nom de classe :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:264
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -638,23 +647,22 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:266
-#, no-c-format
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "Notez que même si des associations sont déclarées en utilisant des noms de "
 "classe cible, le type de cible d'une association peut aussi être une entité "
 "dynamique au lieu d'un POJO."
 
 #. Tag: para
-#: persistent_classes.xml:273
-#, no-c-format
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "Après avoir configuré le mode d'entité par défaut à <literal>dynamic-map</"
@@ -663,7 +671,7 @@
 "literal>s :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:279
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -690,14 +698,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:281
-#, no-c-format
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "Les avantages d'un mapping dynamique sont un gain de temps pour le "
@@ -709,7 +717,7 @@
 "tard."
 
 #. Tag: para
-#: persistent_classes.xml:289
+#: persistent_classes.xml:292
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -719,7 +727,7 @@
 "<literal>Session</literal> :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:294
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -737,14 +745,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:297
-#, no-c-format
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -759,7 +767,7 @@
 "transaction et de la connexion à l'unité de travail primaire."
 
 #. Tag: para
-#: persistent_classes.xml:307
+#: persistent_classes.xml:310
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -769,29 +777,24 @@
 "dans <xref linkend=\"xml\"/>."
 
 #. Tag: title
-#: persistent_classes.xml:315
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr "Tuplizers"
 
 #. Tag: para
-#: persistent_classes.xml:317
-#, no-c-format
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, et ses sous-interfaces, "
 "sont responsables de la gestion d'une représentation particulière d'un "
@@ -811,17 +814,29 @@
 "composants."
 
 #. Tag: para
-#: persistent_classes.xml:332
+#: persistent_classes.xml:330
 #, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "Les utilisateurs peuvent aussi brancher leurs propres tuplizers. Peut-être "
 "vous est-il nécessaire qu'une implémentation de <literal>java.util.Map</"
@@ -834,7 +849,7 @@
 "notre entité utilisateur :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:341
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -875,15 +890,193 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:347
+#: persistent_classes.xml:354
 #, no-c-format
-msgid "Extentsions"
+msgid "EntityNameResolvers"
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:348
+#: persistent_classes.xml:356
 #, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
 msgstr ""
-"TODO: Document user-extension framework in the property and proxy packages"
+
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "Il y a quatre règles à suivre ici :"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,12 @@
 
 #. Tag: para
 #: preface.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -36,12 +36,12 @@
 
 #. Tag: para
 #: preface.xml:39
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "Non seulement, Hibernate s'occupe du transfert des classes Java dans les "
 "tables de la base de données (et des types de données Java dans les types de "
@@ -52,9 +52,9 @@
 
 #. Tag: para
 #: preface.xml:46
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -107,14 +107,14 @@
 
 #. Tag: para
 #: preface.xml:77
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "Regardez le répertoire <literal>eg</literal> de la distribution Hibernate, "
 "il contient une application simple et autonome. Copiez votre pilote JDBC "
@@ -126,14 +126,14 @@
 
 #. Tag: para
 #: preface.xml:88
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr ""
 "Faîtes de cette documentation de référence votre principale source "
 "d'information. Pensez à lire <emphasis>Java Persistence with Hibernate</"
@@ -152,10 +152,10 @@
 
 #. Tag: para
 #: preface.xml:103
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr ""
 "Des démos, exemples et tutoriaux de tierces personnes sont référencés sur le "
 "site web Hibernate."
@@ -175,10 +175,10 @@
 
 #. Tag: para
 #: preface.xml:117
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,8 +82,8 @@
 
 #. Tag: para
 #: query_criteria.xml:61
-#, no-c-format
-msgid "Restrictions may be grouped logically."
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "Les restrictions peuvent être goupées de manière logique."
 
 #. Tag: programlisting
@@ -117,10 +117,10 @@
 
 #. Tag: para
 #: query_criteria.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "Il y a plusieurs types de criterion pré-définis (sous classes de "
@@ -149,11 +149,11 @@
 
 #. Tag: para
 #: query_criteria.xml:81
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "Une autre approche pour obtenir un criterion est de le récupérer d'une "
 "instance de <literal>Property</literal>. Vous pouvez créer une "
@@ -186,9 +186,9 @@
 
 #. Tag: para
 #: query_criteria.xml:94
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "Vous pouvez trier les résultats en utilisant <literal>org.hibernate."
@@ -228,11 +228,9 @@
 #: query_criteria.xml:107
 #, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"Vous pouvez facilement spécifier des contraintes sur des entités liées, par "
-"des associations en utilisant <literal>createCriteria()</literal>."
 
 #. Tag: programlisting
 #: query_criteria.xml:112
@@ -247,10 +245,10 @@
 
 #. Tag: para
 #: query_criteria.xml:114
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "Notez que la seconde <literal>createCriteria()</literal> retourne une "
@@ -259,8 +257,9 @@
 
 #. Tag: para
 #: query_criteria.xml:120
-#, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "La forme alternative suivante est utile dans certains cas."
 
 #. Tag: programlisting
@@ -286,11 +285,11 @@
 
 #. Tag: para
 #: query_criteria.xml:131
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "Notez que les collections kittens contenues dans les instances de "
@@ -324,9 +323,9 @@
 
 #. Tag: para
 #: query_criteria.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "Vous pouvez spéficier au moment de l'exécution le peuplement d'une "
@@ -445,11 +444,11 @@
 
 #. Tag: para
 #: query_criteria.xml:190
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "La classe <literal>org.hibernate.criterion.Projections</literal> est une "
 "fabrique d'instances de <literal>Projection</literal>. Nous appliquons une "
@@ -494,11 +493,11 @@
 
 #. Tag: para
 #: query_criteria.xml:206
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "Un alias peut optionnellement être assigné à une projection, ainsi la valeur "
 "projetée peut être référencée dans des restrictions ou des tris. Voici deux "
@@ -614,11 +613,11 @@
 
 #. Tag: para
 #: query_criteria.xml:239
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "La classe <literal>DetachedCriteria</literal> vous laisse créer une requête "
 "en dehors de la portée de la session, et puis l'exécuter plus tard en "
@@ -641,10 +640,10 @@
 
 #. Tag: para
 #: query_criteria.xml:246
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "Une <literal>DetachedCriteria</literal> peut aussi être utilisée pour "
@@ -676,8 +675,8 @@
 
 #. Tag: para
 #: query_criteria.xml:256
-#, no-c-format
-msgid "Even correlated subqueries are possible:"
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "Même des requêtes corrélées sont possibles :"
 
 #. Tag: programlisting
@@ -701,11 +700,11 @@
 
 #. Tag: para
 #: query_criteria.xml:271
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -720,10 +719,10 @@
 
 #. Tag: para
 #: query_criteria.xml:279
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "D'abord vous devriez mapper la clef naturelle de votre entité en utilisant "
 "<literal>&lt;natural-id&gt;</literal>, et activer l'utilisation du cache de "
@@ -748,9 +747,9 @@
 
 #. Tag: para
 #: query_criteria.xml:286
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr ""
 "Notez que cette fonctionnalité n'est pas prévue pour l'utilisation avec des "
@@ -758,22 +757,17 @@
 
 #. Tag: para
 #: query_criteria.xml:291
-#, no-c-format
-msgid "Next, enable the Hibernate query cache."
-msgstr "Ensuite, activez le cache de requête d'Hibernate."
-
-#. Tag: para
-#: query_criteria.xml:295
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "Maintenant <literal>Restrictions.naturalId()</literal> nous permet de rendre "
 "l'utilisation de l'algorithme de cache plus efficace."
 
 #. Tag: programlisting
-#: query_criteria.xml:300
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
@@ -783,3 +777,13 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 msgstr ""
+
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "Vous pouvez facilement spécifier des contraintes sur des entités liées, "
+#~ "par des associations en utilisant <literal>createCriteria()</literal>."
+
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "Ensuite, activez le cache de requête d'Hibernate."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,11 @@
 
 #. Tag: para
 #: query_hql.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "Hibernate fourni un langage d'interrogation extrêmement puissant qui "
 "ressemble (et c'est voulu) au SQL. Mais ne soyez pas distraits par la "
@@ -38,13 +37,13 @@
 
 #. Tag: para
 #: query_hql.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "Les requêtes sont insensibles à la casse, à l'exception des noms des classes "
 "Java et des propriétés. Ainsi, <literal>SeLeCT</literal> est identique à "
@@ -55,11 +54,11 @@
 
 #. Tag: para
 #: query_hql.xml:51
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "Ce guide utilise les mots clés HQL en minuscule. Certains utilisateurs "
 "trouvent les requêtes écrites avec les mots clés en majuscule plus lisibles, "
@@ -86,11 +85,11 @@
 
 #. Tag: para
 #: query_hql.xml:67
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "qui retourne simplement toutes les instances de la classe <literal>eg.Cat</"
 "literal>. Nous n'avons pas besoin d'habitude de qualifier le nom de la "
@@ -107,13 +106,9 @@
 #: query_hql.xml:75
 #, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"La plupart du temps, vous devrez assigner un <emphasis>alias</emphasis> "
-"puisque vous voudrez faire référence à <literal>Cat</literal> dans d'autres "
-"parties de la requête."
 
 #. Tag: programlisting
 #: query_hql.xml:81 query_hql.xml:396
@@ -123,11 +118,11 @@
 
 #. Tag: para
 #: query_hql.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "Cette requête assigne l'alias <literal>cat</literal> à l'instance "
 "<literal>Cat</literal>, nous pouvons donc utiliser cet alias ailleurs dans "
@@ -142,9 +137,9 @@
 
 #. Tag: para
 #: query_hql.xml:91
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr ""
 "Plusieurs classes peuvent apparaître, ce qui conduira à un produit cartésien "
@@ -164,10 +159,10 @@
 
 #. Tag: para
 #: query_hql.xml:98
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "C'est une bonne pratique que de nommer les alias dans les requêtes en "
@@ -183,10 +178,10 @@
 
 #. Tag: para
 #: query_hql.xml:109
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "On peut aussi assigner des alias à des entités associées, ou même aux "
 "éléments d'une collection de valeurs, en utilisant un <literal>join</"
@@ -215,8 +210,8 @@
 
 #. Tag: para
 #: query_hql.xml:120
-#, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "Les types de jointures supportées sont celles de ANSI SQL"
 
 #. Tag: literal
@@ -286,14 +281,14 @@
 
 #. Tag: para
 #: query_hql.xml:161
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "Par ailleurs, une jointure \"fetchée\" (rapportée) permet d'initialiser les "
 "associations ou collections de valeurs en même temps que leur objet parent, "
@@ -314,13 +309,13 @@
 
 #. Tag: para
 #: query_hql.xml:171
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "Une jointure \"fetchée\" (rapportée) n'a généralement pas besoin de se voir "
@@ -343,22 +338,22 @@
 
 #. Tag: para
 #: query_hql.xml:181
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "Notez que la construction de <literal>fetch</literal> ne peut pas être "
 "utilisée dans les requêtes appelées par <literal>scroll()</literal> ou "
@@ -376,11 +371,11 @@
 
 #. Tag: para
 #: query_hql.xml:196
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "Si vous utilisez un chargement retardé pour les propriétés (avec une "
@@ -420,11 +415,11 @@
 
 #. Tag: para
 #: query_hql.xml:214
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "Les requêtes présentes dans la section précédente utilisent la forme "
 "<literal>explicite</literal> où le mode clé join est explicitement utilisé "
@@ -452,26 +447,24 @@
 
 #. Tag: title
 #: query_hql.xml:230
-#, no-c-format
-msgid "Refering to identifier property"
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
 #: query_hql.xml:232
-#, no-c-format
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
 "property:"
 
 #. Tag: para
 #: query_hql.xml:237
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -480,9 +473,9 @@
 
 #. Tag: para
 #: query_hql.xml:244
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "If the entity defines a named identifier property, you may use that property "
@@ -490,12 +483,12 @@
 
 #. Tag: para
 #: query_hql.xml:250
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "References to composite identifier properties follow the same naming rules. "
@@ -505,14 +498,14 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:257
+#: query_hql.xml:258
 #, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
 "versions, <literal>id</literal><emphasis>always</emphasis> referred to the "
@@ -521,23 +514,23 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:266
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr "La clause select"
 
 #. Tag: para
-#: query_hql.xml:268
-#, no-c-format
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "La clause <literal>select</literal> sélectionne les objets et propriétés qui "
 "doivent être retournés dans le résultat de la requête. Soit :"
 
 #. Tag: programlisting
-#: query_hql.xml:273
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -546,33 +539,33 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:275
-#, no-c-format
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "La requête recherchera les <literal>mate</literal>s liés aux <literal>Cat</"
 "literal>s. Vous pouvez explimer la requête d'une manière plus compacte :"
 
 #. Tag: programlisting
-#: query_hql.xml:280
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:282
-#, no-c-format
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "Les requêtes peuvent retourner des propriétés de n'importe quel type, même "
 "celles de type composant (component) :"
 
 #. Tag: programlisting
-#: query_hql.xml:286
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -580,23 +573,23 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:288
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:290
-#, no-c-format
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "Les requêtes peuvent retourner plusieurs objets et/ou propriétés sous la "
 "forme d'un tableau du type <literal>Object[]</literal>,"
 
 #. Tag: programlisting
-#: query_hql.xml:295
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -606,13 +599,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:297
-#, no-c-format
-msgid "or as a <literal>List</literal>,"
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "ou sous la forme d'une <literal>List</literal>,"
 
 #. Tag: programlisting
-#: query_hql.xml:301
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -622,13 +615,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:303
-#, no-c-format
-msgid "or as an actual typesafe Java object,"
-msgstr "ou sous la forme d'un objet Java typé,"
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr ""
+"à condition que la classe <literal>Family</literal> possède le constructeur "
+"approprié."
 
 #. Tag: programlisting
-#: query_hql.xml:307
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -638,20 +635,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:309
-#, no-c-format
-msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
-msgstr ""
-"à condition que la classe <literal>Family</literal> possède le constructeur "
-"approprié."
-
-#. Tag: para
 #: query_hql.xml:313
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr ""
 "Vous pouvez assigner des alias aux expressions sélectionnées en utilisant "
 "<literal>as</literal> :"
@@ -701,9 +688,9 @@
 
 #. Tag: para
 #: query_hql.xml:334
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr ""
 "Les requêtes HQL peuvent aussi retourner le résultat de fonctions "
 "d'aggrégation sur les propriétés :"
@@ -719,8 +706,8 @@
 
 #. Tag: para
 #: query_hql.xml:349
-#, no-c-format
-msgid "The supported aggregate functions are"
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "Les fonctions supportées sont"
 
 #. Tag: literal
@@ -743,9 +730,9 @@
 
 #. Tag: para
 #: query_hql.xml:371
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr ""
 "Vous pouvez utiliser des opérateurs arithmétiques, la concaténation, et des "
@@ -770,9 +757,9 @@
 
 #. Tag: para
 #: query_hql.xml:380
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "Les mots clé <literal>distinct</literal> et <literal>all</literal> peuvent "
@@ -801,10 +788,10 @@
 
 #. Tag: para
 #: query_hql.xml:398
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -841,12 +828,12 @@
 
 #. Tag: para
 #: query_hql.xml:415
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "Notez que ces deux dernières requêtes nécessitent plus d'un <literal>SELECT</"
 "literal> SQL. Ce qui signifie que la clause <literal>order by</literal> ne "
@@ -862,10 +849,10 @@
 
 #. Tag: para
 #: query_hql.xml:426
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "La clause <literal>where</literal> vous permet de réduire la liste des "
 "instances retournées. Si aucun alias n'existe, vous pouvez vous référer aux "
@@ -891,15 +878,21 @@
 
 #. Tag: para
 #: query_hql.xml:439
-#, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr ""
 "retourne les instances de <literal>Cat</literal> dont name est égale à "
 "'Fritz'."
 
-#. Tag: programlisting
+#. Tag: para
 #: query_hql.xml:443
 #, no-c-format
+msgid "The following query:"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:446
+#, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
 "from Foo foo, Bar bar\n"
@@ -907,14 +900,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:445
-#, no-c-format
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "retournera les instances de <literal>Foo</literal> pour lesquelles il existe "
 "une instance de <literal>bar</literal> avec la propriété <literal>date</"
@@ -923,23 +916,22 @@
 "clause <literal>where</literal> extrêmement puissante. Soit :"
 
 #. Tag: programlisting
-#: query_hql.xml:454
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:456
-#, no-c-format
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "Cette requête se traduit en SQL par une jointure interne à une table. Si "
 "vous souhaitez écrire quelque chose comme :"
 
 #. Tag: programlisting
-#: query_hql.xml:461
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -947,31 +939,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:463
-#, no-c-format
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 "vous finiriez avec une requête qui nécessiterait quatre jointures en SQL."
 
 #. Tag: para
-#: query_hql.xml:467
-#, no-c-format
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "L'opérateur <literal>=</literal> peut être utilisé pour comparer aussi bien "
 "des propriétés que des instances :"
 
 #. Tag: programlisting
-#: query_hql.xml:472
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:474
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -980,10 +971,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:476
-#, no-c-format
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -992,7 +983,7 @@
 "utiliser le nom de cette propriété)."
 
 #. Tag: programlisting
-#: query_hql.xml:482
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -1001,29 +992,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:484
-#, no-c-format
-msgid "The second query is efficient. No table join is required!"
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr ""
 "La seconde requête est particulièrement efficace. Aucune jointure n'est "
 "nécessaire !"
 
 #. Tag: para
-#: query_hql.xml:488
-#, no-c-format
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "Les propriétés d'un identifiant composé peuvent aussi être utilisées. "
 "Supposez que <literal>Person</literal> ait un identifiant composé de "
 "<literal>country</literal> et <literal>medicareNumber</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:495
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -1032,7 +1021,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:497
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -1041,38 +1030,46 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:499
-#, no-c-format
-msgid "Once again, the second query requires no table join."
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr "Une fois de plus, la seconde requête ne nécessite pas de jointure."
 
 #. Tag: para
-#: query_hql.xml:503
+#: query_hql.xml:505
 #, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "De même, la propriété spéciale <literal>class</literal> interroge la valeur "
 "discriminante d'une instance dans le cas d'une persistance polymorphique. Le "
 "nom d'une classe Java incorporée dans la clause where sera traduite par sa "
 "valeur discriminante."
 
 #. Tag: programlisting
-#: query_hql.xml:509
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:511
-#, no-c-format
+#: query_hql.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "Vous pouvez aussi spécifier les propriétés des composants ou types "
 "utilisateurs composés (components, composite user types etc). N'essayez "
@@ -1082,13 +1079,13 @@
 "avec un composant <literal>address</literal>"
 
 #. Tag: para
-#: query_hql.xml:516
-#, no-c-format
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "Un type \"any\" possède les propriétés spéciales <literal>id</literal> et "
 "<literal>class</literal>, qui nous permettent d'exprimer une jointure de la "
@@ -1096,7 +1093,7 @@
 "mappée avec <literal>&lt;any&gt;</literal>)."
 
 #. Tag: programlisting
-#: query_hql.xml:522
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1104,63 +1101,63 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:524
-#, no-c-format
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "Dans la requête précédente, notez que <literal>log.item.class</literal> et "
 "<literal>payment.class</literal> feraient référence à des valeurs de "
 "colonnes de la base de données complètement différentes."
 
 #. Tag: title
-#: query_hql.xml:532
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr "Expressions"
 
 #. Tag: para
-#: query_hql.xml:534
-#, no-c-format
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "Les expressions permises dans la clause <literal>where</literal> incluent la "
 "plupart des choses que vous pouvez utiliser en SQL :"
 
 #. Tag: para
-#: query_hql.xml:541
-#, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "opérateurs mathématiques <literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:546
-#, no-c-format
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr ""
 "opérateur de comparaison binaire <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, "
 "like</literal>"
 
 #. Tag: para
-#: query_hql.xml:551
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "opérateurs logiques <literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:556
-#, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "Parenthèses <literal>( )</literal>, indiquant un regroupement"
 
 #. Tag: para
-#: query_hql.xml:561
+#: query_hql.xml:568
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1174,7 +1171,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:581
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1184,7 +1181,7 @@
 "and \"searched\" case, <literal>case when ... then ... else ... end</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:587
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1194,29 +1191,29 @@
 "<literal>concat(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
-#, no-c-format
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:591
-#, no-c-format
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:598
+#: query_hql.xml:605
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1228,13 +1225,13 @@
 "sqrt(), bit_length(), mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:604
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> et <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:609
+#: query_hql.xml:616
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1244,7 +1241,7 @@
 "temporelles vers une chaîne de caractères lisible"
 
 #. Tag: para
-#: query_hql.xml:615
+#: query_hql.xml:622
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1258,7 +1255,7 @@
 "supportés par la base de données sous-jacente"
 
 #. Tag: para
-#: query_hql.xml:623
+#: query_hql.xml:630
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1268,13 +1265,13 @@
 "collection indexée jointe"
 
 #. Tag: para
-#: query_hql.xml:629
-#, no-c-format
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "Les fonctions HQL qui s'appliquent expressions représentant des "
@@ -1284,11 +1281,11 @@
 "utilisant <literal>some, all, exists, any, in</literal>."
 
 #. Tag: para
-#: query_hql.xml:637
-#, no-c-format
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "N'importe quelle fonction scalaire supportée par la base de données comme "
@@ -1296,23 +1293,23 @@
 "literal>, <literal>sin()</literal>"
 
 #. Tag: para
-#: query_hql.xml:643
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "Les paramètres positionnels de JDBC <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:648
-#, no-c-format
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "paramètres nommés <literal>:name</literal>, <literal>:start_date</literal>, "
 "<literal>:x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:653
+#: query_hql.xml:660
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1322,7 +1319,7 @@
 "01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:659
+#: query_hql.xml:666
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1332,41 +1329,41 @@
 "TABBY</literal>"
 
 #. Tag: para
-#: query_hql.xml:665
-#, no-c-format
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "<literal>in</literal> et <literal>between</literal> peuvent être utilisés "
 "comme suit :"
 
 #. Tag: programlisting
-#: query_hql.xml:669
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:671
+#: query_hql.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:673
-#, no-c-format
-msgid "and the negated forms may be written"
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "et la forme négative peut être écrite"
 
 #. Tag: programlisting
-#: query_hql.xml:677
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:679
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1374,27 +1371,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:681
-#, no-c-format
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "De même, <literal>is null</literal> et <literal>is not null</literal> "
 "peuvent être utilisés pour tester les valeurs nulle."
 
 #. Tag: para
-#: query_hql.xml:686
-#, no-c-format
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "Les booléens peuvent être facilement utilisés en déclarant les substitutions "
 "de requêtes dans la configuration Hibernate :"
 
 #. Tag: programlisting
-#: query_hql.xml:691
+#: query_hql.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1402,7 +1399,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:693
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1414,42 +1411,42 @@
 "SQL du HQL suivant :"
 
 #. Tag: programlisting
-#: query_hql.xml:698
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:700
-#, no-c-format
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "Vous pouvez tester la taille d'une collection par la propriété spéciale "
 "<literal>size</literal>, ou la fonction spéciale <literal>size()</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:709
-#, no-c-format
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "Pour les collections indexées, vous pouvez faire référence aux indices "
 "minimum et maximum en utilisant les fonctions <literal>minindex</literal> "
@@ -1459,32 +1456,32 @@
 "<literal>maxelement</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:717
+#: query_hql.xml:724
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:719
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:721
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:723
-#, no-c-format
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "Les fonctions SQL <literal>any, some, all, exists, in</literal> supportent "
 "que leur soient passées l'élément, l'index d'une collection (fonctions "
@@ -1492,7 +1489,7 @@
 "d'une sous requête (voir ci dessous)."
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1500,7 +1497,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1508,31 +1505,31 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:735
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:737
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:739
-#, no-c-format
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "Notez que l'écriture de - <literal>size</literal>, <literal>elements</"
@@ -1542,23 +1539,23 @@
 "clause where dans Hibernate3."
 
 #. Tag: para
-#: query_hql.xml:746
-#, no-c-format
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "Les éléments de collections indexées (arrays, lists, maps) peuvent être "
 "référencés via index (dans une clause where seulement) :"
 
 #. Tag: programlisting
-#: query_hql.xml:751
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:753
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1567,7 +1564,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:755
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1576,7 +1573,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:757
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1584,17 +1581,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:759
-#, no-c-format
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr ""
 "L'expression entre <literal>[]</literal> peut même être une expression "
 "arithmétique."
 
 #. Tag: programlisting
-#: query_hql.xml:763
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1602,17 +1599,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:765
-#, no-c-format
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "HQL propose aussi une fonction <literal>index()</literal> interne, pour les "
 "éléments d'une association one-to-many ou d'une collections de valeurs."
 
 #. Tag: programlisting
-#: query_hql.xml:770
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1621,32 +1618,32 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:772
-#, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr ""
 "Les fonctions SQL scalaires supportées par la base de données utilisée "
 "peuvent être utilisées"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
-#, no-c-format
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "Si vous n'êtes pas encore convaincu par tout cela, imaginez la taille et "
 "l'illisibilité qui caractériseraient la transformation SQL de la requête HQL "
 "suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:783
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1659,13 +1656,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:785
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>Un indice :</emphasis> cela donnerait quelque chose comme"
 
 #. Tag: programlisting
-#: query_hql.xml:789
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1689,23 +1686,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:794
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr "La clause order by"
 
 #. Tag: para
-#: query_hql.xml:796
-#, no-c-format
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "La liste retounée par la requête peut être triée par n'importe quelle "
 "propriété de la classe ou du composant retourné :"
 
 #. Tag: programlisting
-#: query_hql.xml:800
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1713,7 +1710,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:802
+#: query_hql.xml:809
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1723,23 +1720,23 @@
 "respectivement si le tri doit être croissant ou décroissant."
 
 #. Tag: title
-#: query_hql.xml:809
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr "La clause group by"
 
 #. Tag: para
-#: query_hql.xml:811
-#, no-c-format
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "Si la requête retourne des valeurs aggrégées, celles ci peuvent être "
 "groupées par propriété ou composant :"
 
 #. Tag: programlisting
-#: query_hql.xml:815
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1748,7 +1745,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:817
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1757,13 +1754,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:819
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr "Une clause <literal>having</literal> est aussi permise."
 
 #. Tag: programlisting
-#: query_hql.xml:823
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1773,12 +1770,12 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:825
-#, no-c-format
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "Les fonctions SQL et les fonctions d'aggrégations sont permises dans les "
 "clauses <literal>having</literal> et <literal>order by</literal>, si elles "
@@ -1786,7 +1783,7 @@
 "exemple)."
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1798,27 +1795,26 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:833
-#, no-c-format
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "Notez que ni la clause <literal>group by</literal> ni la clause "
 "<literal>order by</literal> ne peuvent contenir d'expressions arithmétiques."
 
 #. Tag: title
-#: query_hql.xml:845
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr "Sous-requêtes"
 
 #. Tag: para
-#: query_hql.xml:847
+#: query_hql.xml:854
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1833,7 +1829,7 @@
 "principale) sont supportées."
 
 #. Tag: programlisting
-#: query_hql.xml:853
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1843,7 +1839,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:855
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1853,7 +1849,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:857
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1863,7 +1859,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:859
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1873,7 +1869,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:861
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1881,37 +1877,38 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:863
-#, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 "Notez que les sous-requêtes HQL peuvent arriver seulememnt dans les clauses "
 "select ou where."
 
 #. Tag: para
-#: query_hql.xml:867
-#, no-c-format
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "Note that subqueries can also utilize <literal>row value constructor</"
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:875
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr "Exemples HQL"
 
 #. Tag: para
-#: query_hql.xml:877
-#, no-c-format
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "Les requêtes Hibernate peuvent être relativement puissantes et complexes. En "
 "fait, la puissance du langage de requêtage est l'un des avantages principaux "
@@ -1920,16 +1917,16 @@
 "que vous écrirez seront plus simples que les exemples suivantes !"
 
 #. Tag: para
-#: query_hql.xml:883
-#, no-c-format
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "La requête suivante retourne l'id de commande (order), le nombre d'articles "
 "(items) et la valeur totale de la commande (order) pour toutes les commandes "
@@ -1941,7 +1938,7 @@
 "corrélée)."
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1965,7 +1962,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1975,7 +1972,7 @@
 "la requête ressemblait donc plutôt à cela :"
 
 #. Tag: programlisting
-#: query_hql.xml:899
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1994,7 +1991,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:901
+#: query_hql.xml:908
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -2013,7 +2010,7 @@
 "<literal>PAYMENT_STATUS_CHANGE</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2034,17 +2031,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:911
-#, no-c-format
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "Si nous avions mappé la collection <literal>statusChanges</literal> comme "
 "une liste, au lieu d'un ensemble, la requête aurait été plus facile à écrire."
 
 #. Tag: programlisting
-#: query_hql.xml:916
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2058,7 +2055,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:918
+#: query_hql.xml:925
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -2079,7 +2076,7 @@
 "<literal>ORG_USER</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:927
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2092,7 +2089,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:929
+#: query_hql.xml:936
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
@@ -2101,7 +2098,7 @@
 "(corrélée)."
 
 #. Tag: programlisting
-#: query_hql.xml:933
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2115,39 +2112,38 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:938
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "Mise à jour et suppression"
 
 #. Tag: para
-#: query_hql.xml:940
-#, no-c-format
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "HQL supporte maintenant les expressions <literal>update</literal>, "
 "<literal>delete</literal> et <literal>insert ... select ...</literal>. Voir "
 "<xref linkend=\"batch-direct\"/> pour les détails."
 
 #. Tag: title
-#: query_hql.xml:948
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "Trucs &amp; Astuces"
 
 #. Tag: para
-#: query_hql.xml:950
-#, no-c-format
-msgid ""
-"You can count the number of query results without actually returning them:"
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr ""
 "Vous pouvez compter le nombre de résultats d'une requête sans les retourner :"
 
 #. Tag: programlisting
-#: query_hql.xml:954
+#: query_hql.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2155,7 +2151,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:956
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
@@ -2163,7 +2159,7 @@
 "suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:960
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2174,7 +2170,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:962
+#: query_hql.xml:969
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2185,21 +2181,21 @@
 "requête:"
 
 #. Tag: programlisting
-#: query_hql.xml:967
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:969
-#, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr ""
 "Si votre base de données ne supporte pas les sous-requêtes, utilisez la "
 "requête suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:973
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2210,10 +2206,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:975
-#, no-c-format
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "Cette solution ne peut pas retourner un <literal>User</literal> avec zéro "
@@ -2221,7 +2217,7 @@
 "utile :"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2232,7 +2228,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:982
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
@@ -2240,7 +2236,7 @@
 "nommés d'un requête :"
 
 #. Tag: programlisting
-#: query_hql.xml:986
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2250,7 +2246,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:988
+#: query_hql.xml:996
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2260,7 +2256,7 @@
 "<literal>Query</literal> avec un filtre :"
 
 #. Tag: programlisting
-#: query_hql.xml:992
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2271,15 +2267,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:994
-#, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "Les éléments d'une collection peuvent être triés ou groupés en utilisant un "
 "filtre de requête :"
 
 #. Tag: programlisting
-#: query_hql.xml:998
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2289,13 +2285,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1000
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "Vous pouvez récupérer la taille d'une collection sans l'initialiser :"
 
 #. Tag: programlisting
-#: query_hql.xml:1004
+#: query_hql.xml:1012
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2303,34 +2299,34 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1009
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:1011
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1016 query_hql.xml:1062
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1017
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1019
+#: query_hql.xml:1027
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2338,37 +2334,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1024
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1031
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2376,24 +2372,24 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1040
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1042
+#: query_hql.xml:1050
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1049
+#: query_hql.xml:1057
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2401,21 +2397,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1051
+#: query_hql.xml:1059
 #, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1056
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1058
+#: query_hql.xml:1066
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2423,16 +2419,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1064
+#: query_hql.xml:1072
 #, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1069
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2442,10 +2437,22 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1071
+#: query_hql.xml:1079
 #, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
+
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "La plupart du temps, vous devrez assigner un <emphasis>alias</emphasis> "
+#~ "puisque vous voudrez faire référence à <literal>Cat</literal> dans "
+#~ "d'autres parties de la requête."
+
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "ou sous la forme d'un objet Java typé,"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: para
 #: query_sql.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -35,10 +35,10 @@
 
 #. Tag: para
 #: query_sql.xml:37
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3 vous permet de spécifier du SQL écrit à la main (incluant les "
 "procédures stockées) pour toutes les opérations de création, mise à jour, "
@@ -52,12 +52,12 @@
 
 #. Tag: para
 #: query_sql.xml:43
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "L'exécution des requêtes en SQL natif est contrôlée par l'interface "
 "<literal>SQLQuery</literal>, laquelle est obtenue en appelant "
@@ -87,10 +87,10 @@
 
 #. Tag: para
 #: query_sql.xml:56
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "These will both return a List of Object arrays (Object[]) with scalar values "
@@ -99,11 +99,11 @@
 
 #. Tag: para
 #: query_sql.xml:61
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
 "simply to be more explicit in what is returned one can use <literal>addScalar"
@@ -121,13 +121,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:194 query_sql.xml:345
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, no-c-format
 msgid "This query specified:"
 msgstr "This query specified:"
 
 #. Tag: para
-#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:349
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr "the SQL query string"
@@ -142,7 +142,7 @@
 #: query_sql.xml:79
 #, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
+"This will return Object arrays, but now it will not use "
 "<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
@@ -179,11 +179,11 @@
 
 #. Tag: para
 #: query_sql.xml:92
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "This is essentially the same query as before, but now "
 "<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
@@ -191,11 +191,11 @@
 
 #. Tag: para
 #: query_sql.xml:96
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
@@ -317,14 +317,14 @@
 
 #. Tag: para
 #: query_sql.xml:152
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "In this example the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
@@ -346,12 +346,12 @@
 
 #. Tag: para
 #: query_sql.xml:162
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "At this stage we are reaching the limits of what is possible with native "
 "queries without starting to enhance the sql queries to make them usable in "
@@ -366,11 +366,11 @@
 
 #. Tag: para
 #: query_sql.xml:172
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "Until now the result set column names are assumed to be the same as the "
@@ -400,15 +400,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:182
+#: query_sql.xml:184
 #, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specified in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "The intention for this query is to return two Cat instances per row, a cat "
 "and its mother. This will fail since there is a conflict of names since they "
@@ -418,13 +418,13 @@
 "\"NAME\")."
 
 #. Tag: para
-#: query_sql.xml:189
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "The following form is not vulnerable to column name duplication:"
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -435,7 +435,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:198
+#: query_sql.xml:202
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -445,23 +445,22 @@
 "aliases"
 
 #. Tag: para
-#: query_sql.xml:203
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr "the entities returned by the query"
 
 #. Tag: para
-#: query_sql.xml:207
+#: query_sql.xml:211
 #, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicitly, but even "
-"in this case we let Hibernate inject the SQL column aliases for each "
-"property. The placeholder for a column alias is just the property name "
-"qualified by the table alias. In the following example, we retrieve Cats and "
-"their mothers from a different table (cat_log) to the one declared in the "
-"mapping metadata. Notice that we may even use the property aliases in the "
-"where clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
 "properties\". Alternatively, you may list the columns explicity, but even in "
@@ -473,7 +472,7 @@
 "clause if we like."
 
 #. Tag: programlisting
-#: query_sql.xml:216
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -488,19 +487,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:219
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr "Alias and property references"
 
 #. Tag: para
-#: query_sql.xml:221
-#, no-c-format
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "For most cases the above alias injection is needed, but for queries relating "
 "to more complex mappings like composite properties, inheritance "
@@ -508,233 +507,234 @@
 "allow Hibernate to inject the proper aliases."
 
 #. Tag: para
-#: query_sql.xml:226
-#, no-c-format
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "The following table shows the different possibilities of using the alias "
 "injection. Note: the alias names in the result are examples, each alias will "
 "have a unique and probably different name when used."
 
 #. Tag: title
-#: query_sql.xml:232
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr "Alias injection names"
 
 #. Tag: entry
-#: query_sql.xml:243
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: entry
-#: query_sql.xml:245
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr "Syntax"
 
 #. Tag: entry
-#: query_sql.xml:247
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr "Example"
 
 #. Tag: entry
-#: query_sql.xml:253
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr "A simple property"
 
 #. Tag: literal
-#: query_sql.xml:255
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
 #. Tag: literal
-#: query_sql.xml:257
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:261
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr "A composite property"
 
 #. Tag: literal
-#: query_sql.xml:263
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:265
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "Discriminator of an entity"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr "All properties of an entity"
 
 #. Tag: literal
-#: query_sql.xml:280 query_sql.xml:328
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:286
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr "A collection key"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr "The id of an collection"
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr "The element of an collection"
 
 #. Tag: literal
-#: query_sql.xml:304
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:310
-#, no-c-format
-msgid "roperty of the element in the collection"
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "roperty of the element in the collection"
 
 #. Tag: literal
-#: query_sql.xml:312
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:314
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:318
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "All properties of the element in the collection"
 
 #. Tag: literal
-#: query_sql.xml:320
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:322
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:326
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr "All properties of the the collection"
 
 #. Tag: literal
-#: query_sql.xml:330
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:339
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "Returning non-managed entities"
 
 #. Tag: para
-#: query_sql.xml:341
-#, no-c-format
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "It is possible to apply a ResultTransformer to native sql queries. Allowing "
 "it to e.g. return non-managed entities."
 
 #. Tag: programlisting
-#: query_sql.xml:343
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -742,13 +742,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:353
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr "a result transformer"
 
 #. Tag: para
-#: query_sql.xml:357
+#: query_sql.xml:361
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -760,17 +760,17 @@
 "corresponding properties or fields."
 
 #. Tag: title
-#: query_sql.xml:364
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "Handling inheritance"
 
 #. Tag: para
-#: query_sql.xml:366
-#, no-c-format
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "Native sql queries which query for entities that is mapped as part of an "
@@ -778,19 +778,19 @@
 "subclasses."
 
 #. Tag: title
-#: query_sql.xml:372
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr "Parameters"
 
 #. Tag: para
-#: query_sql.xml:374
-#, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr "Native sql queries support positional as well as named parameters:"
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -803,17 +803,17 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:385
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "Requêtes SQL nommées"
 
 #. Tag: para
-#: query_sql.xml:387
-#, no-c-format
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "Les requêtes SQL nommées peuvent être définies dans le document de mapping "
@@ -822,7 +822,7 @@
 "<literal>addEntity()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:392
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -836,7 +836,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:394
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -846,19 +846,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:396
-#, no-c-format
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "Les éléments <literal>&lt;return-join&gt;</literal> et <literal>&lt;load-"
 "collection&gt;</literal> sont respectivement utilisés pour lier des "
 "associations et définir des requêtes qui initialisent des collections."
 
 #. Tag: programlisting
-#: query_sql.xml:401
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -879,7 +879,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:403
+#: query_sql.xml:406
 #, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
@@ -891,7 +891,7 @@
 "<literal>&lt;return-scalar&gt;</literal> :"
 
 #. Tag: programlisting
-#: query_sql.xml:407
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -904,12 +904,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:409
+#: query_sql.xml:412
 #, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them across several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "Vous pouvez externaliser les informations de mapping des résultats dans un "
 "élément <literal>&lt;resultset&gt;</literal> pour soit les réutiliser dans "
@@ -917,7 +918,7 @@
 "<literal>setResultSetMapping()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:414
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -941,17 +942,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:416
-#, no-c-format
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr ""
 "You can alternatively use the resultset mapping information in your hbm "
 "files directly in java code."
 
 #. Tag: programlisting
-#: query_sql.xml:419
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -963,7 +964,7 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:422
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr ""
@@ -971,12 +972,12 @@
 "colonnes/alias"
 
 #. Tag: para
-#: query_sql.xml:425
-#, no-c-format
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "Avec <literal>&lt;return-property&gt;</literal> vous pouvez explicitement "
 "dire à Hibernate quels alias de colonne utiliser, plutot que d'employer la "
@@ -984,7 +985,7 @@
 "alias."
 
 #. Tag: programlisting
-#: query_sql.xml:430
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -1002,11 +1003,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:432
-#, no-c-format
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal> fonctionne aussi avec de multiple "
@@ -1014,7 +1015,7 @@
 "ne peut pas permettre une bonne granularité des propriétés multi-colonnes."
 
 #. Tag: programlisting
-#: query_sql.xml:437
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -1035,12 +1036,12 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:439
-#, no-c-format
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "Notez que dans cet exemple nous avons utilisé <literal>&lt;return-"
 "property&gt;</literal> en combinaison avec la syntaxe <literal>{}</literal> "
@@ -1048,7 +1049,7 @@
 "veulent référencer les colonnes et les propriétés."
 
 #. Tag: para
-#: query_sql.xml:444
+#: query_sql.xml:447
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1058,20 +1059,20 @@
 "discriminator&gt;</literal> pour spécifier la colonne discriminante."
 
 #. Tag: title
-#: query_sql.xml:450
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "Utilisation de procédures stockées pour les requêtes"
 
 #. Tag: para
-#: query_sql.xml:452
-#, no-c-format
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernate 3 introduit le support des requêtes via procédures stockées et les "
 "fonctions. La documentation suivante est valable pour les deux. Les "
@@ -1081,7 +1082,7 @@
 "stockée en Oracle 9 et version supérieure :"
 
 #. Tag: programlisting
-#: query_sql.xml:458
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1099,7 +1100,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:460
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
@@ -1107,7 +1108,7 @@
 "une requête nommée."
 
 #. Tag: programlisting
-#: query_sql.xml:463
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1128,30 +1129,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:465
-#, no-c-format
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "Notez que les procédures stockées retournent, pour le moment, seulement des "
 "scalaires et des entités. <literal>&lt;return-join&gt;</literal> et "
 "<literal>&lt;load-collection&gt;</literal> ne sont pas supportés."
 
 #. Tag: title
-#: query_sql.xml:470
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "Règles/limitations lors de l'utilisation des procédures stockées"
 
 #. Tag: para
-#: query_sql.xml:472
-#, no-c-format
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1165,20 +1166,20 @@
 "pour les procédures stockées."
 
 #. Tag: para
-#: query_sql.xml:479
-#, no-c-format
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "Les requêtes de procédures stockées ne peuvent pas être paginées avec "
 "<literal>setFirstResult()/setMaxResults()</literal>."
 
 #. Tag: para
-#: query_sql.xml:482
-#, no-c-format
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
@@ -1187,20 +1188,20 @@
 "parameters&gt;}</literal>. Native call syntax is not supported."
 
 #. Tag: para
-#: query_sql.xml:487
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "Pour Oracle les règles suivantes s'appliquent :"
 
 #. Tag: para
-#: query_sql.xml:491
-#, no-c-format
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "La procédure doit retourner un ensemble de résultats. Le prmeier paramètre "
 "d'une procédure doit être un <literal>OUT</literal> qui retourne un ensemble "
@@ -1209,19 +1210,19 @@
 "type <literal>REF CURSOR</literal>."
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "Pour Sybase ou MS SQL server les règles suivantes s'appliquent :"
 
 #. Tag: para
-#: query_sql.xml:504
-#, no-c-format
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "La procédure doit retourner un ensemble de résultats. Notez que comme ces "
 "serveurs peuvent retourner de multiples ensembles de résultats et mettre à "
@@ -1230,7 +1231,7 @@
 "reste sera ignoré."
 
 #. Tag: para
-#: query_sql.xml:512
+#: query_sql.xml:515
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1241,13 +1242,13 @@
 "obligation."
 
 #. Tag: title
-#: query_sql.xml:522
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "SQL personnalisé pour créer, mettre à jour et effacer"
 
 #. Tag: para
-#: query_sql.xml:524
+#: query_sql.xml:527
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1266,7 +1267,7 @@
 "<literal>&lt;sql-update&gt;</literal> surchargent ces chaînes de caractères :"
 
 #. Tag: programlisting
-#: query_sql.xml:532
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1282,12 +1283,12 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:534
-#, no-c-format
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "Le SQL est directement exécuté dans votre base de données, donc vous êtes "
 "libre d'utiliser le dialecte que vous souhaitez. Cela réduira bien sûr la "
@@ -1295,7 +1296,7 @@
 "de données."
 
 #. Tag: para
-#: query_sql.xml:538
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1305,7 +1306,7 @@
 "literal> est paramétré :"
 
 #. Tag: programlisting
-#: query_sql.xml:541
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1321,25 +1322,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:543
-#, no-c-format
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr ""
 "L'ordre des paramètres positionnels est actuellement vital, car ils doivent "
 "être dans la même séquence qu'Hibernate les attend."
 
 #. Tag: para
-#: query_sql.xml:546
-#, no-c-format
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "Vous pouvez voir l'ordre attendu en activant les journaux de debug pour le "
 "niveau <literal>org.hibernate.persister.entity</literal> level. Avec ce "
@@ -1350,14 +1351,13 @@
 "Hibernate.)"
 
 #. Tag: para
-#: query_sql.xml:553
-#, no-c-format
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "Les procédures stockées sont dans la plupart des cas (lire : il vaut mieux "
 "le faire) requises pour retourner le nombre de lignes insérées/mises à jour/"
@@ -1366,7 +1366,7 @@
 "expression comme un paramètre de sortie numérique pour les opérations CUD :"
 
 #. Tag: programlisting
-#: query_sql.xml:559
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1386,21 +1386,21 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:563
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "SQL personnalisé pour le chargement"
 
 #. Tag: para
-#: query_sql.xml:565
-#, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 "Vous pouvez aussi déclarer vos propres requêtes SQL (ou HQL) pour le "
 "chargement d'entité :"
 
 #. Tag: programlisting
-#: query_sql.xml:568
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1413,17 +1413,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:570
-#, no-c-format
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr ""
 "Ceci est juste une déclaration de requête nommée, comme vu plus tôt. Vous "
 "pouvez référencer cette requête nommée dans un mapping de classe :"
 
 #. Tag: programlisting
-#: query_sql.xml:573
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1436,20 +1436,20 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:575
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr "Ceci fonctionne même avec des procédures stockées."
 
 #. Tag: para
-#: query_sql.xml:577
-#, no-c-format
-msgid "You may even define a query for collection loading:"
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr ""
 "Vous pouvez même définir une requête pour le chargement d'une collection :"
 
 #. Tag: programlisting
-#: query_sql.xml:579
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1460,7 +1460,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:581
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1473,17 +1473,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:583
-#, no-c-format
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr ""
 "Vous pourriez même définir un chargeur d'entité qui charge une collection "
 "par jointure :"
 
 #. Tag: programlisting
-#: query_sql.xml:586
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,14 +18,14 @@
 
 #. Tag: para
 #: session_api.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "Hibernate est une solution de mapping objet/relationnel complète qui ne "
 "masque pas seulement au développpeur les détails du système de gestion de "
@@ -65,14 +65,14 @@
 
 #. Tag: para
 #: session_api.xml:56
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -88,14 +88,14 @@
 
 #. Tag: para
 #: session_api.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -111,7 +111,7 @@
 
 #. Tag: para
 #: session_api.xml:79
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -120,8 +120,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>Détaché</emphasis> - une instance détachée est un objet qui a été "
 "persistant, mais dont sa <literal>Session</literal> a été fermée. La "
@@ -136,9 +136,9 @@
 
 #. Tag: para
 #: session_api.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "Nous alons maintenant dicuster des états et des transitions d'état (et des "
@@ -176,14 +176,14 @@
 
 #. Tag: para
 #: session_api.xml:112
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -198,10 +198,10 @@
 
 #. Tag: para
 #: session_api.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -234,9 +234,9 @@
 
 #. Tag: para
 #: session_api.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr ""
 "Alternativement, vous pouvez assigner l'identifiant en utilisant une version "
@@ -257,11 +257,11 @@
 
 #. Tag: para
 #: session_api.xml:152
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -278,12 +278,12 @@
 
 #. Tag: para
 #: session_api.xml:162
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "Habituellement, vous ne vous préoccupez pas de ce détail, puisque vous "
@@ -301,12 +301,12 @@
 
 #. Tag: para
 #: session_api.xml:175
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "Les méthodes <literal>load()</literal> de <literal>Session</literal> vous "
 "donnent un moyen de récupérer une instance persistante si vous connaissez "
@@ -349,16 +349,16 @@
 
 #. Tag: para
 #: session_api.xml:192
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "Notez que <literal>load()</literal> lèvera une exception irrécupérable s'il "
 "n'y a pas de ligne correspondante dans la base de données. Si la classe est "
@@ -372,10 +372,10 @@
 
 #. Tag: para
 #: session_api.xml:203
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "Si vous n'êtes pas certain qu'une ligne correspondante existe, vous devriez "
@@ -397,9 +397,9 @@
 
 #. Tag: para
 #: session_api.xml:211
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -415,12 +415,12 @@
 
 #. Tag: para
 #: session_api.xml:218
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "Notez que n'importe quelles instances associées ou collections contenues "
 "<emphasis>ne sont pas</emphasis> sélectionnées par <literal>FOR UPDATE</"
@@ -451,12 +451,12 @@
 
 #. Tag: para
 #: session_api.xml:233
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "Une question importante apparaît généralement à ce point : combien (NdT : de "
 "données) Hibernate charge-t-il de la base de données et combient de "
@@ -472,12 +472,12 @@
 
 #. Tag: para
 #: session_api.xml:245
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -544,16 +544,16 @@
 
 #. Tag: para
 #: session_api.xml:266
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "Une requête est généralement exécutée en invoquant <literal>list()</"
 "literal>, le résultat de la requête sera chargée complètement dans une "
@@ -570,13 +570,13 @@
 
 #. Tag: para
 #: session_api.xml:280
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -620,10 +620,10 @@
 
 #. Tag: para
 #: session_api.xml:298
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "Les requêtes d'Hibernate retournent parfois des tuples d'objets, auquel cas "
 "chaque tuple est retourné comme un tableau :"
@@ -654,11 +654,11 @@
 
 #. Tag: para
 #: session_api.xml:310
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "Des requêtes peuvent spécifier une propriété d'une classe dans la clause "
 "<literal>select</literal>. Elles peuvent même appeler des fonctions "
@@ -693,13 +693,13 @@
 
 #. Tag: para
 #: session_api.xml:323
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "Des méthodes de <literal>Query</literal> sont fournies pour lier des valeurs "
 "à des paramètres nommés ou à des paramètres de style JDBC <literal>?</"
@@ -719,8 +719,8 @@
 
 #. Tag: para
 #: session_api.xml:339
-#, no-c-format
-msgid "they may occur multiple times in the same query"
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "ils peuvent apparaître plusieurs fois dans la même requête"
 
 #. Tag: para
@@ -772,11 +772,11 @@
 
 #. Tag: para
 #: session_api.xml:361
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "Si vous avez besoin de spécifier des liens sur votre ensemble de résultats "
 "(le nombre maximum de lignes que vous voulez récupérez et/ou la première "
@@ -811,12 +811,12 @@
 
 #. Tag: para
 #: session_api.xml:379
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "Si votre connecteur JDBC supporte les <literal>ResultSet</literal>s "
 "\"scrollables\", l'interface <literal>Query</literal> peut être utilisée "
@@ -855,10 +855,10 @@
 
 #. Tag: para
 #: session_api.xml:388
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "Notez qu'une connexion ouverte (et un curseur) est requise pour cette "
@@ -874,11 +874,11 @@
 
 #. Tag: para
 #: session_api.xml:399
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "Vous pouvez aussi définir des requêtes nommées dans le document de mapping. "
 "(Souvenez-vous d'utiliser une section <literal>CDATA</literal> si votre "
@@ -914,11 +914,11 @@
 
 #. Tag: para
 #: session_api.xml:413
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "Notez que le code réel du programme est indépendant du langage de requête "
 "qui est utilisé, vous pouvez aussi définir des requêtes SQL nativez dans les "
@@ -927,13 +927,13 @@
 
 #. Tag: para
 #: session_api.xml:419
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "UNTRANSLATED! Also note that a query declaration inside a <literal>&lt;"
 "hibernate-mapping&gt;</literal> element requires a global unique name for "
@@ -950,10 +950,10 @@
 
 #. Tag: para
 #: session_api.xml:433
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "Un <emphasis>filtre</emphasis> de collection est un type spécial de requête "
@@ -975,11 +975,11 @@
 
 #. Tag: para
 #: session_api.xml:441
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "La collection retournée est considérée comme un bag, et c'est une copie de "
 "la collection donnée. La collection originale n'est pas modifiée (c'est "
@@ -988,11 +988,11 @@
 
 #. Tag: para
 #: session_api.xml:447
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "Observez que les filtres ne nécessitent pas une clause <literal>from</"
 "literal> (bien qu'ils puissent en avoir une si besoin est). Les filtres ne "
@@ -1010,10 +1010,10 @@
 
 #. Tag: para
 #: session_api.xml:454
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "Même une requête de filtre vide est utile, par exemple pour charger un sous-"
 "ensemble d'éléments dans une énorme collection :"
@@ -1036,10 +1036,10 @@
 
 #. Tag: para
 #: session_api.xml:466
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1077,13 +1077,13 @@
 
 #. Tag: para
 #: session_api.xml:484
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "Vous pouvez exprimer une requête en SQL, en utilisant <literal>createSQLQuery"
 "()</literal> et laisser Hibernate s'occuper du mapping des résultats vers "
@@ -1117,9 +1117,9 @@
 
 #. Tag: para
 #: session_api.xml:496
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1136,17 +1136,17 @@
 
 #. Tag: para
 #: session_api.xml:509
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "Les <emphasis>instances persistantes transactionnelles</emphasis> (c'est-à-"
 "dire des objets chargés, sauvegardés, créés ou requêtés par la "
@@ -1172,13 +1172,12 @@
 
 #. Tag: para
 #: session_api.xml:522
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "Parfois ce modèle de programmation est inefficace puisqu'il nécessiterait un "
 "<literal>SELECT</literal> SQL (pour charger l'objet) et un <literal>UPDATE</"
@@ -1186,19 +1185,19 @@
 "Aussi Hibernate offre une autre approche, en utilisant des instances "
 "détachées."
 
-#. Tag: emphasis
-#: session_api.xml:530
+#. Tag: para
+#: session_api.xml:529
 #, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "Notez que Hibernate n'offre par sa propre API pour l'exécution directe "
@@ -1213,13 +1212,13 @@
 "pour les astuces possibles d'opérations groupées."
 
 #. Tag: title
-#: session_api.xml:545
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "Modifier des objets détachés"
 
 #. Tag: para
-#: session_api.xml:547
+#: session_api.xml:548
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1236,7 +1235,7 @@
 "versionnées pour assurer l'isolation pour les \"longues\" unités de travail."
 
 #. Tag: para
-#: session_api.xml:554
+#: session_api.xml:555
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1248,7 +1247,7 @@
 "<literal>Session.merge()</literal> :"
 
 #. Tag: programlisting
-#: session_api.xml:560
+#: session_api.xml:561
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1265,7 +1264,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:562
+#: session_api.xml:563
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1277,16 +1276,16 @@
 "l'application a essayé de le réattacher, une exception aurait été levée."
 
 #. Tag: para
-#: session_api.xml:568
-#, no-c-format
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "Utilisez <literal>update()</literal> si vous êtes sure que la session ne "
 "contient pas déjà une instance persistante avec le même identifiant, et "
@@ -1298,14 +1297,14 @@
 "exécutée."
 
 #. Tag: para
-#: session_api.xml:577
-#, no-c-format
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "L'application devrait individuellement <literal>update()</literal> (NdT : "
 "mettre à jour) les instances détachées accessibles depuis l'instance "
@@ -1315,19 +1314,19 @@
 "\"objectstate-transitive\"/>."
 
 #. Tag: para
-#: session_api.xml:584
-#, no-c-format
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "La méthode <literal>lock()</literal> permet aussi à une application de "
 "réassocier un objet avec une nouvelle session. Pourtant, l'instance détachée "
 "doit être non modifiée !"
 
 #. Tag: programlisting
-#: session_api.xml:589
+#: session_api.xml:590
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1339,11 +1338,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:591
-#, no-c-format
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1354,7 +1353,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:598
+#: session_api.xml:599
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1364,13 +1363,13 @@
 "linkend=\"transactions-optimistic\"/>."
 
 #. Tag: title
-#: session_api.xml:605
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "Détection automatique d'un état"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:608
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1385,7 +1384,7 @@
 "literal> implémente cette fonctionnalité."
 
 #. Tag: programlisting
-#: session_api.xml:614
+#: session_api.xml:615
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1403,7 +1402,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:616
+#: session_api.xml:617
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1421,7 +1420,7 @@
 "applications n'utiliseront jamais ces méthodes."
 
 #. Tag: para
-#: session_api.xml:624
+#: session_api.xml:625
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1431,31 +1430,31 @@
 "literal> sont utilisées dans le scénario suivant :"
 
 #. Tag: para
-#: session_api.xml:631
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "l'application charge un objet dans la première session"
 
 #. Tag: para
-#: session_api.xml:636
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "l'objet est passé à la couche utilisateur"
 
 #. Tag: para
-#: session_api.xml:641
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "certaines modifications sont effectuées sur l'objet"
 
 #. Tag: para
-#: session_api.xml:646
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "l'objet est retourné à la couche logique métier"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:652
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1465,19 +1464,19 @@
 "literal> dans une seconde sessin"
 
 #. Tag: para
-#: session_api.xml:658
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal> s'utilise dans le cas suivant :"
 
 #. Tag: para
-#: session_api.xml:664
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr "si l'objet est déjà persistant dans cette session, ne rien faire"
 
 #. Tag: para
-#: session_api.xml:669
+#: session_api.xml:670
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1487,7 +1486,7 @@
 "exception"
 
 #. Tag: para
-#: session_api.xml:675
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
@@ -1495,7 +1494,7 @@
 "literal>"
 
 #. Tag: para
-#: session_api.xml:680
+#: session_api.xml:681
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1505,11 +1504,11 @@
 "instancié, appeler <literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:686
-#, no-c-format
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1519,19 +1518,19 @@
 "instancié, appeler <literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:694
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr "sinon mettre à jour l'objet avec <literal>update()</literal>"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "et <literal>merge()</literal> est très différent :"
 
 #. Tag: para
-#: session_api.xml:706
+#: session_api.xml:707
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1543,7 +1542,7 @@
 "persistante"
 
 #. Tag: para
-#: session_api.xml:713
+#: session_api.xml:714
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1554,13 +1553,13 @@
 "persistante"
 
 #. Tag: para
-#: session_api.xml:719
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "l'instance persistante est retournée"
 
 #. Tag: para
-#: session_api.xml:724
+#: session_api.xml:725
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1569,19 +1568,19 @@
 "l'instance donnée ne devient pas associée à la session, elle reste détachée"
 
 #. Tag: title
-#: session_api.xml:734
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "Suppression d'objets persistants"
 
 #. Tag: para
-#: session_api.xml:736
-#, no-c-format
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "<literal>Session.delete()</literal> supprimera l'état d'un objet de la base "
 "de données. Bien sûr, votre application pourrait encore conserver une "
@@ -1589,19 +1588,19 @@
 "literal> comme rendant une instance persistante éphémère."
 
 #. Tag: programlisting
-#: session_api.xml:743
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:745
-#, no-c-format
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "Vous pouvez effacer des objets dans l'ordre que vous voulez, sans risque de "
 "violations de contrainte de clef étrangère. Il est encore possible de violer "
@@ -1610,16 +1609,16 @@
 "parent, mais oubliez d'effacer les enfants."
 
 #. Tag: title
-#: session_api.xml:756
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "Réplication d'objets entre deux entrepôts de données"
 
 #. Tag: para
-#: session_api.xml:758
-#, no-c-format
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1628,7 +1627,7 @@
 "regénérer les valeurs des identifiants."
 
 #. Tag: programlisting
-#: session_api.xml:764
+#: session_api.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1647,51 +1646,51 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:766
-#, no-c-format
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "Le <literal>ReplicationMode</literal> détermine comment <literal>replicate()"
 "</literal> traitera les conflits avec les lignes existantes dans la base de "
 "données."
 
 #. Tag: para
-#: session_api.xml:773
-#, no-c-format
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.IGNORE</literal> - ignore l'objet s'il y a une "
 "ligne existante dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:779
-#, no-c-format
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.OVERWRITE</literal> - écrase n'importe quelle ligne "
 "existante dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:785
-#, no-c-format
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.EXCEPTION</literal> - lève une exception s'il y une "
 "ligne dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:791
-#, no-c-format
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1700,7 +1699,7 @@
 "ignore l'objet sinon"
 
 #. Tag: para
-#: session_api.xml:799
+#: session_api.xml:800
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1715,19 +1714,19 @@
 "ACID, et plus."
 
 #. Tag: title
-#: session_api.xml:808
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Flush de la session"
 
 #. Tag: para
-#: session_api.xml:810
-#, no-c-format
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "De temps en temps la <literal>Session</literal> exécutera les expressions "
 "SQL requises pour syncrhoniser l'état de la connexion JDBC avec l'état des "
@@ -1735,69 +1734,69 @@
 "par défaut aux points suivants :"
 
 #. Tag: para
-#: session_api.xml:819
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr "lors de certaines exécutions de requête"
 
 #. Tag: para
-#: session_api.xml:824
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr ""
 "lors d'un appel à <literal>org.hibernate.Transaction.commit()</literal>"
 
 #. Tag: para
-#: session_api.xml:829
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "lors d'un appel à <literal>Session.flush()</literal>"
 
 #. Tag: para
-#: session_api.xml:835
-#, no-c-format
-msgid "The SQL statements are issued in the following order"
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "Les expressions SQL sont effectuées dans l'ordre suivant :"
 
 #. Tag: para
-#: session_api.xml:841
-#, no-c-format
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "insertion des entités, dans le même ordre que celui des objets "
 "correspondants sauvegardés par l'appel à <literal>Session.save()</literal>"
 
 #. Tag: para
-#: session_api.xml:847
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr "mise à jours des entités"
 
 #. Tag: para
-#: session_api.xml:852
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr "suppression des collections"
 
 #. Tag: para
-#: session_api.xml:857
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "suppression, mise à jour et insertion des éléments des collections"
 
 #. Tag: para
-#: session_api.xml:862
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr "insertion des collections"
 
 #. Tag: para
-#: session_api.xml:867
-#, no-c-format
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "suppression des entités, dans le même ordre que celui des objets "
@@ -1805,25 +1804,24 @@
 "</literal>"
 
 #. Tag: para
-#: session_api.xml:874
-#, no-c-format
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(Une exception est que des objets utilisant la génération <literal>native</"
 "literal> d'identifiants sont insérés lorsqu'ils sont sauvegardés.)"
 
 #. Tag: para
-#: session_api.xml:879
-#, no-c-format
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "Excepté lorsque vous appelez <literal>flush()</literal> explicitement, il "
 "n'y absolument aucune garantie à propos de <emphasis>quand</emphasis> la "
@@ -1833,17 +1831,17 @@
 "jamais de données périmées, ni des données fausses."
 
 #. Tag: para
-#: session_api.xml:887
-#, no-c-format
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "Il est possible de changer le comportement par défaut, donc que le flush se "
 "produise moins fréquemment. La classe <literal>FlushMode</literal> définit "
@@ -1856,7 +1854,7 @@
 "moment (voir <xref linkend=\"transactions-optimistic-longsession\"/>)."
 
 #. Tag: programlisting
-#: session_api.xml:897
+#: session_api.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1876,7 +1874,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:899
+#: session_api.xml:900
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1890,13 +1888,13 @@
 "d'Hibernate, nous le traitons dans <xref linkend=\"transactions\"/>."
 
 #. Tag: title
-#: session_api.xml:908
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "Persistance transitive"
 
 #. Tag: para
-#: session_api.xml:910
+#: session_api.xml:911
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1908,17 +1906,17 @@
 "est une relation parent/enfant. Considérez l'exemple suivant :"
 
 #. Tag: para
-#: session_api.xml:916
-#, no-c-format
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "Si les enfants de la relation parent/enfant étaient des types de valeur (par "
 "exemple, une collection d'adresses ou de chaînes de caractères), leur cycle "
@@ -1932,12 +1930,12 @@
 "données."
 
 #. Tag: para
-#: session_api.xml:927
-#, no-c-format
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1953,7 +1951,7 @@
 "accessibilité</emphasis> par défaut."
 
 #. Tag: para
-#: session_api.xml:936
+#: session_api.xml:937
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1973,29 +1971,29 @@
 "l'indiquer dans le document de mapping. Par exemple :"
 
 #. Tag: programlisting
-#: session_api.xml:945
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:947
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "Les styles de cascade peuvent être combinés :"
 
 #. Tag: programlisting
-#: session_api.xml:951
+#: session_api.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:953
-#, no-c-format
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -2006,7 +2004,7 @@
 "literal> spécifie qu'aucune opération ne sera cascadée."
 
 #. Tag: para
-#: session_api.xml:959
+#: session_api.xml:960
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -2020,16 +2018,16 @@
 "qui est supprimé de l'association."
 
 #. Tag: para
-#: session_api.xml:966
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr "Recommandations :"
 
 #. Tag: para
-#: session_api.xml:972
-#, no-c-format
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -2041,7 +2039,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:980
+#: session_api.xml:981
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -2053,7 +2051,7 @@
 "spécifiant <literal>cascade=\"all,delete-orphan\"</literal>."
 
 #. Tag: para
-#: session_api.xml:987
+#: session_api.xml:988
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -2068,7 +2066,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:995
+#: session_api.xml:996
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -2083,12 +2081,12 @@
 "jour/suppression de l'enfant ou des enfants."
 
 #. Tag: para
-#: session_api.xml:1001
-#, no-c-format
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -2103,7 +2101,7 @@
 "opérations de cascade pour une relation parent/enfant est la suivante :"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1013
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -2113,7 +2111,7 @@
 "passés à <literal>persist()</literal>"
 
 #. Tag: para
-#: session_api.xml:1018
+#: session_api.xml:1019
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -2123,7 +2121,7 @@
 "passés à <literal>merge()</literal>"
 
 #. Tag: para
-#: session_api.xml:1024
+#: session_api.xml:1025
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2135,7 +2133,7 @@
 "à <literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1030
+#: session_api.xml:1031
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2145,7 +2143,7 @@
 "il est passé à <literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1036
+#: session_api.xml:1037
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2155,7 +2153,7 @@
 "literal>"
 
 #. Tag: para
-#: session_api.xml:1041
+#: session_api.xml:1042
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2169,13 +2167,13 @@
 "literal> soit paramétré, au quel cas l'enfant \"orphelin\" est supprimé."
 
 #. Tag: para
-#: session_api.xml:1050
-#, no-c-format
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2188,21 +2186,21 @@
 "associées atteignables lors du flush de la <literal>Session</literal>."
 
 #. Tag: title
-#: session_api.xml:1062
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr "Utilisation des méta-données"
 
 #. Tag: para
-#: session_api.xml:1064
-#, no-c-format
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "Hibernate requiert un modèle de méta-niveau très riche de toutes les entités "
 "et types valués. De temps en temps, ce modèle est très utile à l'application "
@@ -2214,12 +2212,12 @@
 "associées)."
 
 #. Tag: para
-#: session_api.xml:1071
-#, no-c-format
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "Hibernate expose les méta-données via les interfaces <literal>ClassMetadata</"
@@ -2228,7 +2226,7 @@
 "peuvent être obtenues à partir de la <literal>SessionFactory</literal>."
 
 #. Tag: programlisting
-#: session_api.xml:1078
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: para
 #: toolset_guide.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "Des outils en ligne de commande, des plugins Eclipse ainsu que des tâches "
 "Ant permettent de gérer de cycles de développement complet de projets "
@@ -29,9 +29,9 @@
 
 #. Tag: para
 #: toolset_guide.xml:36
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -41,12 +41,12 @@
 
 #. Tag: para
 #: toolset_guide.xml:42
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>Mapping Editor :</emphasis> un éditeur pour les fichiers de "
 "mapping XML Hibernate, supportant l'auto-complétion et la mise en valeur de "
@@ -56,13 +56,13 @@
 
 #. Tag: para
 #: toolset_guide.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>Console :</emphasis> la console est une nouvelle vue d'Eclipse. En "
 "plus de la vue d'ensemble arborescente de vos configurations de console, "
@@ -72,14 +72,13 @@
 
 #. Tag: para
 #: toolset_guide.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>Development Wizards :</emphasis> plusieurs assistants sont fournis "
 "avec les outils d'Hibernate pour Eclipse ; vous pouvez utiliser un assistant "
@@ -88,17 +87,11 @@
 "et les sources des POJOs à partir d'un schéma de base de données existant. "
 "L'assistant d'ingénierie inverse supporte les modèles utilisateur."
 
-#. Tag: emphasis
-#: toolset_guide.xml:62
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr "Tâches Ant :"
-
 #. Tag: para
 #: toolset_guide.xml:67
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "Veuillez-vous référer au paquet <emphasis>outils Hibernate</emphasis> et sa "
@@ -106,11 +99,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:72
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "Pourtant, le paquet principal d'Hibernate arrive avec un lot d'outils "
 "intégrés (il peut même être utilisé de \"l'intérieur\" d'Hibernate à la "
@@ -125,11 +118,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:81
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "La DDL peut être générée à partir de vos fichiers de mapping par un "
@@ -140,11 +133,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:88
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "Vous <emphasis>devez</emphasis> spécifier un <literal>Dialect</literal> SQL "
 "via la propriété <literal>hibernate.dialect</literal> lors de l'utilisation "
@@ -152,8 +145,10 @@
 
 #. Tag: para
 #: toolset_guide.xml:94
-#, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr ""
 "D'abord, personnalisez vos fichiers de mapping pour améliorer le schéma "
 "généré."
@@ -166,11 +161,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:101
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "Plusieurs éléments du mapping hibernate définissent des attributs optionnels "
@@ -192,12 +187,12 @@
 
 #. Tag: para
 #: toolset_guide.xml:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "Certains éléments acceptent aussi un attribut <literal>not-null</literal> "
 "(utilisé pour générer les contraintes de colonnes <literal>NOT NULL</"
@@ -221,13 +216,13 @@
 
 #. Tag: para
 #: toolset_guide.xml:121
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "Un attribut <literal>unique-key</literal> peut être utilisé pour grouper les "
 "colonnes en une seule contrainte d'unicité. Actuellement, la valeur "
@@ -246,11 +241,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:131
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "Un attribut <literal>index</literal> indique le nom d'un index qui sera créé "
 "en utilisant la ou les colonnes mappées. Plusieurs colonnes peuvent être "
@@ -266,9 +261,9 @@
 
 #. Tag: para
 #: toolset_guide.xml:139
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "Un attribut <literal>foreign-key</literal> peut être utilisé pour surcharger "
@@ -307,11 +302,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:153
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "L'attribut <literal>default</literal> vous laisse spécifier une valeur par "
 "défaut pour une colonnes (vous devriez assigner la même valeur à la "
@@ -384,152 +379,158 @@
 "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:180
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
 #. Tag: entry
-#: toolset_guide.xml:187
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr "Attribut"
 
 #. Tag: entry
-#: toolset_guide.xml:188
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr "Valeur"
 
 #. Tag: entry
-#: toolset_guide.xml:189
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr "Interprétation"
 
 #. Tag: literal
-#: toolset_guide.xml:194
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr "numérique"
 
 #. Tag: entry
-#: toolset_guide.xml:196
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr "taille d'une colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:199
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:201
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr "précision décimale de la colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:204
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:206
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr "scale décimale de la colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:209
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:210 toolset_guide.xml:215
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:211
-#, no-c-format
-msgid "specfies that the column should be non-nullable"
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "spécifie que la colonne doit être non-nulle"
 
 #. Tag: literal
-#: toolset_guide.xml:214
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:216
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "spécifie que la colonne doit avoir une contrainte d'unicité"
 
 #. Tag: literal
-#: toolset_guide.xml:219
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:220
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:221
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "spécifie le nom d'un index (multi-colonnes)"
 
 #. Tag: literal
-#: toolset_guide.xml:224
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:226
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "spécifie le nom d'une contrainte d'unicité multi-colonnes"
 
 #. Tag: literal
-#: toolset_guide.xml:229
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:230
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:231
+#: toolset_guide.xml:233
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -545,19 +546,19 @@
 "6/>."
 
 #. Tag: literal
-#: toolset_guide.xml:241
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:242
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL column_type"
 
 #. Tag: entry
-#: toolset_guide.xml:243
+#: toolset_guide.xml:245
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -567,13 +568,13 @@
 "uniquement)"
 
 #. Tag: literal
-#: toolset_guide.xml:249
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:250 toolset_guide.xml:257
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, fuzzy, no-c-format
 msgid "SQL expression"
 msgstr ""
@@ -583,25 +584,25 @@
 "SQL expression"
 
 #. Tag: entry
-#: toolset_guide.xml:251
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "spécifie une valeur par défaut pour la colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:256
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:258
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr "crée une contrainte de vérification sur la table ou la colonne"
 
 #. Tag: para
-#: toolset_guide.xml:266
+#: toolset_guide.xml:268
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -611,7 +612,7 @@
 "commentaire pour le schéma généré."
 
 #. Tag: programlisting
-#: toolset_guide.xml:271
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -621,7 +622,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:273
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -632,23 +633,23 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:275
-#, no-c-format
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "Ceci a pour résultat une expression <literal>comment on table</literal> ou "
 "<literal>comment on column</literal> dans la DDL générée (où supportée)."
 
 #. Tag: title
-#: toolset_guide.xml:284
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr "Exécuter l'outil"
 
 #. Tag: para
-#: toolset_guide.xml:286
+#: toolset_guide.xml:288
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -658,7 +659,15 @@
 "standard et/ou exécute les ordres DDL."
 
 #. Tag: para
-#: toolset_guide.xml:291
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr "<literal>SchemaExport</literal> Options de la ligne de commande"
+
+#. Tag: para
+#: toolset_guide.xml:295
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -667,34 +676,34 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:297
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr "<literal>SchemaExport</literal> Options de la ligne de commande"
 
 #. Tag: entry
-#: toolset_guide.xml:303 toolset_guide.xml:453 toolset_guide.xml:522
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr "Option"
 
 #. Tag: entry
-#: toolset_guide.xml:304 toolset_guide.xml:391 toolset_guide.xml:454
-#: toolset_guide.xml:523
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:459
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:310 toolset_guide.xml:460
+#: toolset_guide.xml:314 toolset_guide.xml:464
 #, fuzzy, no-c-format
-msgid "don't output the script to stdout"
+msgid "do not output the script to stdout"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "ne pas écrire le script vers la sortie standard\n"
@@ -702,85 +711,85 @@
 "ne pas écrire vers la sortie standard"
 
 #. Tag: literal
-#: toolset_guide.xml:313
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:314
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr "supprime seuleument les tables"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr "ne créé que les tables"
 
 #. Tag: literal
-#: toolset_guide.xml:321 toolset_guide.xml:463
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:322
-#, no-c-format
-msgid "don't export to the database"
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "ne pas exécuter sur la base de données"
 
 #. Tag: literal
-#: toolset_guide.xml:325
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:326
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "écrit le script ddl vers un fichier"
 
 #. Tag: literal
-#: toolset_guide.xml:329 toolset_guide.xml:467 toolset_guide.xml:528
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
 #. Tag: entry
-#: toolset_guide.xml:330 toolset_guide.xml:468 toolset_guide.xml:529
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "dans <literal>hibernate.properties</literal>"
 
 #. Tag: literal
-#: toolset_guide.xml:333 toolset_guide.xml:475 toolset_guide.xml:536
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:334
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "lit la configuration Hibernate à partir d'un fichier XML"
 
 #. Tag: literal
-#: toolset_guide.xml:337 toolset_guide.xml:471 toolset_guide.xml:532
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
 #. Tag: entry
-#: toolset_guide.xml:338 toolset_guide.xml:472 toolset_guide.xml:533
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -792,39 +801,39 @@
 "lit les propriétés dela base de données depuis un fichier de propriétés"
 
 #. Tag: literal
-#: toolset_guide.xml:341
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:342
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "formatte proprement le SQL généré dans le script"
 
 #. Tag: literal
-#: toolset_guide.xml:345
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=x"
 
 #. Tag: entry
-#: toolset_guide.xml:346
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "paramètre un délimiteur de fin de ligne pour le script"
 
 #. Tag: para
-#: toolset_guide.xml:352
-#, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 "Vous pouvez même intégrer <literal>SchemaExport</literal> dans votre "
 "application :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:356
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -832,19 +841,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:361
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr "Propriétés"
 
 #. Tag: para
-#: toolset_guide.xml:363
-#, no-c-format
-msgid "Database properties may be specified"
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "Les propriétés de la base de données peuvent être spécifiées"
 
 #. Tag: para
-#: toolset_guide.xml:369
+#: toolset_guide.xml:373
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -854,104 +863,104 @@
 "</emphasis>"
 
 #. Tag: para
-#: toolset_guide.xml:372
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "dans <literal>hibernate.properties</literal>"
 
 #. Tag: para
-#: toolset_guide.xml:375
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
 "dans un fichier de propriétés déclaré avec <literal>--properties</literal>"
 
 #. Tag: para
-#: toolset_guide.xml:379
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "Les propriétés nécessaires sont :"
 
 #. Tag: title
-#: toolset_guide.xml:384
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport Connection Properties"
 
 #. Tag: entry
-#: toolset_guide.xml:390
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr "Nom de la propriété"
 
 #. Tag: literal
-#: toolset_guide.xml:396
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:397
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "classe du driver JDBC"
 
 #. Tag: literal
-#: toolset_guide.xml:400
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:401
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr "URL JDBC"
 
 #. Tag: literal
-#: toolset_guide.xml:404
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:405
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr "utilisateur de la base de données"
 
 #. Tag: literal
-#: toolset_guide.xml:408
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:409
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr "mot de passe de l'utilisateur"
 
 #. Tag: literal
-#: toolset_guide.xml:412
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:413
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr "dialecte"
 
 #. Tag: title
-#: toolset_guide.xml:422
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr "Utiliser Ant"
 
 #. Tag: para
-#: toolset_guide.xml:424
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
@@ -960,7 +969,7 @@
 "construction Ant :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:428
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -983,19 +992,18 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:433
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "Mises à jour incrémentales du schéma"
 
 #. Tag: para
-#: toolset_guide.xml:435
-#, no-c-format
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "L'outil <literal>SchemaUpdate</literal> mettra à jour un schéma existant en "
 "effectuant les changement par \"incrément\". Notez que "
@@ -1003,7 +1011,7 @@
 "ne fonctionnera donc pas avec tous les drivers JDBC."
 
 #. Tag: para
-#: toolset_guide.xml:441
+#: toolset_guide.xml:445
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1012,19 +1020,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:447
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal> Options de ligne de commande"
 
 #. Tag: entry
-#: toolset_guide.xml:464
-#, no-c-format
-msgid "don't export the script to the database"
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "ne pas exporter vers la base de données"
 
 #. Tag: entry
-#: toolset_guide.xml:476 toolset_guide.xml:537
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
@@ -1034,14 +1042,14 @@
 "indique un fichier <placeholder-1/>"
 
 #. Tag: para
-#: toolset_guide.xml:482
-#, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 "Vous pouvez intégrer <literal>SchemaUpdate</literal> dans votre application :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:486
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1049,20 +1057,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:491
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "Utiliser Ant pour des mises à jour de schéma par incrément"
 
 #. Tag: para
-#: toolset_guide.xml:493
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 "Vous pouvez appeler <literal>SchemaUpdate</literal> depuis le script Ant :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:497
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1081,20 +1089,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:502
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr "Validation du schéma"
 
 #. Tag: para
-#: toolset_guide.xml:504
-#, no-c-format
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "L'outil <literal>SchemaValidator</literal> validera que le schéma existant "
 "correspond à vos documents de mapping. Notez que le "
@@ -1103,7 +1111,7 @@
 "utile pour tester."
 
 #. Tag: para
-#: toolset_guide.xml:510
+#: toolset_guide.xml:514
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1111,22 +1119,30 @@
 "<emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal> Options de ligne de commande"
+
 #. Tag: title
-#: toolset_guide.xml:516
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> Options de ligne de commande"
 
 #. Tag: para
-#: toolset_guide.xml:543
-#, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr ""
 "Vous pouvez inclure <literal>SchemaValidator</literal> dans votre "
 "application:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:547
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1134,20 +1150,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:552
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "Utiliser Ant pour la validation du Schéma"
 
 #. Tag: para
-#: toolset_guide.xml:554
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr ""
 "Vous pouvez appeler <literal>SchemaValidator</literal> depuis le script Ant:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:558
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
@@ -1164,6 +1180,9 @@
 "</target>]]>"
 msgstr ""
 
+#~ msgid "Ant Tasks:"
+#~ msgstr "Tâches Ant :"
+
 #~ msgid "&lt;one-to-one&gt;"
 #~ msgstr "&lt;one-to-one&gt;"
 

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,18 +12,18 @@
 
 #. Tag: title
 #: transactions.xml:29
-#, no-c-format
-msgid "Transactions And Concurrency"
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "Transactions et accès concurrents"
 
 #. Tag: para
 #: transactions.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "L'un des principaux avantages du mécanisme de contrôle des accès concurrents "
@@ -35,14 +35,13 @@
 
 #. Tag: para
 #: transactions.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "Hibernate ne vérouille pas vos objets en mémoire. Votre application peut "
 "suivre le comportement défini par le niveau d'isolation de vos transactions "
@@ -53,12 +52,12 @@
 
 #. Tag: para
 #: transactions.xml:46
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "En addition au versionning pour le controle automatique de concurrence, "
 "Hibernate fournit une API (mineure) pour le verrouillage perssimiste des "
@@ -68,9 +67,9 @@
 
 #. Tag: para
 #: transactions.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -89,12 +88,12 @@
 
 #. Tag: para
 #: transactions.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "Il est important de savoir qu'un objet <literal>SessionFactory</literal> est "
 "un objet complexe et optimisé pour fonctionner avec les threads(thread- "
@@ -104,13 +103,13 @@
 
 #. Tag: para
 #: transactions.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "Un objet <literal>Session</literal> est relativement simple et n'est "
 "threadsafe. Il est également peu coûteux à créer. Il devrait n'être utilisé "
@@ -122,14 +121,13 @@
 
 #. Tag: para
 #: transactions.xml:76
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "Afin de compléter ce tableau, vous devez également penser aux transactions "
 "de base de données. Une transaction de base de données se doit d'être la "
@@ -141,14 +139,14 @@
 "ce que l'unité de travail soit achevée."
 
 #. Tag: para
-#: transactions.xml:85
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "Maintenant, comment délimiter une unité de travail? Est-ce qu'une instance "
 "de <literal>Session</literal> peut avoir une durée de vie dépassant "
@@ -158,28 +156,43 @@
 "transactions à la base de données?"
 
 #. Tag: title
-#: transactions.xml:93
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "Unité de travail"
 
 #. Tag: para
-#: transactions.xml:95
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "Il est important de mentionner que d'utiliser un paradigme <emphasis>session-"
@@ -203,19 +216,19 @@
 "faire évoluer."
 
 #. Tag: para
-#: transactions.xml:111
+#: transactions.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is sent to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "Le pattern d'utilisation le plus fréquemment rencontré dans des applications "
 "clients serveur multi-usagers est le <emphasis>session-per-request</"
@@ -233,20 +246,20 @@
 "majorité des applications."
 
 #. Tag: para
-#: transactions.xml:123
+#: transactions.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is sent to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "Le défi réside dans l'implémentation. Hibernate fournit une fonction de "
 "gestion de la \"session courante\" pour simplifier ce pattern. Tout ce que "
@@ -263,15 +276,14 @@
 "facilité l'utilisation et la portabilité du code."
 
 #. Tag: para
-#: transactions.xml:136
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "Votre application peut accéder la \"session courante\" pour exécuter une "
 "requête en invoquant simplement <literal>sessionFactory.getCurrentSession()</"
@@ -282,19 +294,18 @@
 "\"architecture-current-session\"/>."
 
 #. Tag: para
-#: transactions.xml:144
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "Il est parfois utile d'étendre le scope d'une <literal>Session</literal> et "
 "d'une transaction à la base de données jusqu'à ce que \"la vue soit rendue"
@@ -309,20 +320,20 @@
 "emphasis> pattern.."
 
 #. Tag: title
-#: transactions.xml:159
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "Longue conversation"
 
 #. Tag: para
-#: transactions.xml:161
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "Le paradigme <emphasis>session-per-request</emphasis> n'est pas le seul "
 "élément à utiliser dans le design de vos unités de travail. Plusieurs "
@@ -333,10 +344,10 @@
 "Considérez l'exemple suivant:"
 
 #. Tag: para
-#: transactions.xml:171
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -345,12 +356,12 @@
 "transaction de base de données. L'usager est libre de modifier ces objets."
 
 #. Tag: para
-#: transactions.xml:178
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "L'usager clique \"Sauvegarder\" après 5 minutes et souhaite persister les "
 "modifications qu'il a apportées. Il s'attend à être la seule personne a "
@@ -358,13 +369,12 @@
 "produite durant ce laps de temps."
 
 #. Tag: para
-#: transactions.xml:186
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "Ceci s'appelle une unité de travail. Du point de vue de l'utilisateur: une "
 "<emphasis>conversation</emphasis> (ou <emphasis>transaction d'application</"
@@ -372,14 +382,14 @@
 "application."
 
 #. Tag: para
-#: transactions.xml:192
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "Une première implémentation naïve pourrait consister à garder la "
 "<literal>Session</literal> et la transaction à la base de données ouvertes "
@@ -391,17 +401,17 @@
 "de gérer un grand nombre d'usagers concurrents."
 
 #. Tag: para
-#: transactions.xml:200
+#: transactions.xml:214
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"conversation. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "Il apparaît donc évident qu'il faille utiliser plusieurs transactions BDD "
 "afin d'implémenter la conversation. Dans ce cas, maintenir l'isolation des "
@@ -415,13 +425,13 @@
 "certaines fonctionnalités d'Hibernate:"
 
 #. Tag: para
-#: transactions.xml:213
+#: transactions.xml:227
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occurred during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>Versionnage Automatique</emphasis> - Hibernate peut gérer "
 "automatiquement les accès concurrents de manière optimiste et détecter si "
@@ -429,15 +439,15 @@
 "d'un usager."
 
 #. Tag: para
-#: transactions.xml:221
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>Objets Détachés</emphasis> - Si vous décidez d'utiliser le "
 "paradigme <emphasis>session-par-requête</emphasis> discuté plus haut, toutes "
@@ -449,17 +459,17 @@
 "automatique est utilisé afin d'isoler les modifications concurrentes."
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:245
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitly."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>Session Longues (conversation)</emphasis> - Une <literal>Session</"
 "literal> Hibernate peut être déconnectée de la couche JDBC sous-jacente "
@@ -470,13 +480,13 @@
 "automatique est utilisé afin d'isoler les modifications concurrentes."
 
 #. Tag: para
-#: transactions.xml:244
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "Les deux patterns <emphasis>session-per-request-with- detached- objects</"
 "emphasis> (session-par-requête-avec-objets- détachés) et <emphasis>session-"
@@ -485,19 +495,19 @@
 "section au sujet du contrôle optimiste de concurrence."
 
 #. Tag: title
-#: transactions.xml:253
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "L'identité des objets"
 
 #. Tag: para
-#: transactions.xml:255
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "Une application peut accéder à la même entité persistante de manière "
 "concurrente dans deux <literal>Session</literal> s différentes. Toutefois, "
@@ -506,41 +516,41 @@
 "donc deux notions de l'identité d'un objet:"
 
 #. Tag: term
-#: transactions.xml:264
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "Identité BD"
 
 #. Tag: literal
-#: transactions.xml:267
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:272
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "Identité JVM"
 
 #. Tag: literal
-#: transactions.xml:275
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:281
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "Ainsi, pour des objets attachés à une <literal>Session</"
 "literal><emphasis>précise</emphasis> (dans la cadre d'exécution (scope) "
@@ -554,16 +564,16 @@
 "literal> est appelé."
 
 #. Tag: para
-#: transactions.xml:290
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "Cette approche permet de reléguer à Hibernate et à la base de données sous-"
 "jacente le soin de gérer les problèmes d'accès concurrents. Cette manière de "
@@ -577,28 +587,29 @@
 "<literal>== </literal> pour comparer des objets."
 
 #. Tag: para
-#: transactions.xml:299
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "Une application qui utiliserait <literal>==</literal> à l'extérieur du cadre "
 "d'exécution d'une <literal>Session</literal> pourrait obtenir des résultats "
@@ -625,19 +636,19 @@
 "l'identité et de l'égalité en Java."
 
 #. Tag: title
-#: transactions.xml:320
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "Problèmes communs"
 
 #. Tag: para
-#: transactions.xml:322
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "Bien qu'il puisse y avoir quelques rares exceptions à cette règle, il est "
@@ -649,17 +660,17 @@
 "implications de chacun des patterns avant de prendre votre décision."
 
 #. Tag: para
-#: transactions.xml:331
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "L'objet <literal>Session</literal> n?est pas conçu pour être utilisé par de "
 "multiples threads. En conséquence, les objets potentiellement multi-thread "
@@ -672,18 +683,18 @@
 "literal> ."
 
 #. Tag: para
-#: transactions.xml:342
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "Lorsque Hibernate lance une exception, le roll back de la transaction en "
 "cours doit être effectué et la <literal>Session</literal> doit être "
@@ -696,18 +707,18 @@
 "non traitables et requièrent la reprise du processus d?affaire ayant échoué.)"
 
 #. Tag: para
-#: transactions.xml:354
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "La <literal>Session</literal> met en mémoire cache tous les objets "
 "persistants (les objets surveillés et dont l'état est géré par Hibernate.) "
@@ -725,21 +736,21 @@
 "information périmée."
 
 #. Tag: title
-#: transactions.xml:372
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "Démarcation des transactions"
 
 #. Tag: para
-#: transactions.xml:374
+#: transactions.xml:388
 #, fuzzy, no-c-format
 msgid ""
-"Database (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -754,18 +765,18 @@
 "de lecture."
 
 #. Tag: para
-#: transactions.xml:384
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "Une application utilisant Hibernate peut s'exécuter dans un environnement "
 "léger n?offrant pas la gestion automatique des transactions (application "
@@ -785,12 +796,12 @@
 "flush()</literal> sont faits automatiquement."
 
 #. Tag: para
-#: transactions.xml:394
+#: transactions.xml:408
 #, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
 "transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
@@ -804,45 +815,45 @@
 "Bean (EJB avec transactions gérées automatiquement par le container EJB)."
 
 #. Tag: para
-#: transactions.xml:403
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 "Il existe quatre étapes disctinctes lors de la fermeture d'une "
 "<literal>Session</literal>"
 
 #. Tag: para
-#: transactions.xml:409
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "flush de la session"
 
 #. Tag: para
-#: transactions.xml:414
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "commit de la transaction"
 
 #. Tag: para
-#: transactions.xml:419
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "Fermeture de la session (Close)"
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "Gestion des exceptions"
 
 #. Tag: para
-#: transactions.xml:430
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "La synchronisation de bdd depuis la session (flush) a déjà été expliqué, "
 "nous nous attarderons maintenant à la démarcation des transactions et à la "
@@ -850,17 +861,17 @@
 "J2EE."
 
 #. Tag: title
-#: transactions.xml:437
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "Environnement non managé"
 
 #. Tag: para
-#: transactions.xml:439
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -870,7 +881,7 @@
 "la transaction se fera donc de la manière suivante:"
 
 #. Tag: programlisting
-#: transactions.xml:446
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -894,12 +905,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:448
-#, no-c-format
+#: transactions.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -915,17 +926,17 @@
 "managé ET les environnements JTA."
 
 #. Tag: para
-#: transactions.xml:457
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "Une solution plus flexible est la gestion par contexte fourni par Hibernate "
 "que nous avons déjà rencontré:"
 
 #. Tag: programlisting
-#: transactions.xml:462
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -944,17 +955,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:464
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "Vous ne verrez probablement jamais ces exemples de code dans les "
 "applications; les exceptions fatales (exceptions du système) ne devraient "
@@ -968,12 +979,12 @@
 "tard dans ce chapitre."
 
 #. Tag: para
-#: transactions.xml:474
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "Notez que vous devriez sélectionner <literal>org.hibernate.transaction."
@@ -982,17 +993,17 @@
 "current_session_context_class</literal>."
 
 #. Tag: title
-#: transactions.xml:483
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "Utilisation de JTA"
 
 #. Tag: para
-#: transactions.xml:485
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -1003,12 +1014,12 @@
 "Hibernate propose deux stratégies pour réussir cette intégration."
 
 #. Tag: para
-#: transactions.xml:492
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "Si vous utilisez des transactions gérées par un EJB (bean managed "
@@ -1018,7 +1029,7 @@
 "les deux types d'environnements."
 
 #. Tag: programlisting
-#: transactions.xml:498
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -1042,17 +1053,16 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:500
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr "Ou encore, avec la gestion automatique de contexte:"
 
 #. Tag: programlisting
-#: transactions.xml:506
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1075,18 +1085,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:508
+#: transactions.xml:522
 #, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programmatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "Avec CMT, la démarcation des transactions est faite dans les descripteurs de "
 "déploiement des Beans Sessions et non de manière programmmatique, ceci "
 "réduit le code:"
 
 #. Tag: programlisting
-#: transactions.xml:513
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1098,15 +1108,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:515
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "Dans un EJB CMT même le rollback intervient automatiquement, puisqu'une "
 "<literal>RuntimeException</literal> non traitée et soulevée par une méthode "
@@ -1115,17 +1125,16 @@
 "<literal>Transaction</literal> d'Hibernate dans CMT.</emphasis>"
 
 #. Tag: para
-#: transactions.xml:523
+#: transactions.xml:537
 #, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatibility), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "Notez que le fichier de configuration Hibernate devrait contenir les valeurs "
 "<literal>org.hibernate.transaction.JTATransactionFactory</literal> dans un "
@@ -1139,21 +1148,21 @@
 "versions précédentes)."
 
 #. Tag: para
-#: transactions.xml:532
+#: transactions.xml:546
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
 "close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "La méthode <literal>getCurrentSession()</literal> a un inconvénient dans les "
 "environnement JTA. Il y a une astuce qui est d'utiliser un mode de "
@@ -1170,23 +1179,23 @@
 "CMT.)"
 
 #. Tag: title
-#: transactions.xml:548
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "Gestion des exceptions"
 
 #. Tag: para
-#: transactions.xml:550
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "Si une <literal>Session</literal> lance une exception (incluant les "
 "exceptions du type <literal>SQLException</literal> ou d'un sous-type), vous "
@@ -1199,19 +1208,19 @@
 "<literal>close()</literal> dans un bloc <literal>finally</literal> ."
 
 #. Tag: para
-#: transactions.xml:561
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "L'exception <literal>HibernateException</literal> , qui englobe la plupart "
 "des exceptions pouvant survenir dans la couche de persistance Hibernate, est "
@@ -1227,7 +1236,7 @@
 "non traitables et vous devez les traiter comme telles."
 
 #. Tag: para
-#: transactions.xml:573
+#: transactions.xml:587
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
@@ -1240,9 +1249,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "Hibernate englobe les <literal>SQLException</literal> s lancées lors des "
@@ -1261,73 +1270,73 @@
 "Les sous-types standard de <literal>JDBCException</literal> sont:"
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - Indique une erreur de "
 "communication avec la couche JDBC sous-jacente."
 
 #. Tag: para
-#: transactions.xml:595
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - Indique un problème de grammaire ou "
 "de syntaxe avec la requête SQL envoyée."
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - Indique une violation de "
 "contrainte d'intégrité."
 
 #. Tag: para
-#: transactions.xml:607
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - Indique une erreur de "
 "verrouillage lors de l'éxécution de la requête."
 
 #. Tag: para
-#: transactions.xml:613
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr ""
 "<literal>GenericJDBCException</literal> - Indique une erreur générique JDBC "
 "d'une autre catégorie."
 
 #. Tag: title
-#: transactions.xml:623
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "Timeout de transaction"
 
 #. Tag: para
-#: transactions.xml:625
+#: transactions.xml:639
 #, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
 "transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
@@ -1345,7 +1354,7 @@
 "est abstraite par l'objet <literal>Transaction</literal> ."
 
 #. Tag: programlisting
-#: transactions.xml:638
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1370,34 +1379,33 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:640
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "Notez que <literal>setTimeout()</literal> ne peut pas être appelé d'un EJB "
 "CMT, puisque le timeout des transaction doit être spécifié de manière "
 "déclarative."
 
 #. Tag: title
-#: transactions.xml:650
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Contrôle de consurrence optimiste"
 
 #. Tag: para
-#: transactions.xml:652
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "La gestion optimiste des accès concurrents avec versionnage est la seule "
 "approche pouvant garantir l'extensibilité des applications à haut niveau de "
@@ -1410,22 +1418,22 @@
 "application en prévenant la perte de mises à jour."
 
 #. Tag: title
-#: transactions.xml:663
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "Gestion du versionnage au niveau applicatif"
 
 #. Tag: para
-#: transactions.xml:665
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "Dans cet exemple d'implémentation utilisant peu les fonctionnalités "
 "d'Hibernate, chaque interaction avec la base de données se fait en utilisant "
@@ -1437,7 +1445,7 @@
 "chapitre."
 
 #. Tag: programlisting
-#: transactions.xml:674
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1455,7 +1463,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:676
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1467,15 +1475,15 @@
 "automatiquement à chaque flush() si l'entité doit être mise à jour."
 
 #. Tag: para
-#: transactions.xml:682
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "Bien sûr, si votre application ne fait pas face à beaucoup d'accès "
 "concurrents et ne nécessite pas l'utilisation du versionnage, cette approche "
@@ -1489,14 +1497,14 @@
 "données."
 
 #. Tag: para
-#: transactions.xml:691
+#: transactions.xml:705
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "Il est clair que la gestion manuelle de la vérification du versionnage des "
 "objets ne peut être effectuée que dans certains cas triviaux et que cette "
@@ -1508,22 +1516,22 @@
 "versions d'objets."
 
 #. Tag: title
-#: transactions.xml:702
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "Les sessions longues et le versionnage automatique."
 
 #. Tag: para
-#: transactions.xml:704
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "Dans ce scénario, une seule instance de <literal>Session</literal> et des "
 "objets persistants est utilisée pour toute l'application. Hibernate vérifie "
@@ -1535,14 +1543,14 @@
 "les plus récentes dans la BD."
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "Il est à noter que lorsqu'une application est en attente d'une action de la "
 "part de l?usager, La <literal>Session</literal> n'est pas connectée à la "
@@ -1552,7 +1560,7 @@
 "rechargement de tous les objets à chaque transaction."
 
 #. Tag: programlisting
-#: transactions.xml:721
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1567,24 +1575,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:722
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "L'objet <literal>foo</literal> sait quel objet <literal>Session</literal> "
 "l'a chargé. <literal>Session.reconnect()</literal> obtient une nouvelle "
@@ -1600,28 +1607,34 @@
 "jour."
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "Si des appels implicites aux méthodes <literal>disconnect()</literal> et "
 "<literal>reconnect()</literal> sont trop coûteux, vous pouvez les éviter en "
 "utilisant <literal>hibernate.connection.release_mode</literal> ."
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:747
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "Ce pattern peut présenter des problèmes si la <literal>Session</literal> est "
 "trop volumineuse pour être stockée entre les actions de l'usager. Plus "
@@ -1633,14 +1646,14 @@
 "être rapidement périmés."
 
 #. Tag: para
-#: transactions.xml:753
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "Notez que la <literal>Session</literal> déconnectée devrait être conservée "
 "près de la couche de persistance. Autrement dit, utilisez un EJB stateful "
@@ -1649,13 +1662,13 @@
 "pas la conserver dans la session <literal>HttpSession</literal> .)"
 
 #. Tag: para
-#: transactions.xml:761
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
@@ -1665,13 +1678,13 @@
 "for examples."
 
 #. Tag: title
-#: transactions.xml:771
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Les objets détachés et le versionnage automatique"
 
 #. Tag: para
-#: transactions.xml:773
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1692,7 +1705,7 @@
 "literal> , ou <literal>Session.merge()</literal> ."
 
 #. Tag: programlisting
-#: transactions.xml:781
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1706,7 +1719,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:783
+#: transactions.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
@@ -1717,12 +1730,12 @@
 "sont détectés."
 
 #. Tag: para
-#: transactions.xml:788
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "Vous pouvez également utiliser <literal>lock()</literal> au lieu de "
@@ -1732,16 +1745,16 @@
 "modifié."
 
 #. Tag: title
-#: transactions.xml:797
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "Personnaliser le versionnage automatique"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1752,19 +1765,19 @@
 "d'incrémenter leur numéro de version s'ils sont mis à jour."
 
 #. Tag: para
-#: transactions.xml:806
+#: transactions.xml:822
 #, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this conceptually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "Certaines entreprises possèdent de vieux systèmes dont les schémas de bases "
 "de données sont statiques et ne peuvent être modifiés. Il existe aussi des "
@@ -1782,13 +1795,13 @@
 "request-with-detached- objects</literal> devient alors impossible."
 
 #. Tag: para
-#: transactions.xml:817
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "Il peut être souhaitable de permettre les modifications concurrentes lorsque "
 "des champs distincts sont modifiés. En mettant la propriété "
@@ -1797,21 +1810,21 @@
 "être actualisés lors du flush()."
 
 #. Tag: para
-#: transactions.xml:823
+#: transactions.xml:840
 #, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute unnecessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "Dans les deux cas: en utilisant une colonne de version/horodatée ou via la "
 "comparaison de l'état complet de l'objet ou de ses champs modifiés, "
@@ -1830,20 +1843,20 @@
 "commande d'UPDATE."
 
 #. Tag: title
-#: transactions.xml:841
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "Verouillage pessimiste"
 
 #. Tag: para
-#: transactions.xml:843
+#: transactions.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "It is not intended that users spend much time worrying about locking "
-"strategies. It's usually enough to specify an isolation level for the JDBC "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "Il n'est nécessaire de s'attarder à la stratégie de verrouillage des entités "
 "dans une application utilisant Hibernate. Il est généralement suffisant de "
@@ -1853,28 +1866,28 @@
 "enregistrement et le réobtenir au lancement d'une nouvelle transaction."
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr ""
 "Hibernate utilisera toujours le mécanisme de verrouillage de la base de "
 "données et ne verrouillera jamais les objets en mémoire!"
 
 #. Tag: para
-#: transactions.xml:855
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "La classe <literal>LockMode</literal> définit les différents niveaux de "
 "verrouillage pouvant être obtenus par Hibernate. Le verrouillage est obtenu "
 "par les mécanismes suivants:"
 
 #. Tag: para
-#: transactions.xml:862
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1884,10 +1897,10 @@
 "actualise ou insert un enregistrement."
 
 #. Tag: para
-#: transactions.xml:868
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1896,10 +1909,10 @@
 "base de données supportant cette syntaxe."
 
 #. Tag: para
-#: transactions.xml:874
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1908,12 +1921,12 @@
 "Oracle."
 
 #. Tag: para
-#: transactions.xml:880
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "<literal>LockMode.READ</literal> est obtenu automatiquement quand Hibernate "
 "lit des données dans un contexte d'isolation <literal>Repeatable Read</"
@@ -1921,7 +1934,7 @@
 "explicitement via une requête."
 
 #. Tag: para
-#: transactions.xml:887
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1937,7 +1950,7 @@
 "dans cet état."
 
 #. Tag: para
-#: transactions.xml:896
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
@@ -1946,7 +1959,7 @@
 "manières suivantes:"
 
 #. Tag: para
-#: transactions.xml:902
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1956,19 +1969,19 @@
 "verrouillage <literal>LockMode</literal> ."
 
 #. Tag: para
-#: transactions.xml:907
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "Un appel à <literal>Session.lock()</literal> ."
 
 #. Tag: para
-#: transactions.xml:912
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "Une appel à <literal>Query.setLockMode()</literal> ."
 
 #. Tag: para
-#: transactions.xml:918
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1988,14 +2001,14 @@
 "appellera la méthode <literal>lock()</literal> pour cet objet."
 
 #. Tag: para
-#: transactions.xml:927
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "<literal>Session.lock()</literal> effectue une vérification de version si le "
 "niveau de verrouillage est <literal>READ</literal> , <literal>UPGRADE</"
@@ -2004,37 +2017,37 @@
 "requête <literal>SELECT ... FOR UPDATE</literal> sera utilisée.)"
 
 #. Tag: para
-#: transactions.xml:934
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "Si une base de données ne supporte pas le niveau de verrouillage demandé, "
 "Hibernate utilisera un niveau alternatif convenable au lieux de lancer une "
 "exception. Ceci assurera la portabilité de votre application."
 
 #. Tag: title
-#: transactions.xml:943
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "Mode de libération de Connection"
 
 #. Tag: para
-#: transactions.xml:945
-#, no-c-format
+#: transactions.xml:962
+#, fuzzy, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 "Le comportement original (2.x) d'Hibernate pour la gestion des connexions "
 "JDBC était que la <literal>Session</literal> obtenait une connexion dès "
@@ -2047,38 +2060,36 @@
 "par <literal>org.hibernate.ConnectionReleaseMode</literal>:"
 
 #. Tag: para
-#: transactions.xml:959
+#: transactions.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obtains a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 "<literal>ON_CLOSE</literal> - est essentiellement le comportement passé. La "
 "session Hibernate obtient une connexion lorsqu'elle en a besoin et la garde "
 "jusqu'à ce que la session se ferme."
 
 #. Tag: para
-#: transactions.xml:966
-#, no-c-format
+#: transactions.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 "<literal>AFTER_TRANSACTION</literal> - indique de relacher la connexion "
 "après qu'une <literal>org.hibernate.Transaction</literal> se soit achevée."
 
 #. Tag: para
-#: transactions.xml:972
-#, no-c-format
+#: transactions.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 "<literal>AFTER_STATEMENT</literal> (aussi appelé libération brutale) - "
 "indique de relacher les connexions après chaque exécution d'un statement. Ce "
@@ -2087,27 +2098,28 @@
 "de l'utilisation de <literal>org.hibernate.ScrollableResults</literal>."
 
 #. Tag: para
-#: transactions.xml:982
-#, no-c-format
+#: transactions.xml:999
+#, fuzzy, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 "Le paramètre de configuration <literal>hibernate.connection.release_mode</"
 "literal> est utilisé pour spécifier quel mode de libération doit être "
 "utiliser. Les valeurs possibles sont:"
 
 #. Tag: para
-#: transactions.xml:989
-#, no-c-format
+#: transactions.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 "<literal>auto</literal> (valeur par défaut) - ce choix délègue le choix de "
 "libération à la méthode <literal>org.hibernate.transaction."
@@ -2119,25 +2131,24 @@
 "une erreur dans le code de l'utilisateur."
 
 #. Tag: para
-#: transactions.xml:999
-#, no-c-format
+#: transactions.xml:1016
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 "<literal>on_close</literal> - indique d'utiliser ConnectionReleaseMode."
 "ON_CLOSE. Ce paramétrage existe pour garantir la compatibilité avec les "
 "versions précédentes, mais ne devrait plus être utilisé."
 
 #. Tag: para
-#: transactions.xml:1005
-#, no-c-format
+#: transactions.xml:1022
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 "<literal>after_transaction</literal> - indique d'utiliser "
@@ -2148,18 +2159,18 @@
 "AFTER_STATEMENT."
 
 #. Tag: para
-#: transactions.xml:1013
-#, no-c-format
+#: transactions.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""
 "<literal>after_statement</literal> - indique d'utiliser "
 "ConnectionReleaseMode.AFTER_STATEMENT. Additonnellement, le "

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,95 +11,120 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:33
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
-msgstr "Introduction à Hibernate"
+msgid "Tutorial"
+msgstr ""
 
-#. Tag: title
-#: tutorial.xml:36
-#, no-c-format
-msgid "Preface"
-msgstr "Préface"
-
 #. Tag: para
-#: tutorial.xml:38
+#: tutorial.xml:33
 #, no-c-format
 msgid ""
-"This chapter is an introduction to Hibernate by way of a tutorial, intended "
-"for new users of Hibernate. We start with a simple application using an in-"
-"memory database. We build the application in small, easy to understand "
-"steps. The tutorial is based on another, earlier one developed by Michael "
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
 "Gloegl. All code is contained in the <filename>tutorials/web</filename> "
 "directory of the project source."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:51
+#: tutorial.xml:42
 #, no-c-format
 msgid ""
 "This tutorial expects the user have knowledge of both Java and SQL. If you "
-"are new or uncomfortable with either, it is advised that you start with a "
-"good introduction to that technology prior to attempting to learn Hibernate. "
-"It will save time and effort in the long run."
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:61
+#: tutorial.xml:51
 #, no-c-format
 msgid ""
-"There is another tutorial/example application in the <filename>/tutorials/"
-"eg</filename> directory of the project source. That example is console based "
-"and as such would not have the dependency on a servlet container to execute. "
-"The basic setup is the same as the instructions below."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:71
+#: tutorial.xml:59
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "Partie 1 - Première application Hibernate"
 
 #. Tag: para
-#: tutorial.xml:73
+#: tutorial.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
+msgstr ""
+"Supposons que nous ayons besoin d'une petite application de base de données "
+"qui puisse stocker des événements que nous voulons suivre, et des "
+"informations à propos des hôtes de ces événements."
+
+#. Tag: para
+#: tutorial.xml:67
 #, no-c-format
 msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the host(s) of these events. We will "
-"use an in-memory, Java database named HSQLDB to avoid describing "
-"installation/setup of any particular database servers. Feel free to tweak "
-"this tutorial to use whatever database you feel comfortable using."
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
 
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:82
+#: tutorial.xml:78
 #, no-c-format
 msgid ""
-"The first thing we need to do is set up our development environment, and "
-"specifically to setup all the required dependencies to Hibernate as well as "
-"other libraries. Hibernate is built using Maven which amongst other features "
-"provides <literal>dependecy management</literal>; moreover it provides "
-"<emphasis>transitive</emphasis> <literal>dependecy management</literal> "
-"which simply means that to use Hibernate we can simply define our dependency "
-"on Hibernate, Hibernate itself defines the dependencies it needs which then "
-"become transitive dependencies of our project."
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
 
+#. Tag: para
+#: tutorial.xml:88
+#, no-c-format
+msgid ""
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
+msgstr ""
+
 #. Tag: programlisting
 #: tutorial.xml:94
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
 "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
 "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
 "apache.org/xsd/maven-4.0.0.xsd\">\n"
 "\n"
-"    ...\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
 "\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
 "    <dependencies>\n"
 "        <dependency>\n"
-"            <groupId>${groupId}</groupId>\n"
+"            <groupId>org.hibernate</groupId>\n"
 "            <artifactId>hibernate-core</artifactId>\n"
 "        </dependency>\n"
 "\n"
@@ -109,6 +134,20 @@
 "            <groupId>javax.servlet</groupId>\n"
 "            <artifactId>servlet-api</artifactId>\n"
 "        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
 "    </dependencies>\n"
 "\n"
 "</project>]]>"
@@ -118,47 +157,46 @@
 #: tutorial.xml:97
 #, no-c-format
 msgid ""
-"Essentially we are describing here the <filename>/tutorials/web/pom.xml</"
-"filename> file. See the <ulink url=\"http://maven.org\">Maven</ulink> site "
-"for more information."
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:105
+#: tutorial.xml:114
 #, no-c-format
 msgid ""
-"While not strictly necessary, most IDEs have integration with Maven to read "
-"these POM files and automatically set up a project for you which can save "
-"lots of time and effort."
+"Save this file as <filename>pom.xml</filename> in the project root directory."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:112
-#, no-c-format
-msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
-msgstr ""
-"Ensuite, nous créons une classe qui réprésente l'événement que nous voulons "
-"stocker dans notre base de données."
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr "La première classe"
 
 #. Tag: para
-#: tutorial.xml:119
-#, no-c-format
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
 msgstr ""
-"Notre première classe persistante est une simple classe JavaBean avec "
-"quelques propriétés :"
+"Ensuite, nous créons une classe qui réprésente l'événement que nous voulons "
+"stocker dans notre base de données."
 
 #. Tag: programlisting
-#: tutorial.xml:123
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.tutorial.domain;\n"
@@ -200,15 +238,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:125
-#, no-c-format
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "Vous pouvez voir que cette classe utilise les conventions de nommage "
 "standard JavaBean pour les méthodes getter/setter des propriétés, ainsi "
@@ -219,20 +256,20 @@
 "classe via reflexion."
 
 #. Tag: para
-#: tutorial.xml:133
-#, no-c-format
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "La propriété <literal>id</literal> contient la valeur d'un identifiant "
 "unique pour un événement particulier. Toutes les classes d'entités "
@@ -250,13 +287,13 @@
 "l'ajuster à la conception de votre application."
 
 #. Tag: para
-#: tutorial.xml:145
-#, no-c-format
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "Le constructeur sans argument est requis pour toutes les classes "
@@ -266,45 +303,21 @@
 "récupération des données efficaces sans instrumentation du bytecode."
 
 #. Tag: para
-#: tutorial.xml:152
+#: tutorial.xml:161
 #, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"Placez ce fichier source Java dans un répertoire appelé <literal>src</"
-"literal> dans le dossier de développement. Ce répertoire devrait maintenant "
-"ressembler à ça :"
 
-#. Tag: programlisting
-#: tutorial.xml:157
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:159
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr ""
-"Dans la prochaine étape, nous informons Hibernate de cette classe "
-"persistante."
-
 #. Tag: title
-#: tutorial.xml:166
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr "Le fichier de mapping"
 
 #. Tag: para
-#: tutorial.xml:168
+#: tutorial.xml:170
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -319,13 +332,13 @@
 "utiliser."
 
 #. Tag: para
-#: tutorial.xml:175
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "La structure basique de ce fichier de mapping ressemble à ça :"
 
 #. Tag: programlisting
-#: tutorial.xml:179
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -333,23 +346,23 @@
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
 "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:181
-#, no-c-format
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "Notez que la DTD Hibernate est très sophistiquée. Vous pouvez l'utiliser "
 "pour l'auto-complétement des éléments et des attributs de mapping XML dans "
@@ -363,23 +376,23 @@
 "distribution Hibernate."
 
 #. Tag: para
-#: tutorial.xml:192
-#, no-c-format
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "Nous omettrons la déclaration de la DTD dans les exemples futurs pour "
 "raccourcir le code. Bien sûr il n'est pas optionnel."
 
 #. Tag: para
-#: tutorial.xml:197
-#, no-c-format
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "Entre les deux balises <literal>hibernate-mapping</literal>, incluez un "
 "élément <literal>class</literal>. Toutes les classes d'entités persistantes "
@@ -388,12 +401,12 @@
 "base de données SQL :"
 
 #. Tag: programlisting
-#: tutorial.xml:204
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -401,16 +414,15 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:206
-#, no-c-format
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "Plus loin, nous disons à Hibernate comment persister et charger un objet de "
 "la classe <literal>Event</literal> dans la table <literal>EVENTS</literal>, "
@@ -422,12 +434,12 @@
 "subrogée :"
 
 #. Tag: programlisting
-#: tutorial.xml:214
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -437,53 +449,57 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:216
-#, fuzzy, no-c-format
+#: tutorial.xml:224
+#, no-c-format
 msgid ""
 "The <literal>id</literal> element is the declaration of the identifier "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"L'élément <literal>id</literal> est la déclaration de la propriété de "
-"l'identifiant, <literal>name=\"id\"</literal> déclare le nom de la propriété "
-"Java - Hibernate utilisera les méthodes getter et setter pour accéder à la "
-"propriété. L'attribut <literal>column</literal> indique à Hibernate quelle "
-"colonne de la table <literal>EVENTS</literal> nous utilisons pour cette clef "
-"primaire. L'élément <literal>generator</literal> imbriqué spécifie la "
-"stratégie de génération de l'identifiant, dans ce cas nous avons utilisé "
-"<literal>increment</literal>, laquelle est une méthode très simple utile "
-"surtout pour les tests (et didacticiels). Hibernate supporte aussi les "
-"identifiants générés par les bases de données, globalement uniques, ainsi "
-"que les identifiants assignés par l'application (ou n'importe quelle "
-"stratégie que vous avez écrit en extension)."
 
 #. Tag: para
-#: tutorial.xml:229
+#: tutorial.xml:234
 #, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "Finalement nous incluons des déclarations pour les propriétés persistantes "
 "de la classe dans le fichier de mapping. Par défaut, aucune propriété de la "
 "classe n'est considérée comme persistante :"
 
 #. Tag: programlisting
-#: tutorial.xml:235
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -495,29 +511,29 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:237
-#, no-c-format
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "Comme avec l'élément <literal>id</literal>, l'attribut <literal>name</"
 "literal> de l'élément <literal>property</literal> indique à Hibernate quels "
 "getters/setters utiliser."
 
 #. Tag: para
-#: tutorial.xml:244
-#, no-c-format
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "Pourquoi le mapping de la propriété <literal>date</literal> inclut "
 "l'attribut <literal>column</literal>, mais pas <literal>title</literal> ? "
@@ -528,24 +544,23 @@
 "différent pour le mapping."
 
 #. Tag: para
-#: tutorial.xml:253
-#, no-c-format
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "La prochaine chose intéressante est que le mapping de <literal>title</"
 "literal> manque aussi d'un attribut <literal>type</literal>. Les types que "
@@ -566,77 +581,55 @@
 "un <literal>timestamp</literal>."
 
 #. Tag: para
-#: tutorial.xml:269
+#: tutorial.xml:297
 #, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"Ce fichier de mapping devrait être sauvegardé en tant que <literal>Event.hbm."
-"xml</literal>, juste dans le répertoire à côté du fichier source de la "
-"classe Java <literal>Event</literal>. Le nommage des fichiers de mapping "
-"peut être arbitraire, cependant le suffixe <literal>hbm.xml</literal> est "
-"devenu une convention dans la communauté des développeurs Hibernate. La "
-"structure du répertoire devrait ressembler à ça :"
 
-#. Tag: programlisting
-#: tutorial.xml:277
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:279
-#, no-c-format
-msgid "We continue with the main configuration of Hibernate."
-msgstr "Nous poursuivons avec la configuration principale d'Hibernate."
-
 #. Tag: title
-#: tutorial.xml:286
+#: tutorial.xml:312
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Configuration d'Hibernate"
 
 #. Tag: para
-#: tutorial.xml:288
+#: tutorial.xml:314
 #, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"Nous avons maintenant une classe persistante et son fichier de mapping. Il "
-"est temps de configurer Hibernate. Avant ça, nous avons besoin d'une base de "
-"données. HSQL DB, un SGBD SQL basé sur Java et travaillant en mémoire, peut "
-"être téléchargé à partir du site web de HSQL. En fait, vous avez seulement "
-"besoin de <literal>hsqldb.jar</literal>. Placez ce fichier dans le "
-"répertoire <literal>lib/</literal> du dossier de développement."
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:321
 #, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "Créez un répertoire appelé <literal>data</literal> à la racine du répertoire "
 "de développement - c'est là que HSQL DB stockera ses fichiers de données. "
@@ -649,36 +642,35 @@
 "répertoire <literal>data/</literal> et redémarrez HSQL DB à nouveau."
 
 #. Tag: para
-#: tutorial.xml:306
+#: tutorial.xml:337
 #, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"Hibernate est la couche de votre application qui se connecte à cette base de "
-"données, donc il a besoin des informations de connexion. Les connexions sont "
-"établies à travers un pool de connexions JDBC, que nous devons aussi "
-"configurer. La distribution Hibernate contient différents outils de gestion "
-"de pools de connexions JDBC open source, mais pour ce didacticiel nous "
-"utiliserons le pool de connexions intégré à Hibernate. Notez que vous devez "
-"copier les bibliothèques requises dans votre classpath et utiliser une "
-"configuration de pool de connexions différente si vous voulez utiliser un "
-"logiciel de gestion de pools JDBC tiers avec une qualité de production."
 
 #. Tag: para
-#: tutorial.xml:316
+#: tutorial.xml:348
 #, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "Pour la configuration d'Hibernate, nous pouvons utiliser un simple fichier "
 "<literal>hibernate.properties</literal>, un fichier <literal>hibernate.cfg."
@@ -687,7 +679,7 @@
 "de configuration XML :"
 
 #. Tag: programlisting
-#: tutorial.xml:322
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -726,9 +718,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -736,14 +728,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:324
+#: tutorial.xml:363
 #, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "Notez que cette configuration XML utilise une DTD différente. Nous "
 "configurons une <literal>SessionFactory</literal> d'Hibernate - une fabrique "
@@ -753,20 +750,34 @@
 "configuration différents (pour un démarrage plus facile)."
 
 #. Tag: para
-#: tutorial.xml:332
+#: tutorial.xml:373
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "Les quatre premiers éléments <literal>property</literal> contiennent la "
 "configuration nécessaire pour la connexion JDBC. L'élément "
 "<literal>property</literal> du dialecte spécifie quelle variante du SQL "
@@ -780,139 +791,80 @@
 "persistantes."
 
 #. Tag: para
-#: tutorial.xml:345
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"Copiez ce fichier dans le répertoire source, il terminera dans la racine du "
-"classpath. Hibernate cherchera automatiquement, au démarrage, un fichier "
-"appelé <literal>hibernate.cfg.xml</literal> dans la racine du classpath."
 
 #. Tag: title
-#: tutorial.xml:354
-#, no-c-format
-msgid "Building with Ant"
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "Construction avec Ant"
 
 #. Tag: para
-#: tutorial.xml:356
+#: tutorial.xml:405
 #, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"Nous allons maintenant construire le didacticiel avec Ant. Vous aurez besoin "
-"d'avoir Ant d'installé - récupérez-le à partir de <ulink url=\"http://ant."
-"apache.org/bindownload.cgi\"> la page de téléchargement de Ant</ulink>. "
-"Comment installer Ant ne sera pas couvert ici. Référez-vous au <ulink url="
-"\"http://ant.apache.org/manual/index.html\">manuel d'Ant</ulink>. Après que "
-"vous aurez installé Ant, nous pourrons commencer à créer le fichier de "
-"construction. Il s'appellera <literal>build.xml</literal> et sera placé "
-"directement dans le répertoire de développement."
 
-#. Tag: para
-#: tutorial.xml:365
-#, no-c-format
-msgid "A basic build file looks like this:"
-msgstr "Un fichier de construction basique ressemble à ça :"
-
 #. Tag: programlisting
-#: tutorial.xml:369
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:371
-#, no-c-format
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr ""
-"Cela dira à Ant d'ajouter tous les fichiers du répertoire lib finissant par "
-"<literal>.jar</literal> dans le classpath utilisé pour la compilation. Cela "
-"copiera aussi tous les fichiers source non Java dans le répertoire cible, "
-"par exemple les fichiers de configuration et de mapping d'Hibernate. Si vous "
-"lancez Ant maintenant, vous devriez obtenir cette sortie :"
-
-#. Tag: programlisting
-#: tutorial.xml:378
-#, no-c-format
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:383
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "Démarrage et aides"
 
 #. Tag: para
-#: tutorial.xml:385
-#, no-c-format
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "Il est temps de charger et de stocker quelques objets <literal>Event</"
 "literal>, mais d'abord nous devons compléter la configuration avec du code "
@@ -925,36 +877,37 @@
 "literal> est un objet global \"thread-safe\", instancié une seule fois."
 
 #. Tag: para
-#: tutorial.xml:395
-#, no-c-format
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr ""
 "Nous créerons une classe d'aide <literal>HibernateUtil</literal> qui "
 "s'occupe du démarrage et rend la gestion des <literal>Session</literal>s "
 "plus facile. Regardons l'implémentation :"
 
 #. Tag: programlisting
-#: tutorial.xml:401
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -970,15 +923,24 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:403
+#: tutorial.xml:444
 #, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "Cette classe ne produit pas seulement la <literal>SessionFactory</literal> "
 "globale dans un initialiseur statique (appelé une seule fois par la JVM "
 "lorsque la classe est chargée), elle masque le fait qu'elle exploite un "
@@ -986,15 +948,15 @@
 "depuis JNDI dans un serveur d'applications."
 
 #. Tag: para
-#: tutorial.xml:410
-#, no-c-format
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "Si vous nommez la <literal>SessionFactory</literal> dans votre fichier de "
 "configuration, Hibernate tentera la récupération depuis JNDI. Pour éviter ce "
@@ -1004,47 +966,18 @@
 "référence Hibernate."
 
 #. Tag: para
-#: tutorial.xml:419
-#, no-c-format
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"Placez <literal>HibernateUtil.java</literal> dans le répertoire source de "
-"développement, et ensuite <literal>Event.java</literal> :"
-
-#. Tag: programlisting
-#: tutorial.xml:424
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:426
-#, no-c-format
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "Cela devrait encore compiler sans problème. Nous avons finalement besoin de "
 "configurer le système de \"logs\" - Hibernate utilise commons-logging et "
 "vous laisse le choix entre log4j et le système de logs du JDK 1.4. La "
@@ -1057,43 +990,45 @@
 "affiché sur la sortie standard."
 
 #. Tag: para
-#: tutorial.xml:436
-#, no-c-format
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr ""
 "L'infrastructure de ce didacticiel est complète - et nous sommes prêts à "
 "effectuer un travail réel avec Hibernate."
 
 #. Tag: title
-#: tutorial.xml:444
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "Charger et stocker des objets"
 
 #. Tag: para
-#: tutorial.xml:446
-#, no-c-format
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "Finalement nous pouvons utiliser Hibernate pour charger et stocker des "
 "objets. Nous écrivons une classe <literal>EventManager</literal> avec une "
 "méthode <literal>main()</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:451
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1108,16 +1043,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1127,13 +1059,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:453
-#, no-c-format
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "Nous créons un nouvel objet <literal>Event</literal>, et le remettons à "
 "Hibernate. Hibernate s'occupe maintenant du SQL et exécute les "
@@ -1142,15 +1074,17 @@
 "literal> avant de lancer ça."
 
 #. Tag: para
-#: tutorial.xml:460
-#, no-c-format
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "Une <literal>Session</literal> est une unité de travail. Pour le moment, "
 "nous allons faire les choses simplement et assumer une granularité un-un "
@@ -1161,19 +1095,17 @@
 "<literal>Session</literal> Hibernate."
 
 #. Tag: para
-#: tutorial.xml:468
-#, no-c-format
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "Que fait <literal>sessionFactory.getCurrentSession()</literal> ? "
 "Premièrement, vous pouvez l'invoquer autant de fois que vous le voulez et "
@@ -1186,21 +1118,28 @@
 "thread java courant d'exécution. Ceci n'est pas totalement vrai."
 
 #. Tag: para
-#: tutorial.xml:479
+#: tutorial.xml:529
 #, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "Une <literal>Session</literal> commence lorsqu'elle est vraiment utilisée la "
 "première fois, Lorsque nous appelons pour la première fois "
 "<literal>getCurrentSession()</literal>. Ensuite, elle est liée, par "
@@ -1213,19 +1152,20 @@
 "d'utiliser Hibernate."
 
 #. Tag: para
-#: tutorial.xml:490
-#, no-c-format
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "UNTRANSLATED ! Related to the unit of work scope, should the Hibernate "
 "<literal>Session</literal> be used to execute one or several database "
@@ -1239,70 +1179,45 @@
 "an anti-pattern. A real (web) application is shown later in this tutorial."
 
 #. Tag: para
-#: tutorial.xml:501
-#, no-c-format
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "Lisez <xref linkend=\"transactions\"/> pour plus d'informations sur la "
 "gestion des transactions et leur démarcations. Nous n'avons pas géré les "
 "erreurs et rollback sur l'exemple précédent."
 
 #. Tag: para
-#: tutorial.xml:507
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"Pour lancer cette première routine, nous devons ajouter une cible appelable "
-"dans le fichier de construction de Ant :"
 
-#. Tag: programlisting
-#: tutorial.xml:511
-#, no-c-format
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:513
+#: tutorial.xml:581
 #, no-c-format
-msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"La valeur de l'argument <literal>action</literal> correspond à la ligne de "
-"commande qui appelle la cible :"
 
-#. Tag: programlisting
-#: tutorial.xml:518
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:520
-#, no-c-format
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 "Vous devriez voir, après la compilation, Hibernate démarrer et, en fonction "
 "de votre configuration, beaucoup de traces sur la sortie. À la fin vous "
 "trouverez la ligne suivante :"
 
 #. Tag: programlisting
-#: tutorial.xml:525
+#: tutorial.xml:591
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1310,81 +1225,68 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:527
+#: tutorial.xml:593
 #, no-c-format
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"C'est l'<literal>INSERT</literal> exécuté par Hibernate, les points "
-"d'interrogation représentent les paramètres JDBC liés. Pour voir les valeurs "
-"liées aux arguments, ou pour réduire la verbosité des traces, vérifier votre "
-"<literal>log4j.properties</literal>."
 
 #. Tag: para
-#: tutorial.xml:533
-#, no-c-format
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "Maintenant nous aimerions aussi lister les événements stockés, donc nous "
 "ajoutons une option à la méthode principale :"
 
 #. Tag: programlisting
-#: tutorial.xml:537
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:539
-#, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr ""
 "Nous ajoutons aussi une nouvelle méthode <literal>listEvents()</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:543
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:545
-#, no-c-format
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "Ce que nous faisons ici c'est utiliser une requête HQL (Hibernate Query "
 "Language) pour charger tous les objets <literal>Event</literal> existants de "
@@ -1393,86 +1295,28 @@
 "Vous pouvez créer des requêtes plus complexes avec HQL, bien sûr."
 
 #. Tag: para
-#: tutorial.xml:552
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr "Maintenant, pour exécuter et tester tout ça, suivez ces étapes :"
-
-#. Tag: para
-#: tutorial.xml:558
-#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"Exécutez <literal>ant run -Daction=store</literal> pour stocker quelque "
-"chose dans la base de données et, bien sûr, pour générer, avant, le schéma "
-"de la base de données grâce à hbm2ddl."
 
-#. Tag: para
-#: tutorial.xml:564
-#, fuzzy, no-c-format
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continuous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-msgstr ""
-"Maintenant désactivez hbm2ddl en commentant la propriété dans votre fichier "
-"<literal>hibernate.cfg.xml</literal>. Généralement vous la laissez seulement "
-"activée dans des tests unitaires en continu, mais une autre exécution de "
-"hbm2ddl <emphasis>effacerait</emphasis> tout ce que vous avez stocké - le "
-"paramètre de configuration <literal>create</literal> se traduit en fait par "
-"\"supprimer toutes les tables du schéma, puis re-créer toutes les tables, "
-"lorsque la SessionFactory est construite\"."
-
-#. Tag: para
-#: tutorial.xml:574
-#, no-c-format
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"Si maintenant vous appelez Ant avec <literal>-Daction=list</literal>, vous "
-"devriez voir les événements que vous avez stockés jusque là. Vous pouvez "
-"bien sûr aussi appeler l'action <literal>store</literal> plusieurs fois."
-
-#. Tag: para
-#: tutorial.xml:580
-#, no-c-format
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"UNTRANSLATED! Note: Most new Hibernate users fail at this point and we see "
-"questions about <emphasis>Table not found</emphasis> error messages "
-"regularly. However, if you follow the steps outlined above you will not have "
-"this problem, as hbm2ddl creates the database schema on the first run, and "
-"subsequent application restarts will use this schema. If you change the "
-"mapping and/or database schema, you have to re-enable hbm2ddl once again."
-
 #. Tag: title
-#: tutorial.xml:593
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "Partie 2 - Mapper des associations"
 
 #. Tag: para
-#: tutorial.xml:595
-#, no-c-format
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr ""
 "Nous avons mappé une classe d'une entité persistante vers une table. Partons "
 "de là et ajoutons quelques associations de classe. D'abord nous ajouterons "
@@ -1480,23 +1324,23 @@
 "ils participent."
 
 #. Tag: title
-#: tutorial.xml:601
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "Mapper la classe Person"
 
 #. Tag: para
-#: tutorial.xml:603
-#, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr ""
 "La première version de la classe <literal>Person</literal> est simple :"
 
 #. Tag: programlisting
-#: tutorial.xml:607
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1513,22 +1357,28 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:609
+#: tutorial.xml:645
 #, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"Créez un nouveau fichier de mapping appelé <literal>Person.hbm.xml</literal> "
-"(n'oubliez pas la référence à la DTD)"
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid ""
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:614
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1541,14 +1391,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:616
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr ""
 "Finalement, ajoutez la nouveau mapping à la configuration d'Hibernate :"
 
 #. Tag: programlisting
-#: tutorial.xml:620
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1556,13 +1406,12 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:622
-#, no-c-format
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "Nous allons maintenant créer une association entre ces deux entités. "
 "Évidemment, des personnes peuvent participer aux événements, et des "
@@ -1570,21 +1419,22 @@
 "traiter sont : direction, cardinalité et comportement de la collection."
 
 #. Tag: title
-#: tutorial.xml:632
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "Une association unidirectionnelle basée sur Set"
 
 #. Tag: para
-#: tutorial.xml:634
-#, no-c-format
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr ""
 "Nous allons ajouter une collection d'événements à la classe <literal>Person</"
 "literal>. De cette manière nous pouvons facilement naviguer dans les "
@@ -1593,20 +1443,8 @@
 "collection Java, un <literal>Set</literal>, parce que la collection ne "
 "contiendra pas d'éléments dupliqués et l'ordre ne nous importe pas."
 
-#. Tag: para
-#: tutorial.xml:641
-#, no-c-format
-msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr ""
-"Nous avons besoin d'une association unidirectionnelle, pluri-valuée, "
-"implémentée avec un <literal>Set</literal>. Écrivons le code pour ça dans "
-"les classes Java et mappons les :"
-
 #. Tag: programlisting
-#: tutorial.xml:646
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1624,19 +1462,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:648
-#, no-c-format
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "D'abord nous mappons cette association, mais pensez à l'autre côté. "
 "Clairement, nous pouvons la laisser unidirectionnelle. Ou alors, nous "
@@ -1651,10 +1488,10 @@
 "conséquent nous utilisons un mapping Hibernate many-to-many:"
 
 #. Tag: programlisting
-#: tutorial.xml:659
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1664,28 +1501,27 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:661
-#, no-c-format
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "Hibernate supporte toutes sortes de mapping de collection, un <literal>&lt;"
 "set&gt;</literal> étant le plus commun. Pour une association many-to-many "
@@ -1701,13 +1537,13 @@
 "collection)."
 
 #. Tag: para
-#: tutorial.xml:673
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr "Le schéma de base de données pour ce mapping est donc :"
 
 #. Tag: programlisting
-#: tutorial.xml:677
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1726,60 +1562,55 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:682
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr "Travailler avec l'association"
 
 #. Tag: para
-#: tutorial.xml:684
-#, no-c-format
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr ""
 "Réunissons quelques personnes et quelques événements dans une nouvelle "
 "méthode dans <literal>EventManager</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:688
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:690
-#, no-c-format
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "Après le chargement d'une <literal>Person</literal> et d'un <literal>Event</"
 "literal>, modifiez simplement la collection en utilisant les méthodes "
@@ -1801,14 +1632,14 @@
 "configuration pour la classe <literal>CurrentSessionContext</literal>."
 
 #. Tag: para
-#: tutorial.xml:705
-#, no-c-format
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "Vous pourriez bien sûr charger une personne et un événement dans différentes "
 "unités de travail. Ou vous modifiez un objet à l'extérieur d'une "
@@ -1818,52 +1649,49 @@
 "détachée:"
 
 #. Tag: programlisting
-#: tutorial.xml:712
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:714
-#, no-c-format
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "L'appel à <literal>update</literal> rend un objet détaché à nouveau "
 "persistant, vous pourriez dire qu'il le lie à une unité de travail, ainsi "
@@ -1873,16 +1701,15 @@
 "pour retourner cet identifiant)."
 
 #. Tag: para
-#: tutorial.xml:721
-#, no-c-format
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "Ce n'est pas très utile dans notre situation actuelle, mais c'est un concept "
 "important que vous pouvez mettre dans votre propre application. Pour le "
@@ -1892,34 +1719,35 @@
 "d'un événement - la méthode <literal>save()</literal> les retourne."
 
 #. Tag: programlisting
-#: tutorial.xml:729
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:731
-#, no-c-format
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "C'était un exemple d'une association entre deux classes de même importance, "
 "deux entités. Comme mentionné plus tôt, il y a d'autres classes et d'autres "
@@ -1937,10 +1765,10 @@
 "<literal>Address</literal> ou <literal>MonetaryAmount</literal>, par exemple."
 
 #. Tag: para
-#: tutorial.xml:744
-#, no-c-format
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -1949,70 +1777,66 @@
 "entités, mais très ressemblant en Java."
 
 #. Tag: title
-#: tutorial.xml:752
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr "Collection de valeurs"
 
 #. Tag: para
-#: tutorial.xml:754
+#: tutorial.xml:814
 #, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"Nous ajoutons une collection d'objets de type de valeur à l'entité "
-"<literal>Person</literal>. Nous voulons stocker des adresses email, donc le "
-"type que nous utilisons est <literal>String</literal>, et la collection est "
-"encore un <literal>Set</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:759
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:761
-#, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "Le mapping de ce <literal>Set</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:765
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:767
-#, no-c-format
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "La différence comparée au mapping vu plus tôt est la partie "
 "<literal>element</literal>, laquelle dit à Hibernate que la collection ne "
@@ -2027,13 +1851,13 @@
 "valeurs de <literal>String</literal> seront réellement stockées."
 
 #. Tag: para
-#: tutorial.xml:777
-#, no-c-format
-msgid "Have a look at the updated schema:"
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "Regardons le schéma mis à jour :"
 
 #. Tag: programlisting
-#: tutorial.xml:781
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2059,11 +1883,11 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:783
-#, no-c-format
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -2073,44 +1897,42 @@
 "exactement la sémantique dont nous avons besoin pour un ensemble en Java."
 
 #. Tag: para
-#: tutorial.xml:789
-#, no-c-format
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "Vous pouvez maintenant tester et ajouter des éléments à cette collection, "
 "juste comme nous l'avons fait avant en liant des personnes et des "
 "événements. C'est le même code en Java."
 
 #. Tag: programlisting
-#: tutorial.xml:794
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:796
+#: tutorial.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"This time we didn't use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "Cette fois ci, nous n'avons pas utilisé une requête de chargement agressif "
 "(<emphasis>fetch</emphasis>) pour initialiser la collection. Par conséquent, "
@@ -2119,21 +1941,19 @@
 "chargement aggressif."
 
 #. Tag: title
-#: tutorial.xml:806
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "Associations bidirectionnelles"
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "Ensuite nous allons mapper une association bidirectionnelle - faire "
 "fonctionner l'association entre une personne et un événement à partir des "
@@ -2144,61 +1964,69 @@
 "vues et récupérées de toutes les manières possibles."
 
 #. Tag: para
-#: tutorial.xml:816
+#: tutorial.xml:882
 #, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr ""
 "D'abord, ajouter une collection de participants à la classe <literal>Event</"
 "literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:820
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:822
-#, no-c-format
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr ""
 "Maintenant mapper ce côté de l'association aussi, dans <literal>Event.hbm."
 "xml</literal>."
 
 #. Tag: programlisting
-#: tutorial.xml:826
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:828
-#, no-c-format
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "Comme vous le voyez, ce sont des mappings de <literal>set</literal>s normaux "
 "dans les deux documents de mapping. Notez que les noms de colonne dans "
@@ -2208,13 +2036,13 @@
 "mapping de la collection des <literal>Event</literal>s."
 
 #. Tag: para
-#: tutorial.xml:836
-#, no-c-format
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "Ce que signifie qu'Hibernate devrait prendre l'autre côté - la classe "
 "<literal>Person</literal> - s'il a besoin de renseigner des informations à "
@@ -2223,24 +2051,24 @@
 "est créé."
 
 #. Tag: title
-#: tutorial.xml:845
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "Travailler avec des liens bidirectionnels"
 
 #. Tag: para
-#: tutorial.xml:847
-#, no-c-format
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "Premièrement, gardez à l'esprit qu'Hibernate n'affecte pas la sémantique "
 "normale de Java. Comment avons-nous créé un lien entre une <literal>Person</"
@@ -2254,48 +2082,47 @@
 "vous ne devriez jamais oublier de le faire."
 
 #. Tag: para
-#: tutorial.xml:857
+#: tutorial.xml:932
 #, fuzzy, no-c-format
 msgid ""
 "Many developers program defensively and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "Beaucoup de développeurs programment de manière défensive et créent des "
 "méthodes de gestion de lien pour affecter correctement les deux côtés, par "
 "exemple dans <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:862
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:864
-#, no-c-format
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "Notez que les méthodes get et set pour la collection sont maintenant "
 "protégées - ceci permet à des classes du même paquet et aux sous-classes "
@@ -2304,23 +2131,21 @@
 "probablement faire de même avec la collection de l'autre côté."
 
 #. Tag: para
-#: tutorial.xml:871
-#, no-c-format
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "Et à propos de l'attribut de mapping <literal>inverse</literal> ? Pour vous, "
 "et pour Java, un lien bidirectionnel est simplement une manière de "
@@ -2340,24 +2165,18 @@
 "différence."
 
 #. Tag: title
-#: tutorial.xml:889
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "Part 3 - L'application web EventManager"
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:964
 #, fuzzy, no-c-format
-msgid "Let's turn the following discussion into a small web application..."
-msgstr "Let's turn this into a small web application."
-
-#. Tag: para
-#: tutorial.xml:895
-#, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2369,86 +2188,84 @@
 "pour saisir d'autres évènements."
 
 #. Tag: title
-#: tutorial.xml:903
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "Ecrire la servlet de base"
 
 #. Tag: para
-#: tutorial.xml:905
-#, no-c-format
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
 msgstr ""
-"Créons une nouvelle classe dans notre répertoire source, dans le package "
-"<literal>events</literal>:"
+"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
+"method we implement is <literal>doGet()</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:910
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:912
-#, no-c-format
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-
-#. Tag: programlisting
-#: tutorial.xml:917
-#, no-c-format
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:919
+#: tutorial.xml:982
+#, no-c-format
+msgid ""
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
 #, fuzzy, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
 msgstr ""
 "La pattern que nous utilisons ici est appelé <emphasis>session-per-request</"
 "emphasis>. Lorsqu'une requête touche la servlet, une nouvelle "
@@ -2460,7 +2277,7 @@
 "n'utilisons pas le mode auto-commit dans les applications)."
 
 #. Tag: para
-#: tutorial.xml:928
+#: tutorial.xml:996
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2475,27 +2292,27 @@
 "the current Java thread."
 
 #. Tag: para
-#: tutorial.xml:935
-#, no-c-format
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "Ensuite, les actions possibles de la requêtes sont exécutées et la réponse "
 "HTML est rendue. Nous en parlerons plus tard."
 
 #. Tag: para
-#: tutorial.xml:940
+#: tutorial.xml:1008
 #, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occurred during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "Enfin, l'unité de travail s'achève lorsque l'exécution et le rendu sont "
 "achevés. Si un problème survient lors de ces deux phases, une exception est "
@@ -2508,59 +2325,64 @@
 "pour le rendu de vos vues."
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr "Procéder et rendre"
 
 #. Tag: para
-#: tutorial.xml:956
-#, no-c-format
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr "Implémentons l'exécution de la requête et le rendu de la page."
 
 #. Tag: programlisting
-#: tutorial.xml:960
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:962
+#: tutorial.xml:1030
 #, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr ""
 "Ce style de code avec un mix de Java et d'HTML ne serait pas scalable dans "
@@ -2572,22 +2394,24 @@
 "fait que sortir de l'HTML:"
 
 #. Tag: programlisting
-#: tutorial.xml:971
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:973
+#: tutorial.xml:1041
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2597,37 +2421,37 @@
 "literal> Hibernate liée au thread courant pour exécuter la requête:"
 
 #. Tag: programlisting
-#: tutorial.xml:979
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:981
+#: tutorial.xml:1049
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2639,31 +2463,32 @@
 "<literal>Session</literal> du thread courant:"
 
 #. Tag: programlisting
-#: tutorial.xml:987
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:989
+#: tutorial.xml:1057
 #, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these objects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "La servlet est faite. Une requête à la servlet sera exécutée par une seule "
 "<literal>Session</literal> et <literal>Transaction</literal>. Comme pour une "
@@ -2675,54 +2500,24 @@
 "Voir le wiki Hibernate pour plus d'exemples."
 
 #. Tag: title
-#: tutorial.xml:1003
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "Déployer et tester"
 
 #. Tag: para
-#: tutorial.xml:1005
+#: tutorial.xml:1073
 #, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"Pour déployer cette application, vous devez créer une archive Web, un War. "
-"Ajoutez la cible Ant suivante dans votre <literal>build.xml</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:1010
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:1012
-#, no-c-format
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"Cette cible créé un fichier nommé <literal>hibernate-tutorial.war</literal> "
-"dans le répertoire de votre projet. Elle package les bibliothèques et le "
-"descripteur <literal>web.xml</literal> qui est attendu dans le répertoire "
-"racine de votre projet:"
-
-#. Tag: programlisting
-#: tutorial.xml:1018
-#, no-c-format
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -2732,7 +2527,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -2743,33 +2539,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1020
+#: tutorial.xml:1081
 #, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compilation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"Avant de compiler et déployer l'application web, notez qu'une bibliothèque "
-"supplémentaire est requise: <literal>servlet.jar</literal>. C'est le kit de "
-"développement de Servlet Java, si vous ne disposez pas de cette "
-"bibliothèque, prenez la sur le <ulink url=\"http://java.sun.com/products/"
-"servlet/archive.html\">site de Sun</ulink> et copiez la dans votre "
-"répertoire des bibliothèques. Cependant, elle ne sera utilisée uniquement "
-"pour la compilation et sera exclue du paackage WAR."
-
-#. Tag: para
-#: tutorial.xml:1028
-#, no-c-format
-msgid ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
-msgstr ""
 "Pour construire et déployer, appelez <literal>ant war</literal> dans votre "
 "projet et copier le fichier <literal>hibernate-tutorial.war</literal> dans "
 "le répertoire <literal>webapp</literal> de tomcat Si vous n'avez pas "
@@ -2778,9 +2554,18 @@
 "application."
 
 #. Tag: para
-#: tutorial.xml:1036
+#: tutorial.xml:1088
 #, no-c-format
 msgid ""
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:1096
+#, no-c-format
+msgid ""
 "Once deployed and Tomcat is running, access the application at "
 "<literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. "
 "Make sure you watch the Tomcat log to see Hibernate initialize when the "
@@ -2796,50 +2581,361 @@
 "vérifier qu'aucune exception ne survienne."
 
 #. Tag: title
-#: tutorial.xml:1049
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr "Résumé"
 
 #. Tag: para
-#: tutorial.xml:1051
-#, no-c-format
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "Ce didacticiel a couvert les bases de l'écriture d'une simple application "
 "Hibernate ainsi qu'une petite application web."
 
-#. Tag: para
-#: tutorial.xml:1056
-#, no-c-format
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"Si vous êtes déjà confiants avec Hibernate, continuez à parcourir les sujets "
-"que vous trouvez intéressants à travers la table des matières de la "
-"documentation de référence - les plus demandés sont le traitement "
-"transactionnel (<xref linkend=\"transactions\"/>), la performance des "
-"récupérations d'information (<xref linkend=\"performance\"/>), ou "
-"l'utilisation de l'API (<xref linkend=\"objectstate\"/>) et les "
-"fonctionnalités des requêtes (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Introduction à Hibernate"
 
-#. Tag: para
-#: tutorial.xml:1064
-#, no-c-format
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-"N'oubliez pas de vérifier le site web d'Hibernate pour d'autres didacticiels "
-"(plus spécialisés)."
+#~ msgid "Preface"
+#~ msgstr "Préface"
 
 #~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "Notre première classe persistante est une simple classe JavaBean avec "
+#~ "quelques propriétés :"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "Placez ce fichier source Java dans un répertoire appelé <literal>src</"
+#~ "literal> dans le dossier de développement. Ce répertoire devrait "
+#~ "maintenant ressembler à ça :"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr ""
+#~ "Dans la prochaine étape, nous informons Hibernate de cette classe "
+#~ "persistante."
+
+#, fuzzy
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifier "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "L'élément <literal>id</literal> est la déclaration de la propriété de "
+#~ "l'identifiant, <literal>name=\"id\"</literal> déclare le nom de la "
+#~ "propriété Java - Hibernate utilisera les méthodes getter et setter pour "
+#~ "accéder à la propriété. L'attribut <literal>column</literal> indique à "
+#~ "Hibernate quelle colonne de la table <literal>EVENTS</literal> nous "
+#~ "utilisons pour cette clef primaire. L'élément <literal>generator</"
+#~ "literal> imbriqué spécifie la stratégie de génération de l'identifiant, "
+#~ "dans ce cas nous avons utilisé <literal>increment</literal>, laquelle est "
+#~ "une méthode très simple utile surtout pour les tests (et didacticiels). "
+#~ "Hibernate supporte aussi les identifiants générés par les bases de "
+#~ "données, globalement uniques, ainsi que les identifiants assignés par "
+#~ "l'application (ou n'importe quelle stratégie que vous avez écrit en "
+#~ "extension)."
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "Ce fichier de mapping devrait être sauvegardé en tant que <literal>Event."
+#~ "hbm.xml</literal>, juste dans le répertoire à côté du fichier source de "
+#~ "la classe Java <literal>Event</literal>. Le nommage des fichiers de "
+#~ "mapping peut être arbitraire, cependant le suffixe <literal>hbm.xml</"
+#~ "literal> est devenu une convention dans la communauté des développeurs "
+#~ "Hibernate. La structure du répertoire devrait ressembler à ça :"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "Nous poursuivons avec la configuration principale d'Hibernate."
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "Nous avons maintenant une classe persistante et son fichier de mapping. "
+#~ "Il est temps de configurer Hibernate. Avant ça, nous avons besoin d'une "
+#~ "base de données. HSQL DB, un SGBD SQL basé sur Java et travaillant en "
+#~ "mémoire, peut être téléchargé à partir du site web de HSQL. En fait, vous "
+#~ "avez seulement besoin de <literal>hsqldb.jar</literal>. Placez ce fichier "
+#~ "dans le répertoire <literal>lib/</literal> du dossier de développement."
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "Hibernate est la couche de votre application qui se connecte à cette base "
+#~ "de données, donc il a besoin des informations de connexion. Les "
+#~ "connexions sont établies à travers un pool de connexions JDBC, que nous "
+#~ "devons aussi configurer. La distribution Hibernate contient différents "
+#~ "outils de gestion de pools de connexions JDBC open source, mais pour ce "
+#~ "didacticiel nous utiliserons le pool de connexions intégré à Hibernate. "
+#~ "Notez que vous devez copier les bibliothèques requises dans votre "
+#~ "classpath et utiliser une configuration de pool de connexions différente "
+#~ "si vous voulez utiliser un logiciel de gestion de pools JDBC tiers avec "
+#~ "une qualité de production."
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "Copiez ce fichier dans le répertoire source, il terminera dans la racine "
+#~ "du classpath. Hibernate cherchera automatiquement, au démarrage, un "
+#~ "fichier appelé <literal>hibernate.cfg.xml</literal> dans la racine du "
+#~ "classpath."
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "Nous allons maintenant construire le didacticiel avec Ant. Vous aurez "
+#~ "besoin d'avoir Ant d'installé - récupérez-le à partir de <ulink url="
+#~ "\"http://ant.apache.org/bindownload.cgi\"> la page de téléchargement de "
+#~ "Ant</ulink>. Comment installer Ant ne sera pas couvert ici. Référez-vous "
+#~ "au <ulink url=\"http://ant.apache.org/manual/index.html\">manuel d'Ant</"
+#~ "ulink>. Après que vous aurez installé Ant, nous pourrons commencer à "
+#~ "créer le fichier de construction. Il s'appellera <literal>build.xml</"
+#~ "literal> et sera placé directement dans le répertoire de développement."
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "Un fichier de construction basique ressemble à ça :"
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr ""
+#~ "Cela dira à Ant d'ajouter tous les fichiers du répertoire lib finissant "
+#~ "par <literal>.jar</literal> dans le classpath utilisé pour la "
+#~ "compilation. Cela copiera aussi tous les fichiers source non Java dans le "
+#~ "répertoire cible, par exemple les fichiers de configuration et de mapping "
+#~ "d'Hibernate. Si vous lancez Ant maintenant, vous devriez obtenir cette "
+#~ "sortie :"
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "Placez <literal>HibernateUtil.java</literal> dans le répertoire source de "
+#~ "développement, et ensuite <literal>Event.java</literal> :"
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "Pour lancer cette première routine, nous devons ajouter une cible "
+#~ "appelable dans le fichier de construction de Ant :"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "La valeur de l'argument <literal>action</literal> correspond à la ligne "
+#~ "de commande qui appelle la cible :"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "C'est l'<literal>INSERT</literal> exécuté par Hibernate, les points "
+#~ "d'interrogation représentent les paramètres JDBC liés. Pour voir les "
+#~ "valeurs liées aux arguments, ou pour réduire la verbosité des traces, "
+#~ "vérifier votre <literal>log4j.properties</literal>."
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr "Maintenant, pour exécuter et tester tout ça, suivez ces étapes :"
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr ""
+#~ "Exécutez <literal>ant run -Daction=store</literal> pour stocker quelque "
+#~ "chose dans la base de données et, bien sûr, pour générer, avant, le "
+#~ "schéma de la base de données grâce à hbm2ddl."
+
+#, fuzzy
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continuous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "Maintenant désactivez hbm2ddl en commentant la propriété dans votre "
+#~ "fichier <literal>hibernate.cfg.xml</literal>. Généralement vous la "
+#~ "laissez seulement activée dans des tests unitaires en continu, mais une "
+#~ "autre exécution de hbm2ddl <emphasis>effacerait</emphasis> tout ce que "
+#~ "vous avez stocké - le paramètre de configuration <literal>create</"
+#~ "literal> se traduit en fait par \"supprimer toutes les tables du schéma, "
+#~ "puis re-créer toutes les tables, lorsque la SessionFactory est construite"
+#~ "\"."
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "Si maintenant vous appelez Ant avec <literal>-Daction=list</literal>, "
+#~ "vous devriez voir les événements que vous avez stockés jusque là. Vous "
+#~ "pouvez bien sûr aussi appeler l'action <literal>store</literal> plusieurs "
+#~ "fois."
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "UNTRANSLATED! Note: Most new Hibernate users fail at this point and we "
+#~ "see questions about <emphasis>Table not found</emphasis> error messages "
+#~ "regularly. However, if you follow the steps outlined above you will not "
+#~ "have this problem, as hbm2ddl creates the database schema on the first "
+#~ "run, and subsequent application restarts will use this schema. If you "
+#~ "change the mapping and/or database schema, you have to re-enable hbm2ddl "
+#~ "once again."
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "Créez un nouveau fichier de mapping appelé <literal>Person.hbm.xml</"
+#~ "literal> (n'oubliez pas la référence à la DTD)"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr ""
+#~ "Nous avons besoin d'une association unidirectionnelle, pluri-valuée, "
+#~ "implémentée avec un <literal>Set</literal>. Écrivons le code pour ça dans "
+#~ "les classes Java et mappons les :"
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "Nous ajoutons une collection d'objets de type de valeur à l'entité "
+#~ "<literal>Person</literal>. Nous voulons stocker des adresses email, donc "
+#~ "le type que nous utilisons est <literal>String</literal>, et la "
+#~ "collection est encore un <literal>Set</literal> :"
+
+#, fuzzy
+#~ msgid "Let's turn the following discussion into a small web application..."
+#~ msgstr "Let's turn this into a small web application."
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr ""
+#~ "Créons une nouvelle classe dans notre répertoire source, dans le package "
+#~ "<literal>events</literal>:"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "Pour déployer cette application, vous devez créer une archive Web, un "
+#~ "War. Ajoutez la cible Ant suivante dans votre <literal>build.xml</"
+#~ "literal>:"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "Cette cible créé un fichier nommé <literal>hibernate-tutorial.war</"
+#~ "literal> dans le répertoire de votre projet. Elle package les "
+#~ "bibliothèques et le descripteur <literal>web.xml</literal> qui est "
+#~ "attendu dans le répertoire racine de votre projet:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compilation and excluded from the WAR package."
+#~ msgstr ""
+#~ "Avant de compiler et déployer l'application web, notez qu'une "
+#~ "bibliothèque supplémentaire est requise: <literal>servlet.jar</literal>. "
+#~ "C'est le kit de développement de Servlet Java, si vous ne disposez pas de "
+#~ "cette bibliothèque, prenez la sur le <ulink url=\"http://java.sun.com/"
+#~ "products/servlet/archive.html\">site de Sun</ulink> et copiez la dans "
+#~ "votre répertoire des bibliothèques. Cependant, elle ne sera utilisée "
+#~ "uniquement pour la compilation et sera exclue du paackage WAR."
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "Si vous êtes déjà confiants avec Hibernate, continuez à parcourir les "
+#~ "sujets que vous trouvez intéressants à travers la table des matières de "
+#~ "la documentation de référence - les plus demandés sont le traitement "
+#~ "transactionnel (<xref linkend=\"transactions\"/>), la performance des "
+#~ "récupérations d'information (<xref linkend=\"performance\"/>), ou "
+#~ "l'utilisation de l'API (<xref linkend=\"objectstate\"/>) et les "
+#~ "fonctionnalités des requêtes (<xref linkend=\"objectstate-querying\"/>)."
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr ""
+#~ "N'oubliez pas de vérifier le site web d'Hibernate pour d'autres "
+#~ "didacticiels (plus spécialisés)."
+
+#~ msgid ""
 #~ "This chapter is an introductory tutorial for new users of Hibernate. We "
 #~ "start with a simple command line application using an in-memory database "
 #~ "and develop it in easy to understand steps."
@@ -2878,14 +2974,6 @@
 #~ "à installer de serveur de base de données."
 
 #~ msgid ""
-#~ "Let's assume we need a small database application that can store events "
-#~ "we want to attend, and information about the hosts of these events."
-#~ msgstr ""
-#~ "Supposons que nous ayons besoin d'une petite application de base de "
-#~ "données qui puisse stocker des événements que nous voulons suivre, et des "
-#~ "informations à propos des hôtes de ces événements."
-
-#~ msgid ""
 #~ "The first thing we do, is set up our development directory and put all "
 #~ "the Java libraries we need into it. Download the Hibernate distribution "
 #~ "from the Hibernate website. Extract the package and place all required "

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: emphasis
 #: xml.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr ""
 "Notez que cette fonctionnalité est expérimentale dans Hibernate 3.0 et est "
 "en développement extrêmement actif."
@@ -34,12 +34,12 @@
 
 #. Tag: para
 #: xml.xml:39
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "Hibernate vous laisse travailler avec des données XML persistantes de la "
 "même manière que vous travaillez avec des POJOs persistants. Un arbre XML "
@@ -79,11 +79,11 @@
 
 #. Tag: para
 #: xml.xml:61
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "Un simple mapping peut être utilisé pour simultanément mapper les propriétés "
 "d'une classe et les noeuds d'un document XML vers la base de données, ou, si "
@@ -171,11 +171,11 @@
 
 #. Tag: para
 #: xml.xml:86
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "Ce mapping vous permet d'accéder aux données comme un arbre dom4j, ou comme "
 "un graphe de paire nom de propriété/valeur (<literal>Map</literal>s java). "
@@ -190,10 +190,10 @@
 
 #. Tag: para
 #: xml.xml:99
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -204,28 +204,28 @@
 
 #. Tag: para
 #: xml.xml:108
-#, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr "<literal>\"element-name\"</literal> - mappe vers l'élément XML nommé"
 
 #. Tag: para
 #: xml.xml:111
-#, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 "<literal>\"@attribute-name\"</literal> - mappe vers l'attribut XML nommé"
 
 #. Tag: para
 #: xml.xml:114
-#, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - mappe vers le parent de l'élément"
 
 #. Tag: para
 #: xml.xml:117
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - mappe vers l'élément "
@@ -233,7 +233,7 @@
 
 #. Tag: para
 #: xml.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -241,7 +241,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "Pour des collections et de simples associations valuées, il y a un attribut "
 "<literal>embed-xml</literal> supplémentaire. Si <literal>embed-xml=\"true\"</"
@@ -254,10 +254,10 @@
 
 #. Tag: para
 #: xml.xml:134
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "Vous devriez faire attention à ne pas laisser <literal>embed-xml=\"true\"</"
 "literal> pour trop d'associations, puisque XML ne traite pas bien les liens "
@@ -305,10 +305,10 @@
 
 #. Tag: para
 #: xml.xml:141
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "dans ce cas, nous avons décidé d'embarquer la collection d'identifiants de "
 "compte, mais pas les données actuelles du compte. La requête HQL suivante :"
@@ -323,8 +323,8 @@
 
 #. Tag: para
 #: xml.xml:148
-#, no-c-format
-msgid "Would return datasets such as this:"
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "devrait retourner l'ensemble de données suivant :"
 
 #. Tag: programlisting
@@ -384,10 +384,10 @@
 
 #. Tag: para
 #: xml.xml:167
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "Relisons et mettons à jour des documents XML dans l'application. Nous "
 "faisons ça en obtenant une session dom4j :"
@@ -440,11 +440,10 @@
 
 #. Tag: para
 #: xml.xml:176
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "Il est extrêmement utile de combiner cette fonctionnalité avec l'opération "
 "<literal>replicate()</literal> d'Hibernate pour implémenter des imports/"

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - Relational Persistence for Idiomatic Java"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "Hibernate Reference Documentation"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,42 +11,57 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: architecture.xml:21
+#: architecture.xml:30
 #, no-c-format
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
 #. Tag: title
-#: architecture.xml:24
+#: architecture.xml:33
 #, no-c-format
 msgid "Overview"
 msgstr "概観"
 
 #. Tag: para
-#: architecture.xml:26
-#, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+#: architecture.xml:35
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Hibernateアーキテクチャの(非常に)高いレベルからのビュー:"
 
 #. Tag: para
-#: architecture.xml:39
-#, no-c-format
+#: architecture.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"ここで実行時アーキテクチャのより詳細なビューをお見せしましょう。 あいにく、"
+"Hibernateは柔軟であり、いろいろなアプローチをサポートしています。 ここでは、2"
+"つの極端な例をお見せします。 「軽い」アーキテクチャでは、アプリケーションが自"
+"前のJDBCコネクションを用意し、 アプリケーション自身がトランザクションを管理し"
+"ます。 この方法は、Hibernate APIの最小限のサブセットを使います:"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "この図はHibernateが、アプリケーションに対して永続化サービス (と永続オブジェ"
 "クト)を提供するために、データベースと設定データを使うことを 示しています。"
 
 #. Tag: para
-#: architecture.xml:44
-#, no-c-format
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "ここで実行時アーキテクチャのより詳細なビューをお見せしましょう。 あいにく、"
 "Hibernateは柔軟であり、いろいろなアプローチをサポートしています。 ここでは、2"
@@ -55,36 +70,36 @@
 "ます。 この方法は、Hibernate APIの最小限のサブセットを使います:"
 
 #. Tag: para
-#: architecture.xml:61
-#, no-c-format
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "「重い」アーキテクチャは、アプリケーションから、その下に位置するJDBCやJTAの"
 "APIを 取り払って抽象化し、その詳細の面倒をHibernateに見させます。"
 
 #. Tag: para
-#: architecture.xml:75
+#: architecture.xml:88
 #, fuzzy, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr "以下は、上の図に含まれるオブジェクトの定義です: <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:80
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:82
-#, no-c-format
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "1つのデータベースに対するコンパイルされたマッピングの スレッドセーフな(更新"
 "不能の)キャッシュ。 <literal>Session</literal> のファクトリであり、 "
@@ -93,20 +108,20 @@
 "(二次)キャッシュを持ちます。"
 
 #. Tag: term
-#: architecture.xml:92
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:94
-#, no-c-format
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "アプリケーションと永続ストアとの対話を表す、 シングルスレッドで短命のオブジェ"
 "クト。 JDBCコネクションをラップします。 <literal>Transaction</literal> のファ"
@@ -115,21 +130,21 @@
 "を検索する時に使われます。"
 
 #. Tag: term
-#: architecture.xml:104
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Persistent objects と Collections"
 
 #. Tag: para
-#: architecture.xml:106
-#, no-c-format
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "永続化状態とビジネスメソッドを持つ、短命でシングルスレッドのオブジェクト。 こ"
 "れは通常のJavaBeans/POJOのこともありますが、特徴的なことは、 その時点での(た"
@@ -140,18 +155,18 @@
 "層へ直接使用できます。)"
 
 #. Tag: term
-#: architecture.xml:117
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Transient と detached な objects と Collections"
 
 #. Tag: para
-#: architecture.xml:119
-#, no-c-format
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "現時点では <literal>Session</literal> と関連していない、 永続クラスのインスタ"
@@ -160,21 +175,21 @@
 "どちらかです。"
 
 #. Tag: term
-#: architecture.xml:128
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:130
-#, no-c-format
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(オプション)原子性を持つ作業単位(Unit of Work)を指定するために、アプリケー"
 "ションが使用する、 シングルスレッドで短命なオブジェクト。 下に位置するJDBC、"
@@ -185,7 +200,7 @@
 "ことは、決してオプションではありません!。"
 
 #. Tag: term
-#: architecture.xml:141
+#: architecture.xml:153
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -195,13 +210,13 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:143
-#, no-c-format
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(オプション)JDBCコネクション(とそのプール)のファクトリ。 下の層に位置する "
 "<literal>Datasource</literal> や <literal>DriverManager</literal> からアプリ"
@@ -209,7 +224,7 @@
 "または実装することは可能です。"
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:163
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -217,94 +232,96 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
-#, no-c-format
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(オプション) <literal>Transaction</literal> インスタンスのファクトリ。 アプリ"
 "ケーションには公開されませんが、開発者が継承または実装することは可能です。"
 
 #. Tag: emphasis
-#: architecture.xml:160
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "Extension Interfaces"
 
 #. Tag: para
-#: architecture.xml:162
-#, no-c-format
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "Hibernateは、永続層の振る舞いをカスタマイズするために、 多くのオプション拡張"
 "インタフェースを用意しています。 詳細はAPIドキュメントを参照してください。"
 
 #. Tag: para
-#: architecture.xml:171
-#, no-c-format
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "「軽い」アーキテクチャでは、アプリケーションは直接JTAやJDBCと対話するため"
 "に、 <literal>Transaction</literal> や <literal>TransactionFactory</literal> "
 "や <literal>ConnectionProvider</literal> をバイパスします。"
 
 #. Tag: title
-#: architecture.xml:179
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr "インスタンスの状態"
 
 #. Tag: para
-#: architecture.xml:180
-#, no-c-format
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "永続クラスのインスタンスは、次の3つの異なる状態のどれかになります。 それ"
 "は、 <emphasis>永続コンテキスト</emphasis> によって決まります。 Hibernateの "
 "<literal>Session</literal> オブジェクトが、永続コンテキストになります。"
 
 #. Tag: term
-#: architecture.xml:188
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr "transient"
 
 #. Tag: para
-#: architecture.xml:190
-#, no-c-format
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr ""
 "この状態のインスタンスは、現在もそして過去においても、 永続コンテキストに関連"
 "づいていません。また、永続ID(主キーの値)を 持っていません。"
 
 #. Tag: term
-#: architecture.xml:198
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr "persistent"
 
 #. Tag: para
-#: architecture.xml:200
-#, no-c-format
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "この状態のインスタンスは、その時点で永続コンテキストに関連づいています。 ま"
 "た、永続ID(主キーの値)を持ち、 たいていはデータベースに対応する行を持ってい"
@@ -313,19 +330,19 @@
 "します。"
 
 #. Tag: term
-#: architecture.xml:212
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr "detached"
 
 #. Tag: para
-#: architecture.xml:214
-#, no-c-format
+#: architecture.xml:226
+#, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corrsponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "この状態のインスタンスは、かつて永続コンテキストに関連づけられたが、 そのコン"
@@ -335,47 +352,48 @@
 "のIDとの関連は、Hibernateが保証しません。"
 
 #. Tag: title
-#: architecture.xml:229
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr "JMXとの統合"
 
 #. Tag: para
-#: architecture.xml:231
-#, no-c-format
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMXはJavaコンポーネント管理のJ2EE標準です。 JMX標準サービスを通して、"
 "Hibernateは管理されます。 ディストリビューションの中に <literal>org."
 "hibernate.jmx.HibernateService</literal> という MBean実装を用意しています。"
 
 #. Tag: para
-#: architecture.xml:237
-#, no-c-format
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "JBoss アプリケーションサーバー上にHibernateをJMXサービスとしてデプロイする方"
 "法の例としては、 JBoss ユーザガイドを参照してください。 JBoss アプリケーショ"
 "ンサーバーにおいて、 JMXを使ってデプロイすると、次のメリットが得られます。"
 
 #. Tag: para
-#: architecture.xml:245
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>セッション管理:</emphasis> Hibernateの <literal>Session</literal> "
@@ -389,16 +407,16 @@
 "<literal>HibernateContext</literal> を コールしてください。"
 
 #. Tag: para
-#: architecture.xml:257
-#, no-c-format
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>HAR デプロイ:</emphasis> 通常、(EAR または SAR ファイルにある)"
 "JBoss サービス デプロイメントディスクリプタを使って、Hibernate JMX サービスを"
@@ -409,7 +427,7 @@
 "HARファイルのなかの全てのマッピングファイルを検出します。"
 
 #. Tag: para
-#: architecture.xml:268
+#: architecture.xml:280
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
@@ -418,51 +436,52 @@
 "イドを 参考にしてください。"
 
 #. Tag: para
-#: architecture.xml:272
-#, no-c-format
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "JMXサービスとして利用可能な他の機能に、Hibernate実行時統計情報があります。 "
 "<xref linkend=\"configuration-optional-statistics\"/> を見てください。"
 
 #. Tag: title
-#: architecture.xml:279
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr "JCA サポート"
 
 #. Tag: para
-#: architecture.xml:280
-#, no-c-format
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hibernate は JCA コネクタとしても設定できます。詳細については、Webサイトを見"
 "てください。 Hibernate JCA サポートは、今のところ実験段階として考えられている"
 "ことに注意してください。"
 
 #. Tag: title
-#: architecture.xml:287
-#, no-c-format
-msgid "Contextual Sessions"
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "コンテキスト上のセッション"
 
 #. Tag: para
-#: architecture.xml:288
-#, no-c-format
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "Hibernate を使ったアプリケーションは、ほとんど、なんらかの形で\"コンテキスト"
@@ -477,19 +496,18 @@
 "ティのフレームワークを利用するかのいずれかでした。"
 
 #. Tag: para
-#: architecture.xml:297
-#, no-c-format
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "バージョン 3.0.1 から、Hibernate には <literal>SessionFactory."
 "getCurrentSession()</literal> が 加わりました。 これは、 <literal>JTA</"
@@ -503,14 +521,14 @@
 "の「コンテキスト上のセッション」を 使うしかないでしょう。"
 
 #. Tag: para
-#: architecture.xml:307
-#, no-c-format
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "しかし、バージョン 3.1 からは、 <literal>SessionFactory.getCurrentSession()</"
@@ -521,15 +539,15 @@
 "current_session_context_class</literal> ) が追加されました。"
 
 #. Tag: para
-#: architecture.xml:314
-#, no-c-format
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "<literal>org.hibernate.context.CurrentSessionContext</literal> インタフェース"
 "の規約についての 詳細な内容は Javadoc を参照してください。 それには、 "
@@ -539,11 +557,11 @@
 "ます。"
 
 #. Tag: para
-#: architecture.xml:324
-#, no-c-format
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -553,25 +571,24 @@
 "Javadocを参照してください。"
 
 #. Tag: para
-#: architecture.xml:332
-#, no-c-format
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - スレッド"
 "の実行によって、現在のセッションが追跡されます。 詳細はJavadocを参照してくだ"
 "さい。"
 
 #. Tag: para
-#: architecture.xml:338
-#, no-c-format
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - スレッドの実"
 "行によって、現在のセッションが追跡されます。 しかし、このクラスのstaticメソッ"
@@ -580,20 +597,21 @@
 "ラッシュ、クローズしません。"
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:359
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programatic "
-"transaction demarcation in plain JSE without JTA, you are adviced to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "始めの2つの実装は、\"1セッション - 1データベーストランザクション\" プログラミ"
 "ングモデルを提供します。 これは <emphasis>リクエストごとのセッション"
@@ -609,18 +627,18 @@
 "\"transactions\"/> を参照してください。"
 
 #. Tag: para
-#: architecture.xml:359
-#, no-c-format
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "<literal>hibernate.current_session_context_class</literal> 設定パラメータ"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,24 +11,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: association_mapping.xml:6
+#: association_mapping.xml:30
 #, no-c-format
 msgid "Association Mappings"
 msgstr "関連マッピング"
 
 #. Tag: title
-#: association_mapping.xml:9
+#: association_mapping.xml:33
 #, no-c-format
 msgid "Introduction"
 msgstr "イントロダクション"
 
 #. Tag: para
-#: association_mapping.xml:11
-#, no-c-format
+#: association_mapping.xml:35
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -38,41 +38,41 @@
 "<literal>Address</literal> を用います。"
 
 #. Tag: para
-#: association_mapping.xml:19
-#, no-c-format
+#: association_mapping.xml:43
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr ""
 "関連は、結合テーブルを入れるかかどうかと、 多重度によって分類することにしま"
 "す。"
 
 #. Tag: para
-#: association_mapping.xml:24
-#, no-c-format
+#: association_mapping.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "すべての例でnot nullの外部キーを使用します。 これはHibernateの要件ではありま"
 "せん。 not null制約を外したとしても、マッピングは問題なく動作します。"
 
 #. Tag: title
-#: association_mapping.xml:34
+#: association_mapping.xml:58
 #, no-c-format
 msgid "Unidirectional associations"
 msgstr "単方向関連"
 
 #. Tag: title
-#: association_mapping.xml:37 association_mapping.xml:108
-#, no-c-format
-msgid "many to one"
+#: association_mapping.xml:61 association_mapping.xml:132
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "多対一"
 
 #. Tag: para
-#: association_mapping.xml:39
+#: association_mapping.xml:63
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association</emphasis> is the most "
@@ -82,7 +82,7 @@
 "す。"
 
 #. Tag: programlisting
-#: association_mapping.xml:44
+#: association_mapping.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -102,7 +102,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:45 association_mapping.xml:161
+#: association_mapping.xml:69 association_mapping.xml:185
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -113,14 +113,14 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:50 association_mapping.xml:121
-#: association_mapping.xml:185 association_mapping.xml:225
-#, no-c-format
-msgid "one to one"
+#: association_mapping.xml:74 association_mapping.xml:145
+#: association_mapping.xml:210
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "一対一"
 
 #. Tag: para
-#: association_mapping.xml:52
+#: association_mapping.xml:76
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a foreign key</"
@@ -131,7 +131,7 @@
 "違うのは、カラムのユニークな制約です。"
 
 #. Tag: programlisting
-#: association_mapping.xml:57
+#: association_mapping.xml:81
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -152,7 +152,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:58 association_mapping.xml:193
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -163,18 +163,18 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:60
-#, no-c-format
+#: association_mapping.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"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:66
+#: association_mapping.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -194,7 +194,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:67 association_mapping.xml:201
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -204,23 +204,23 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:72 association_mapping.xml:94
-#, no-c-format
-msgid "one to many"
+#: association_mapping.xml:96 association_mapping.xml:118
+#, fuzzy, no-c-format
+msgid "One-to-many"
 msgstr "一対多"
 
 #. Tag: para
-#: association_mapping.xml:74
-#, no-c-format
+#: association_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "<emphasis>外部キーの単方向一対多関連</emphasis> はとても特殊なケースで、 あま"
 "り推奨されていません。"
 
 #. Tag: programlisting
-#: association_mapping.xml:79
+#: association_mapping.xml:103
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -242,7 +242,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:80
+#: association_mapping.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -253,32 +253,31 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:82
-#, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+#: association_mapping.xml:106
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr "このような関連のために結合テーブルを使うことをお薦めします。"
 
 #. Tag: title
-#: association_mapping.xml:91
+#: association_mapping.xml:115
 #, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "結合テーブルを使った単方向関連"
 
 #. Tag: para
-#: association_mapping.xml:96
-#, no-c-format
+#: association_mapping.xml:120
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"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> の指定により、多重度が多対多から一対"
 "多 に変わったことに注意して下さい。"
 
 #. Tag: programlisting
-#: association_mapping.xml:102
+#: association_mapping.xml:126
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -301,7 +300,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:103
+#: association_mapping.xml:127
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -313,17 +312,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:110
-#, no-c-format
+#: association_mapping.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "<emphasis>結合テーブルの単方向多対一関連</emphasis> は 関連が任意であるときに"
 "非常に一般的なものです。"
 
 #. Tag: programlisting
-#: association_mapping.xml:115
+#: association_mapping.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -347,7 +346,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:116
+#: association_mapping.xml:140
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -359,17 +358,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:123
-#, no-c-format
+#: association_mapping.xml:147
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>結合テーブルの単方向一対一関連</emphasis> は、本当に特殊ですが 不可"
 "能ではありません。"
 
 #. Tag: programlisting
-#: association_mapping.xml:128
+#: association_mapping.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -395,7 +394,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:129 association_mapping.xml:233
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -407,21 +406,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:134 association_mapping.xml:238
-#, no-c-format
-msgid "many to many"
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "多対多"
 
 #. Tag: para
-#: association_mapping.xml:136
-#, no-c-format
+#: association_mapping.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr "最後に、<emphasis>単方向多対多関連</emphasis> を示します。"
 
 #. Tag: programlisting
-#: association_mapping.xml:140
+#: association_mapping.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -443,7 +442,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:141 association_mapping.xml:246
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -455,29 +454,30 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:148
+#: association_mapping.xml:172
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "双方向関連"
 
 #. Tag: title
-#: association_mapping.xml:151 association_mapping.xml:211
-#, no-c-format
-msgid "one to many / many to one"
+#: association_mapping.xml:175 association_mapping.xml:236
+#, fuzzy, no-c-format
+msgid "one-to-many / many-to-one"
 msgstr "一対多/多対一"
 
 #. Tag: para
-#: association_mapping.xml:153
-#, no-c-format
+#: association_mapping.xml:177
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "<emphasis>双方向多対一関連</emphasis> は最も一般的な関連です。 (標準的な親子"
 "関係です)"
 
 #. Tag: programlisting
-#: association_mapping.xml:159
+#: association_mapping.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -501,15 +501,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:163
-#, no-c-format
+#: association_mapping.xml:187
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "<literal>List</literal> (または他のインデックス付きのコレクション)を使うな"
 "ら、 外部キーの <literal>key</literal> カラムを <literal>not null</literal> "
@@ -519,7 +519,7 @@
 "す):"
 
 #. Tag: programlisting
-#: association_mapping.xml:171
+#: association_mapping.xml:195
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -544,13 +544,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:173
-#, no-c-format
+#: association_mapping.xml:197
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -561,15 +561,15 @@
 "<literal>not-null=\"true\"</literal> と定義しないようにしてください。"
 
 #. Tag: para
-#: association_mapping.xml:187
-#, no-c-format
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr "<emphasis>外部キーの双方向一対一関連</emphasis> は非常に一般的です。"
 
 #. Tag: programlisting
-#: association_mapping.xml:192
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -592,17 +592,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:195
-#, no-c-format
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr ""
 "<emphasis>主キーの双方向一対一関連</emphasis> は特殊なIDジェネレータを使いま"
 "す。"
 
 #. Tag: programlisting
-#: association_mapping.xml:200
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -624,25 +624,26 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:208
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "結合テーブルを使った双方向関連"
 
 #. Tag: para
-#: association_mapping.xml:213
-#, no-c-format
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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\"</literal> が関連端、コレクション、結合のいずれかに 設定できることに"
 "注意してください。"
 
 #. Tag: programlisting
-#: association_mapping.xml:219
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -674,7 +675,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:220
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -685,18 +686,24 @@
 "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, no-c-format
+msgid "one to one"
+msgstr "一対一"
+
 #. Tag: para
-#: association_mapping.xml:227
-#, no-c-format
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>結合テーブルの双方向一対一関連</emphasis> は非常に特殊ですが、可能"
 "です。"
 
 #. Tag: programlisting
-#: association_mapping.xml:232
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -732,15 +739,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:240
-#, no-c-format
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr "最後に、<emphasis>双方向多対多関連</emphasis> を示します。"
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -767,21 +774,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:253
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "より複雑な関連マッピング"
 
 #. Tag: para
-#: association_mapping.xml:255
-#, no-c-format
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "より複雑な関連結合は <emphasis>極めて</emphasis> 稀です。 マッピングドキュメ"
 "ントにSQL文を埋め込むことで、 さらに複雑な状況を扱うことができます。 例えば、"
@@ -790,7 +797,7 @@
 "扱うテーブルは、 以下のようにマッピングします。"
 
 #. Tag: programlisting
-#: association_mapping.xml:264
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -805,18 +812,18 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:266
-#, no-c-format
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"You can then map an association to the <emphasis>current</emphasis> "
+"instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "そして、関連を <emphasis>現時点の</emphasis> インスタンス "
 "(<literal>effectiveEndDate</literal> がnullであるもの)にマッピングします。 "
 "以下のようになります:"
 
 #. Tag: programlisting
-#: association_mapping.xml:271
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -828,15 +835,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:273
-#, no-c-format
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"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(雇"
@@ -846,7 +853,7 @@
 "の)は、このようにマッピングできます:"
 
 #. Tag: programlisting
-#: association_mapping.xml:281
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -864,11 +871,11 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:283
-#, no-c-format
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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やcriteriaクエリを"
 "使う方がより実践的です。"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: basic_mapping.xml:5
+#: basic_mapping.xml:29
 #, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "基本的なO/Rマッピング"
 
 #. Tag: title
-#: basic_mapping.xml:8
+#: basic_mapping.xml:32
 #, no-c-format
 msgid "Mapping declaration"
 msgstr "マッピング定義"
 
 #. Tag: para
-#: basic_mapping.xml:10
-#, no-c-format
+#: basic_mapping.xml:34
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "オブジェクト/リレーショナルマッピングは通常XMLドキュメントで定義します。 マッ"
 "ピングドキュメントは、読みやすく手作業で編集しやすいようにデザインされていま"
@@ -37,25 +37,25 @@
 "づいて構築されています。"
 
 #. Tag: para
-#: basic_mapping.xml:17
-#, no-c-format
+#: basic_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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というようなマッピングドキュメントを生成するツールが いく"
 "つか存在します。"
 
 #. Tag: para
-#: basic_mapping.xml:23
-#, no-c-format
-msgid "Lets kick off with an example mapping:"
+#: basic_mapping.xml:47
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "サンプルのマッピングから始めましょう:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:27
+#: basic_mapping.xml:51
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -125,14 +125,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:29
-#, no-c-format
+#: basic_mapping.xml:53
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "マッピングドキュメントの内容を説明します。。 ただし、ここではHibernateが実行"
 "時に使うドキュメント要素と属性についてのみ説明します。 マッピングドキュメント"
@@ -141,21 +141,21 @@
 "キーマに影響を与えるものです。"
 
 #. Tag: title
-#: basic_mapping.xml:40
+#: basic_mapping.xml:64
 #, no-c-format
 msgid "Doctype"
 msgstr "Doctype"
 
 #. Tag: para
-#: basic_mapping.xml:42
-#, no-c-format
+#: basic_mapping.xml:66
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "XMLマッピングでは、お見せしたようなドキュメント型を必ず定義すべきです。 実際"
 "のDTDは、上記のURLの <literal>hibernate-x.x.x/src/org/hibernate</literal> "
@@ -165,21 +165,20 @@
 "さい。"
 
 #. Tag: title
-#: basic_mapping.xml:52
+#: basic_mapping.xml:76
 #, no-c-format
 msgid "EntityResolver"
 msgstr "エンティティ・リゾルバ"
 
 #. Tag: para
-#: basic_mapping.xml:53
-#, no-c-format
+#: basic_mapping.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "前述したように、Hibernateはまずクラスパス内でDTDを解決しようとします。 "
 "<literal>org.xml.sax.EntityResolver</literal> のカスタム実装を XMLファイルを"
@@ -188,13 +187,13 @@
 "ます。"
 
 #. Tag: para
-#: basic_mapping.xml:61
-#, no-c-format
+#: basic_mapping.xml:85
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "<literal>Hibernate名前空間</literal> は、リゾルバが <literal>http://"
 "hibernate.sourceforge.net/</literal> で始まるシステムIDに到達したときに、 認"
@@ -202,12 +201,12 @@
 "いて、 これらのエンティティを解決しようとします。"
 
 #. Tag: para
-#: basic_mapping.xml:70
-#, no-c-format
+#: basic_mapping.xml:94
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -218,13 +217,13 @@
 "ティを解決しようとします。"
 
 #. Tag: para
-#: basic_mapping.xml:79
-#, no-c-format
-msgid "An example of utilizing user namespacing:"
+#: basic_mapping.xml:103
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "下記は、ユーザ名前空間を使った例です:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:82
+#: basic_mapping.xml:106
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -245,7 +244,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:83
+#: basic_mapping.xml:107
 #, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
@@ -257,24 +256,25 @@
 "\">typedef</xref> を含むます。"
 
 #. Tag: title
-#: basic_mapping.xml:91
-#, no-c-format
-msgid "hibernate-mapping"
+#: basic_mapping.xml:115
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
-#: basic_mapping.xml:93
-#, no-c-format
+#: basic_mapping.xml:117
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "この要素にはいくつかオプション属性があります。<literal>schema</literal> 属性"
 "と <literal>catalog</literal> 属性は、 このマッピングが参照するテーブルが、こ"
@@ -287,7 +287,7 @@
 "れていないクラス名を、デフォルトで使えるようにします。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:114
+#: basic_mapping.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
@@ -302,35 +302,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:117
-#, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#: basic_mapping.xml:141
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr "<literal>schema</literal>(オプション):データベーススキーマの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:122
-#, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#: basic_mapping.xml:146
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr ""
 "<literal>catalog</literal> (オプション):データベースカタログの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:127
-#, no-c-format
+#: basic_mapping.xml:151
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (オプション - デフォルトは "
 "<literal>none</literal>): デフォルトのカスケードスタイル。"
 
 #. Tag: para
-#: basic_mapping.xml:133
-#, no-c-format
+#: basic_mapping.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (オプション - デフォルトは "
 "<literal>property</literal> ): Hibernateがプロパティにアクセスする際に採る"
@@ -338,11 +338,11 @@
 "能。"
 
 #. Tag: para
-#: basic_mapping.xml:140
-#, no-c-format
+#: basic_mapping.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (オプション - デフォルトは <literal>true</"
@@ -350,48 +350,48 @@
 "ンマッピングに対するデフォルト値。"
 
 #. Tag: para
-#: basic_mapping.xml:147
-#, no-c-format
+#: basic_mapping.xml:171
+#, fuzzy, 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."
+"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:154
-#, no-c-format
+#: basic_mapping.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<literal>package</literal> (optional): specifies a package prefix to use for "
+"unqualified class names in the mapping document."
 msgstr ""
 "<literal>package</literal> (オプション): マッピングドキュメント内で修飾されて"
 "いないクラス名に対して割り当てる、 パッケージの接頭辞(prefix)を指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:162
-#, no-c-format
+#: basic_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "(修飾されていない)同じ名前の永続クラスが2つあるなら、 <literal>auto-import="
 "\"false\"</literal> を設定すべきです。 2つのクラスに”インポートされた”同じ名"
 "前を割り当てようとすると、Hibernateは例外を投げます。"
 
 #. Tag: para
-#: basic_mapping.xml:168
-#, no-c-format
+#: basic_mapping.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -404,21 +404,21 @@
 "literal> , または継承を使うなら <literal>Animal.hbm.xml</literal> 。"
 
 #. Tag: title
-#: basic_mapping.xml:181
-#, no-c-format
-msgid "<title>class</title>"
-msgstr ""
+#: basic_mapping.xml:205
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:183
-#, no-c-format
+#: basic_mapping.xml:207
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr "<literal>class</literal> 要素を使って、永続クラスを宣言できます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:211
+#: basic_mapping.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[<class\n"
@@ -448,11 +448,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:214
-#, no-c-format
+#: basic_mapping.xml:238
+#, fuzzy, 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 "
+"<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> (オプション):永続クラス(またはインターフェイス)の"
@@ -460,22 +460,22 @@
 "に対するマッピングとして扱われます。"
 
 #. Tag: para
-#: basic_mapping.xml:221
-#, no-c-format
+#: basic_mapping.xml:245
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (オプション - デフォルトは修飾されていないクラス"
 "名):データベーステーブルの名前"
 
 #. Tag: para
-#: basic_mapping.xml:227
-#, no-c-format
+#: basic_mapping.xml:251
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (オプション - デフォルトはクラス名): "
@@ -484,21 +484,21 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:234
-#, no-c-format
+#: basic_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<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:240 basic_mapping.xml:2204
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -509,10 +509,10 @@
 "mapping&gt;</literal> 要素で指定したスキーマ名を オーバーライドします。"
 
 #. Tag: para
-#: basic_mapping.xml:246 basic_mapping.xml:2210
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -523,33 +523,33 @@
 "mapping&gt;</literal> 要素で指定したカタログ名を オーバーライドします。"
 
 #. Tag: para
-#: basic_mapping.xml:252
-#, no-c-format
+#: basic_mapping.xml:276
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (オプション):遅延初期化プロキシに使うインターフェ"
 "イスを指定します。 永続化するクラス名そのものを指定することも可能です。"
 
 #. Tag: para
-#: basic_mapping.xml:258
-#, no-c-format
+#: basic_mapping.xml:282
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (オプション、 デフォルトは "
 "<literal>false</literal> ): 値が変更されたカラムだけを含むSQLの "
 "<literal>UPDATE</literal> 文を、実行時に生成することを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:265
-#, no-c-format
+#: basic_mapping.xml:289
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (オプション, デフォルトは <literal>false</"
@@ -557,17 +557,16 @@
 "literal> 文を、実行時に生成することを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:272
-#, no-c-format
+#: basic_mapping.xml:296
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (オプション, デフォルトは "
 "<literal>false</literal>): オブジェクトが変更されたのが確実でないならば、"
@@ -579,77 +578,79 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:282
-#, no-c-format
+#: basic_mapping.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "(optional, デフォルトでは <literal>implicit</literal> ): implicit(暗黙)か"
 "explicit(明示)の、 どちらのクエリポリモーフィズムを使うか決定します。"
 
 #. Tag: para
-#: basic_mapping.xml:288
-#, no-c-format
+#: basic_mapping.xml:312
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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:294
-#, no-c-format
+#: basic_mapping.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (オプション):カスタム "
 "<literal>ClassPersister</literal> を指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:299
-#, no-c-format
+#: basic_mapping.xml:323
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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> ): 識別子でこのクラスのインスタンスを復元するときの「バッチサイ"
 "ズ」を指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:305
-#, no-c-format
+#: basic_mapping.xml:329
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock</literal> (オプション,デフォルトは "
 "<literal>version</literal> ): 楽観ロック戦略を決定します。"
 
 #. Tag: para
-#: basic_mapping.xml:311
-#, no-c-format
+#: basic_mapping.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<literal>lazy</literal> (optional): lazy fetching can be disabled by setting "
+"<literal>lazy=\"false\"</literal>."
 msgstr ""
 "<literal>lazy</literal> (オプション): <literal>lazy=\"false\"</literal> と"
 "設定することで、 遅延フェッチができなくなります。"
 
 #. Tag: para
-#: basic_mapping.xml:317
-#, no-c-format
+#: basic_mapping.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal> (オプション、デフォルトはクラス名): "
 "Hibernate3ではクラスが複数回マッピングでき(場合によっては違うテーブルに対し"
@@ -659,10 +660,10 @@
 "linkend=\"xml\"/> を参照してください。"
 
 #. Tag: para
-#: basic_mapping.xml:327
-#, no-c-format
+#: basic_mapping.xml:351
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -670,14 +671,14 @@
 "複数行の <emphasis>check</emphasis> 制約を生成するSQL式。"
 
 #. Tag: para
-#: basic_mapping.xml:333
-#, no-c-format
+#: basic_mapping.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (オプション):Hibernateは、それをサポートしている"
 "データベースでROWIDと 呼ばれるものを使うことができます。 例えばOracleを使って"
@@ -687,12 +688,12 @@
 "しています。"
 
 #. Tag: para
-#: basic_mapping.xml:341
-#, no-c-format
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (オプション):不変かつ読み取り専用であるエン"
 "ティティを データベースの副問合せ(subselect)にマッピングします。 もし元の"
@@ -700,24 +701,24 @@
 "りません。より詳しい情報は下記を参照してください。"
 
 #. Tag: para
-#: basic_mapping.xml:348
-#, no-c-format
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (オプション): <literal>&lt;union-subclass&gt;"
 "</literal> 階層内の抽象スーパークラスにマークするために使います。"
 
 #. Tag: para
-#: basic_mapping.xml:356
-#, no-c-format
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "永続クラスの名前にインターフェイスを指定してもまったく問題ありません。 そのと"
 "きは <literal>&lt;subclass&gt;</literal> 要素を使って、 そのインターフェイス"
@@ -726,10 +727,10 @@
 "literal> を使ってクラス名を指定してください。"
 
 #. Tag: para
-#: basic_mapping.xml:363
-#, no-c-format
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -738,14 +739,14 @@
 "マンスを少し改善します。"
 
 #. Tag: para
-#: basic_mapping.xml:368
-#, no-c-format
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "オプションの <literal>proxy</literal> 属性により、クラスの永続インスタンスの"
 "遅延初期化が可能になります。 Hibernateは最初に、指定したインターフェイスを実"
@@ -754,22 +755,22 @@
 "ださい。"
 
 #. Tag: para
-#: basic_mapping.xml:375
-#, no-c-format
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "<emphasis>暗黙的</emphasis> ポリモーフィズムとは、次の二つを意味しています。 "
 "一つはクラスのインスタンスが、スーパークラスや実装したインターフェイス、また"
@@ -787,17 +788,17 @@
 "ります)。"
 
 #. Tag: para
-#: basic_mapping.xml:387
-#, no-c-format
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "<literal>persister</literal> 属性を指定することで、クラスの永続化戦略をカスタ"
 "マイズできます。 例えば <literal>org.hibernate.persister.EntityPersister</"
@@ -809,15 +810,14 @@
 "literal> の「永続化」です)。"
 
 #. Tag: para
-#: basic_mapping.xml:398
-#, no-c-format
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "<literal>dynamic-update</literal> と <literal>dynamic-insert</literal> の設定"
 "はサブクラスに継承されません。 そのため <literal>&lt;subclass&gt;</literal> "
@@ -826,12 +826,12 @@
 "ので、慎重に使用してください。"
 
 #. Tag: para
-#: basic_mapping.xml:406
-#, no-c-format
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "<literal>select-before-update</literal> の使用は通常パフォーマンスを落としま"
@@ -840,7 +840,7 @@
 "用です。"
 
 #. Tag: para
-#: basic_mapping.xml:412
+#: basic_mapping.xml:435
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -850,43 +850,42 @@
 "なります。"
 
 #. Tag: para
-#: basic_mapping.xml:418
-#, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr ""
 "<literal>version</literal> バージョン/タイムスタンプカラムをチェックします"
 
 #. Tag: para
-#: basic_mapping.xml:423
-#, no-c-format
-msgid "<literal>all</literal> check all columns"
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all</literal> すべてのカラムをチェックします。"
 
 #. Tag: para
-#: basic_mapping.xml:428
-#, no-c-format
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr ""
 "<literal>dirty</literal> 変更したカラムをチェックし、同時更新できるようにしま"
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:433
-#, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none</literal> 楽観ロックを使用しません"
 
 #. Tag: para
-#: basic_mapping.xml:438
-#, no-c-format
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "Hibernateで楽観的ロック戦略を使うなら、バージョン/タイムスタンプカラムを使う"
 "ことを <emphasis> 非常に</emphasis> 強くお勧めします。 楽観的ロックはパフォー"
@@ -895,15 +894,15 @@
 "唯一の戦略でもあります。"
 
 #. Tag: para
-#: basic_mapping.xml:445
-#, no-c-format
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "Hibernateのマッピングにとってビューと普通のテーブルの間に違いはなく、 データ"
 "ベースレベルでは透過的です (ただしビューを完全にはサポートしていないDBMSもあ"
@@ -913,7 +912,7 @@
 "合せ文をマップできます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:453
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -931,13 +930,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:455
-#, no-c-format
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "テーブルをこのエンティティと同期するように定義してください。 オートフラッシュ"
 "が確実に起こるように、また導出エンティティに対するクエリが古いデータを 返さな"
@@ -945,13 +944,13 @@
 "たマッピング属性のどちらでも利用できます。"
 
 #. Tag: title
-#: basic_mapping.xml:465
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:467
+#: basic_mapping.xml:490
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -966,7 +965,7 @@
 "literal> 要素は、そのプロパティから主キーカラムへのマッピングを定義します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:482
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -982,37 +981,37 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:485
-#, no-c-format
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr "<literal>name</literal>(オプション):識別子プロパティの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:490
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
 msgstr "<literal>type</literal>(オプション):Hibernateの型を示す名前。"
 
 #. Tag: para
-#: basic_mapping.xml:495
-#, no-c-format
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr ""
 "<literal>column</literal>(オプション - デフォルトはプロパティ名): 主キーカ"
 "ラムの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:501
-#, no-c-format
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal>(オプション - デフォルトの値はsensible): "
 "インスタンスが新しくインスタンス化された (セーブされていない)ことを示す、識"
@@ -1020,13 +1019,11 @@
 "スと区別するために 使います。"
 
 #. Tag: para
-#: basic_mapping.xml:509 basic_mapping.xml:1017 basic_mapping.xml:1156
-#: basic_mapping.xml:1238 basic_mapping.xml:1345 basic_mapping.xml:1534
-#: basic_mapping.xml:1708 basic_mapping.xml:1878 basic_mapping.xml:2457
+#: basic_mapping.xml:532
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1058,7 +1055,7 @@
 "literal> ): プロパティの値へのアクセスにHibernateが使う戦略。"
 
 #. Tag: para
-#: basic_mapping.xml:517
+#: basic_mapping.xml:540
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1068,7 +1065,7 @@
 "とみなされます。"
 
 #. Tag: para
-#: basic_mapping.xml:522
+#: basic_mapping.xml:545
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1078,25 +1075,25 @@
 "ありません。"
 
 #. Tag: para
-#: basic_mapping.xml:526
-#, no-c-format
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "複合キーを持つレガシーデータにアクセスできるように、 <literal>&lt;composite-"
 "id&gt;</literal> という代替のマッピング定義があります。 しかし他の用途への使"
 "用は全くおすすめできません。"
 
 #. Tag: title
-#: basic_mapping.xml:532
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr "ジェネレータ"
 
 #. Tag: para
-#: basic_mapping.xml:534
+#: basic_mapping.xml:557
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1111,7 +1108,7 @@
 "<literal>&lt;param&gt;</literal> 要素を使って渡すことができます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:541
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1123,14 +1120,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:543
+#: basic_mapping.xml:566
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "すべてのジェネレータは、インターフェイス <literal>org.hibernate.id."
 "IdentifierGenerator</literal> を実装します。 これはとても単純なインターフェイ"
@@ -1139,13 +1136,13 @@
 "タには以下のショートカット名があります: <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:551
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:553
+#: basic_mapping.xml:576
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1159,13 +1156,13 @@
 "emphasis> 。"
 
 #. Tag: literal
-#: basic_mapping.xml:562
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:564
+#: basic_mapping.xml:587
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1177,13 +1174,13 @@
 "literal> , <literal>int</literal> のいずれかです。"
 
 #. Tag: literal
-#: basic_mapping.xml:572
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:574
+#: basic_mapping.xml:597
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1195,13 +1192,13 @@
 "<literal>short</literal> , <literal>int</literal> のいずれかです。"
 
 #. Tag: literal
-#: basic_mapping.xml:582
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:584
+#: basic_mapping.xml:607
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1218,13 +1215,13 @@
 "loアルゴリズムは特定のデータベースに対してのみユニークな識別子を生成します。"
 
 #. Tag: literal
-#: basic_mapping.xml:594
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:596
+#: basic_mapping.xml:619
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1236,46 +1233,46 @@
 "ベースシーケンスを与えます。"
 
 #. Tag: literal
-#: basic_mapping.xml:604
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:606
-#, no-c-format
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "(IPアドレスが使用される)ネットワーク内でユニークな文字列型の識別子を生成する"
 "ために、 128ビットのUUIDアルゴリズムを使用します。UUIDは長さ32の16進数字の文"
 "字列としてエンコードされます。"
 
 #. Tag: literal
-#: basic_mapping.xml:614
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:616
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr "MS SQLサーバとMySQLでデータベースが生成するGUID文字列を使用します。"
 
 #. Tag: literal
-#: basic_mapping.xml:622
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:624
-#, no-c-format
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1284,50 +1281,50 @@
 "す。"
 
 #. Tag: literal
-#: basic_mapping.xml:632
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:634
-#, no-c-format
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "<literal>save()</literal> が呼ばれる前に、 アプリケーションがオブジェクトに識"
 "別子を代入できるようにします。 <literal>&lt;generator&gt;</literal> が指定さ"
 "れていなければ、これがデフォルトの戦略になります。"
 
 #. Tag: literal
-#: basic_mapping.xml:642
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:644
-#, no-c-format
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr ""
 "あるユニークキーによる行の選択と主キーの値の復元により、 データベーストリガが"
 "割り当てた主キーを取得します。"
 
 #. Tag: literal
-#: basic_mapping.xml:651
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:653
-#, no-c-format
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1335,21 +1332,21 @@
 "</literal> 主キー関連と組み合わせて使います。"
 
 #. Tag: literal
-#: basic_mapping.xml:660
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:662
-#, no-c-format
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "a specialized sequence generation strategy which utilizes a database "
 "sequence for the actual value generation, but combines this with JDBC3 "
@@ -1359,20 +1356,20 @@
 "these insert statements are disabled due to a bug in the Oracle drivers."
 
 #. Tag: title
-#: basic_mapping.xml:679
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "Hi/lo アルゴリズム"
 
 #. Tag: para
-#: basic_mapping.xml:680
-#, no-c-format
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "<literal>hilo</literal> と <literal>seqhilo</literal> ジェネレータは、 識別子"
 "生成の代表的なアプローチであるhi/loアルゴリズムの2つの代替実装を提供します。 "
@@ -1381,7 +1378,7 @@
 "ポートされている場合)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:687
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1394,7 +1391,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:689
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1406,14 +1403,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:691
-#, no-c-format
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "残念ながらHibernateへの独自の <literal>Connection</literal> を提供するときに"
 "は、<literal>hilo</literal> を使えません。 HibernateがJTAでリストされている接"
@@ -1422,19 +1419,19 @@
 "定しなければなりません。"
 
 #. Tag: title
-#: basic_mapping.xml:700
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID アルゴリズム"
 
 #. Tag: para
-#: basic_mapping.xml:701
-#, no-c-format
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "UUIDには以下のものが含まれます: IPアドレス、JVMのスタートアップタイム(4分の"
 "1秒の正確さ)、 システム時間、(JVMに対してユニークな)カウンタ値。 Javaコー"
@@ -1442,20 +1439,20 @@
 "ときの最良の方法です。"
 
 #. Tag: title
-#: basic_mapping.xml:710
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "識別子カラムとシーケンス"
 
 #. Tag: para
-#: basic_mapping.xml:711
-#, no-c-format
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "識別子カラムをサポートしているデータベース(DB2, MySQL, Sybase, MS SQL)で"
 "は、 <literal>identity</literal> キー生成を使えます。 シーケンスをサポートす"
@@ -1464,7 +1461,7 @@
 "しいオブジェクトを挿入するために、SQLクエリを2つ必要とします。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:719
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1475,7 +1472,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:721
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1485,13 +1482,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:723
-#, no-c-format
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "クロスプラットフォームの開発では、<literal>native</literal> 戦略は "
 "<literal>identity</literal> , <literal>sequence</literal> , <literal>hilo</"
@@ -1499,21 +1496,21 @@
 "に依存します。"
 
 #. Tag: title
-#: basic_mapping.xml:732
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "識別子の割り当て"
 
 #. Tag: para
-#: basic_mapping.xml:733
-#, no-c-format
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "アプリケーションに識別子を割り当てさせたいのであれば(Hibernateが生成するもの"
@@ -1524,12 +1521,12 @@
 "合のデフォルトの動作になります。"
 
 #. Tag: para
-#: basic_mapping.xml:742
-#, no-c-format
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1541,22 +1538,22 @@
 "に、データベースを調べます。"
 
 #. Tag: title
-#: basic_mapping.xml:752
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "トリガにより割り当てられた主キー"
 
 #. Tag: para
-#: basic_mapping.xml:753
-#, no-c-format
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr ""
 "レガシースキーマのためにのみ指定します(Hibernateはトリガを使ってDDLを生成しま"
 "せん)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:757
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1567,13 +1564,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:759
-#, no-c-format
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "上の例の中で、クラスで自然キーとして定義された "
 "<literal>socialSecurityNumber</literal> という名前のユニークな値のプロパティ"
@@ -1581,22 +1578,22 @@
 "キーがあります。"
 
 #. Tag: title
-#: basic_mapping.xml:771
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:773
-#, no-c-format
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1607,24 +1604,25 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:781
+#: basic_mapping.xml:803
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1644,24 +1642,24 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:795
-#, no-c-format
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:801
-#, no-c-format
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1670,13 +1668,13 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:808
-#, no-c-format
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
@@ -1684,11 +1682,11 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:815
-#, no-c-format
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1696,40 +1694,40 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:822
-#, no-c-format
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:829
+#: basic_mapping.xml:851
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>cascade</literal>(オプション - デフォルトは <literal>none</"
 "literal> ): カスケードのスタイル。"
 
 #. Tag: para
-#: basic_mapping.xml:836
+#: basic_mapping.xml:858
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1744,21 +1742,21 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:846
-#, no-c-format
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:852
-#, no-c-format
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1766,13 +1764,13 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:858
-#, no-c-format
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
@@ -1780,10 +1778,10 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:865
-#, no-c-format
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1792,63 +1790,64 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:872
-#, no-c-format
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:878
-#, no-c-format
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:884
-#, no-c-format
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:890
+#: basic_mapping.xml:912
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>cascade</literal>(オプション - デフォルトは <literal>none</"
 "literal> ): カスケードのスタイル。"
 
 #. Tag: title
-#: basic_mapping.xml:900
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:901
+#: basic_mapping.xml:923
 #, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1859,11 +1858,11 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:909
-#, no-c-format
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1871,13 +1870,13 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:915
-#, no-c-format
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1889,15 +1888,15 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:924
-#, no-c-format
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1907,13 +1906,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:937
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:939
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1932,10 +1931,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:941
-#, no-c-format
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1946,7 +1945,7 @@
 "と <literal>&lt;key-many-to-one&gt;</literal> マッピングを受け入れます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:948
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -1956,12 +1955,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:950
-#, no-c-format
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "複合識別子の等価性を実装するためには、永続クラスが <literal>equals()</"
 "literal> と <literal>hashCode()</literal> をオーバーライド <emphasis>しなけれ"
@@ -1969,16 +1968,16 @@
 "ればいけません。"
 
 #. Tag: para
-#: basic_mapping.xml:956
-#, no-c-format
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "残念ながら複合識別子のためのこの方法は、 永続オブジェクトが自身の識別子である"
 "ことを意味しています。 オブジェクト自身を識別子とする以上の便利な「扱い方」は"
@@ -1988,7 +1987,7 @@
 "プローチは、 本格的なアプリケーションには向いていません。"
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:987
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -2001,7 +2000,7 @@
 "ティが 永続クラスと分離した識別子クラスの両方に重複して存在します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:971
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -2011,16 +2010,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:973
-#, no-c-format
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "この例では、複合識別子クラス( <literal>MedicareId</literal> )とエンティティ"
 "クラス自身の両方が、 <literal>medicareNumber</literal> と "
@@ -2030,17 +2028,17 @@
 "には、明らかにコードが重複するという不都合があります。"
 
 #. Tag: para
-#: basic_mapping.xml:982
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
 msgstr "次の属性はマッピングした複合識別子を指定するために使用します。"
 
 #. Tag: para
-#: basic_mapping.xml:988
-#, no-c-format
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -2051,20 +2049,20 @@
 "します。"
 
 #. Tag: para
-#: basic_mapping.xml:996
-#, no-c-format
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (オプション,ただしマッピングした複合識別子には必"
 "須): 複合識別子として使用するクラス。"
 
 #. Tag: para
-#: basic_mapping.xml:1003
-#, no-c-format
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -2074,52 +2072,90 @@
 "は、この代替方法にのみ適用されます。"
 
 #. Tag: para
-#: basic_mapping.xml:1011
-#, no-c-format
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (オプション, このアプローチでは必須): 複合識別子を保"
 "持するコンポーネントタイプのプロパティ(9章を参照してください)."
 
 #. Tag: para
-#: basic_mapping.xml:1023
-#, no-c-format
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へアクセスするためにHibernateが使う戦略です。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): Hibernateがプロパティの値にアクセスするために使用すべき戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。"
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (オプション - デフォルトはリフレクションにより決定"
 "されるプロパティの型): 複合識別子として使われるコンポーネントのクラス(次の"
 "節を見てください)。"
 
 #. Tag: para
-#: basic_mapping.xml:1030
-#, no-c-format
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "この3つ目の方法は <emphasis> 識別子コンポーネント</emphasis> と呼び、 ほとん"
 "どすべてのアプリケーションに対して推奨する方法です。"
 
 #. Tag: title
-#: basic_mapping.xml:1038
-#, no-c-format
-msgid "discriminator"
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "discriminator"
 
 #. Tag: para
-#: basic_mapping.xml:1040
-#, no-c-format
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2135,7 +2171,7 @@
 "<literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1058
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2148,31 +2184,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1061
-#, no-c-format
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal>(オプション - デフォルトは <literal>class</"
 "literal> ): 識別カラムの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1067
-#, no-c-format
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (オプション - デフォルトは <literal>string</"
 "literal> ):Hibernateの型を示す名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1073
-#, no-c-format
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force</literal> (オプション - デフォルトは <literal>false</"
@@ -2180,13 +2216,13 @@
 "Hibernateが使用できる識別カラムの指定を「強制」します。"
 
 #. Tag: para
-#: basic_mapping.xml:1080
-#, no-c-format
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (オプション - デフォルトは <literal>true</"
 "literal> ): もし識別カラムがマッピングする複合識別子の一部ならば、"
@@ -2194,18 +2230,18 @@
 "<literal>INSERT</literal> には含まれないことを知らせる)"
 
 #. Tag: para
-#: basic_mapping.xml:1088
-#, no-c-format
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (オプション)型が評価されるときに実行される任意の"
 "SQL式。 コンテンツベースの識別を可能にします。"
 
 #. Tag: para
-#: basic_mapping.xml:1096
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2217,29 +2253,29 @@
 "定されます。"
 
 #. Tag: para
-#: basic_mapping.xml:1102
-#, no-c-format
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "永続クラスへマッピングされない「余分な」識別値を持つ行が テーブルにあれば、"
 "(そのときに限り)<literal>force</literal> 属性は有効です。 ただし、普通はそ"
 "ういうことはありません。"
 
 #. Tag: para
-#: basic_mapping.xml:1108
-#, no-c-format
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "<literal>formula</literal> 属性を使うと、行の型を評価するために任意のSQL式を"
 "宣言できます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1113
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2248,25 +2284,26 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1118
-#, no-c-format
-msgid "version (optional)"
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "version(オプション)"
 
 #. Tag: para
-#: basic_mapping.xml:1120
-#, no-c-format
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "<literal>&lt;version&gt;</literal> 要素はオプションであり、 テーブルがバー"
 "ジョンデータを含むことを示します。 これは <emphasis>ロングトランザクション</"
 "emphasis> を使うつもりなら、特に役立ちます(以下を見てください)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1136
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2282,41 +2319,76 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1139
-#, no-c-format
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal>(オプション - デフォルトはプロパティ名): バージョ"
 "ン番号を保持するカラムの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1145
-#, no-c-format
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr "<literal>name</literal> :永続クラスのプロパティの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1150
-#, no-c-format
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (オプション - デフォルトは <literal>integer</"
 "literal> ):バージョン番号の型。"
 
 #. Tag: para
-#: basic_mapping.xml:1162
-#, no-c-format
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へアクセスするためにHibernateが使う戦略です。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): Hibernateがプロパティの値にアクセスするために使用すべき戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal>(オプション - デフォルトは <literal>property</"
+"literal> ): プロパティの値へのアクセスにHibernateが使う戦略。"
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (オプション - デフォルトは "
 "<literal>undefined</literal> ): インスタンスが新しくインスタンス化されたこ"
@@ -2326,13 +2398,13 @@
 "定します。)"
 
 #. Tag: para
-#: basic_mapping.xml:1171
-#, no-c-format
+#: basic_mapping.xml:1193
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (オプション - デフォルトは <literal>never</"
 "literal> ): このバージョンのプロパティの値が、データベースによって生成された"
@@ -2340,13 +2412,13 @@
 "の議論を見てください。"
 
 #. Tag: para
-#: basic_mapping.xml:1178
-#, no-c-format
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "<literal>insert</literal> (オプション - デフォルトは <literal>true</"
 "literal> ): SQLのinsert文にバージョン・カラムを含めるべきかどうかを指定しま"
@@ -2354,10 +2426,10 @@
 "るときには、 <literal>false</literal> に設定すると良いでしょう。"
 
 #. Tag: para
-#: basic_mapping.xml:1188
-#, no-c-format
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2366,16 +2438,16 @@
 "<literal>calendar</literal> 型のいずれかです。"
 
 #. Tag: para
-#: basic_mapping.xml:1193
-#, no-c-format
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "バージョンやタイムスタンプのプロパティは、分離されたインスタンスに対してnull"
 "であってはなりません。 そのためどのような <literal>unsaved-value</literal> 戦"
@@ -2386,20 +2458,19 @@
 "いるときには特に有用です。</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1204
-#, no-c-format
-msgid "timestamp (optional)"
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp(オプション)"
 
 #. Tag: para
-#: basic_mapping.xml:1206
-#, no-c-format
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "オプションの <literal>&lt;timestamp&gt;</literal> 要素は、 テーブルがタイムス"
 "タンプデータを含むことを示します。 これはバージョン付けの代わりの方法として用"
@@ -2407,7 +2478,7 @@
 "です。 しかしアプリケーションは異なる用途で使うこともあるかもしれません。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1222
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2422,20 +2493,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1225
-#, no-c-format
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr ""
 "<literal>column</literal>(オプション - デフォルトはプロパティ名): タイムス"
 "タンプを保持するカラムの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1231
-#, no-c-format
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2444,14 +2515,14 @@
 "前。"
 
 #. Tag: para
-#: basic_mapping.xml:1244
-#, no-c-format
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (オプション - デフォルトは <literal>null</"
 "literal> ): インスタンスが新しくインスタンス化された (セーブされていない)"
@@ -2460,17 +2531,17 @@
 "literal> と指定すると、 識別子プロパティの値が使われます。)"
 
 #. Tag: para
-#: basic_mapping.xml:1253
-#, no-c-format
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "<literal>source</literal> (オプション - デフォルトは <literal>vm</"
 "literal> ): Hibernateはどこからタイムスタンプの値を取得するべきでしょうか? "
@@ -2483,26 +2554,32 @@
 "全でないものもあります(例えばOracle 8)。"
 
 #. Tag: para
-#: basic_mapping.xml:1265
-#, no-c-format
+#: basic_mapping.xml:1287
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (オプション - デフォルトは <literal>never</"
 "literal> ): このタイムスタンプ・プロパティの値が、データベースによって生成さ"
 "れることを指定します。 <xref linkend=\"mapping-generated\">生成プロパティ</"
 "xref> を参照してください。"
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1274
-#, no-c-format
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "<literal>&lt;timestamp&gt;</literal> は <literal>&lt;version type=\"timestamp"
@@ -2511,23 +2588,23 @@
 "</literal> と等価であることに注意してください。"
 
 #. Tag: title
-#: basic_mapping.xml:1284
-#, no-c-format
-msgid "property"
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1286
-#, no-c-format
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "<literal>&lt;property&gt;</literal> 要素は、クラスの永続的なJavaBeanスタイル"
 "のプロパティを定義します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2553,7 +2630,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1311
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2561,11 +2638,11 @@
 msgstr "<literal>name</literal>:小文字で始まるプロパティ名。"
 
 #. Tag: para
-#: basic_mapping.xml:1317
-#, no-c-format
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal>(オプション - デフォルトはプロパティ名): マッピン"
@@ -2573,22 +2650,15 @@
 "column&gt;</literal> 要素でも指定できます。"
 
 #. Tag: para
-#: basic_mapping.xml:1324
-#, no-c-format
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr "<literal>type</literal>(オプション):Hibernateの型を示す名前。"
-
-#. Tag: para
-#: basic_mapping.xml:1329
-#, no-c-format
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (オプション - デフォルトは <literal>true</"
 "literal> ): マッピングされたカラムがSQLの <literal>UPDATE</literal> や "
@@ -2598,7 +2668,7 @@
 "ティが可能になります。"
 
 #. Tag: para
-#: basic_mapping.xml:1338
+#: basic_mapping.xml:1365
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2610,22 +2680,22 @@
 "ングがありません。"
 
 #. Tag: para
-#: basic_mapping.xml:1351
-#, no-c-format
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (optional - デフォルトは <literal>false</literal> ): "
 "インスタンス変数に最初にアクセスしたときに、プロパティを遅延して取得するよう"
 "指定します。 (バイトコード実装を作成する時間が必要になります)。"
 
 #. Tag: para
-#: basic_mapping.xml:1358
-#, no-c-format
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2634,23 +2704,23 @@
 "もできます。"
 
 #. Tag: para
-#: basic_mapping.xml:1365
-#, no-c-format
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (オプション):カラムにnull値を許可するDDLの生成を"
 "可能にします。"
 
 #. Tag: para
-#: basic_mapping.xml:1371
-#, no-c-format
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (オプション - デフォルトは <literal>true</"
 "literal> ): このプロパティの更新に楽観ロックの取得を要求するかどうかを指定し"
@@ -2658,13 +2728,13 @@
 "きかを決定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1379
-#, no-c-format
+#: basic_mapping.xml:1406
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (オプション - デフォルトは <literal>never</"
 "literal> ): プロパティの値が、データベースによって生成されたことを指定しま"
@@ -2672,59 +2742,59 @@
 "さい。"
 
 #. Tag: para
-#: basic_mapping.xml:1388
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis> には以下の値が可能です:"
 
 #. Tag: para
-#: basic_mapping.xml:1394
-#, no-c-format
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "Hibernateの基本型の名前(例 <literal>integer, string, character, date, "
 "timestamp, float, binary, serializable, object, blob</literal> )。"
 
 #. Tag: para
-#: basic_mapping.xml:1400
-#, no-c-format
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "デフォルトの基本型のJavaクラス名 (例 <literal>int, float, char, java.lang."
 "String, java.util.Date, java.lang.Integer, java.sql.Clob</literal> )。"
 
 #. Tag: para
-#: basic_mapping.xml:1406
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "シリアライズ可能なJavaクラスの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1411
-#, no-c-format
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "カスタム型のクラス名(例 <literal>com.illflow.type.MyCustomType</"
 "literal> )。"
 
 #. Tag: para
-#: basic_mapping.xml:1417
-#, no-c-format
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "型を指定しなければ、Hibernateは正しいHibernateの型を推測するために、 指定され"
 "たプロパティに対してリフレクションを使います。 Hibernateはルール2, 3, 4をその"
@@ -2735,14 +2805,14 @@
 "スタム型を指定するためなどです。)"
 
 #. Tag: para
-#: basic_mapping.xml:1427
-#, no-c-format
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2755,14 +2825,13 @@
 "アクセスに独自の戦略を指定することができます。"
 
 #. Tag: para
-#: basic_mapping.xml:1436
-#, no-c-format
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "特に強力な特徴は生成プロパティです。 これらのプロパティは当然読み取り専用であ"
 "り、プロパティの値はロード時に計算されます。 計算をSQL式として宣言すると、こ"
@@ -2770,7 +2839,7 @@
 "句のサブクエリに変換されます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1443
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2783,13 +2852,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1445
-#, no-c-format
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "特定のカラム(例では <literal>customerId</literal> がそれにあたります)のエイリ"
 "アスを宣言することなく、 エンティティ自身のテーブルを参照できることに注意して"
@@ -2797,18 +2866,18 @@
 "</literal> マッピング要素を使えることにも注意してください。"
 
 #. Tag: title
-#: basic_mapping.xml:1455
-#, no-c-format
-msgid "many-to-one"
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1457
-#, no-c-format
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "他の永続クラスへの通常の関連は <literal>many-to-one</literal> 要素を使って定"
@@ -2816,7 +2885,7 @@
 "キーは、ターゲットとなるテーブルの主キーカラムを参照しています。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1485
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2845,17 +2914,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1488 basic_mapping.xml:1669 basic_mapping.xml:1855
-#, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the name of the property."
 msgstr "<literal>name</literal>:プロパティ名。"
 
 #. Tag: para
-#: basic_mapping.xml:1493 basic_mapping.xml:2284
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2866,11 +2935,11 @@
 "<literal>&lt;column&gt;</literal> カラムによっても指定されます。"
 
 #. Tag: para
-#: basic_mapping.xml:1500 basic_mapping.xml:1674
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>class</literal>(オプション - デフォルトは、 リフレクションにより決"
@@ -2880,21 +2949,21 @@
 "れるプロパティの型): 関連クラスの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1506
-#, no-c-format
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade</literal>(オプション): どの操作を、親オブジェクトから関連"
-"オブジェクトへとカスケードさせるかを指定します。"
+"<literal>cascade</literal>(オプション): 親オブジェクトから関連オブジェクト"
+"へ、どの操作をカスケードするかを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1695
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>fetch</literal> (オプション - デフォルトは <literal>select</"
@@ -2906,15 +2975,15 @@
 "どちらかを選択します。"
 
 #. Tag: para
-#: basic_mapping.xml:1518
-#, no-c-format
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal>(オプション - デフォルトは <literal>true</"
 "literal> ): マッピングされたカラムがSQLの <literal>UPDATE</literal> または "
@@ -2924,10 +2993,10 @@
 "出」プロパティが可能になります。"
 
 #. Tag: para
-#: basic_mapping.xml:1527
-#, no-c-format
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -2935,13 +3004,13 @@
 "クラスのプロパティ名。 何も指定しなければ、関連クラスの主キーが使われます。"
 
 #. Tag: para
-#: basic_mapping.xml:1540
-#, no-c-format
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal>(オプション): 外部キーカラムに対してユニーク制約"
 "をつけたDDLの生成を可能にします。 また、<literal>property-ref</literal> の"
@@ -2949,38 +3018,24 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:1548
-#, no-c-format
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (オプション):外部キーカラムに対して、 null値を許"
 "可するDDLの生成を可能にします"
 
 #. Tag: para
-#: basic_mapping.xml:1554
-#, no-c-format
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (オプション - デフォルトは <literal>true</"
-"literal> ): このプロパティの更新に楽観的ロックの取得を要求するかどうかを指定"
-"します。 言い換えれば、このプロパティがダーティであるときにバージョンを増やす"
-"べきかを決定します。"
-
-#. Tag: para
-#: basic_mapping.xml:1562
-#, no-c-format
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal> (オプション - デフォルトは <literal>proxy</"
@@ -2991,12 +3046,12 @@
 "フェッチするよう指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1572
-#, no-c-format
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (オプション - デフォルトは <literal>exception</"
@@ -3004,10 +3059,10 @@
 "<literal>ignore</literal> は欠落した行をnull関連として扱います。"
 
 #. Tag: para
-#: basic_mapping.xml:1579 basic_mapping.xml:1733
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
 #, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -3017,7 +3072,7 @@
 "<literal>entity-name</literal> (オプション):関連クラスのエンティティ名"
 
 #. Tag: para
-#: basic_mapping.xml:1585
+#: basic_mapping.xml:1611
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -3027,20 +3082,20 @@
 "部キーに対して値を定義するSQL式"
 
 #. Tag: para
-#: basic_mapping.xml:1592
-#, no-c-format
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "<literal>cascade</literal> 属性に <literal>none</literal> 以外の意味のある値"
 "をを設定すると、 関連オブジェクトへある操作が伝播することになります。 意味の"
@@ -3054,15 +3109,15 @@
 "(orphan delete)をサポートしていないことに注意してください。"
 
 #. Tag: para
-#: basic_mapping.xml:1605
-#, no-c-format
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 "典型的な <literal>many-to-one</literal> 宣言は次のようにシンプルです。:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1609
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -3070,16 +3125,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1611
-#, no-c-format
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "<literal>property-ref</literal> 属性は、外部キーが関連付けられたテーブルの、"
 "主キーでない ユニークキーを参照しているレガシーデータをマップするためにだけ使"
@@ -3089,7 +3144,7 @@
 "使ったHibernateのDDL生成を制御します。)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1620
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -3097,14 +3152,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1622
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr ""
 "以下のように <literal>OrderItem</literal> に対してマッピングを使えます:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1626
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -3112,13 +3167,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1628
-#, no-c-format
-msgid "This is certainly not encouraged, however."
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "しかし、これは決して推奨できません。"
 
 #. Tag: para
-#: basic_mapping.xml:1632
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3130,17 +3185,17 @@
 "パティをマッピングするべきです。"
 
 #. Tag: para
-#: basic_mapping.xml:1637
-#, no-c-format
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr ""
 "もし参照したユニークキーがコンポーネントのプロパティである場合は、プロパティ"
 "のパスを指定できます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1641
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3148,13 +3203,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1646
-#, no-c-format
-msgid "one-to-one"
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "one-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1648
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3164,7 +3219,7 @@
 "す。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1666
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3185,26 +3240,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1680
-#, no-c-format
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>cascade</literal>(オプション): 親オブジェクトから関連オブジェクト"
-"へ、どの操作をカスケードするかを指定します。"
-
-#. Tag: para
-#: basic_mapping.xml:1686
-#, no-c-format
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>constrained</literal>(オプション): マッピングされたテーブルの主"
 "キーに対する外部キー制約が、 関連クラスのテーブルを参照することを指定しま"
 "す。 このオプションは <literal>save()</literal> と <literal>delete()</"
@@ -3212,10 +3257,10 @@
 "にも影響します (そしてスキーマエクスポートツールにも使われます)。"
 
 #. Tag: para
-#: basic_mapping.xml:1701
-#, no-c-format
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3224,14 +3269,14 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:1714
-#, no-c-format
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>formula</literal> (オプション): ほとんどすべての一対一関連はオーナー"
 "のエンティティの主キーへとマッピングされます。 これ以外の稀な場合は、 他のカ"
@@ -3239,17 +3284,17 @@
 "<literal>org.hibernate.test.onetooneformula</literal> を参照してください。)"
 
 #. Tag: para
-#: basic_mapping.xml:1722
-#, no-c-format
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>lazy</literal> (オプション - デフォルトは <literal>proxy</"
 "literal> ): デフォルトでは、多重度1の関連がプロキシとなります。 "
@@ -3261,32 +3306,31 @@
 "注意してください!</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1740
-#, no-c-format
-msgid "There are two varieties of one-to-one association:"
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "一対一関連には2種類あります:"
 
 #. Tag: para
-#: basic_mapping.xml:1744
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "primary key associations"
 msgstr "主キー関連"
 
 #. Tag: para
-#: basic_mapping.xml:1747
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr "ユニーク外部キー関連"
 
 #. Tag: para
-#: basic_mapping.xml:1752
-#, no-c-format
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "主キー関連には、特別なテーブルカラムは必要ありません。 もし2つの行が関連によ"
 "り関係していれば、2つのテーブルは同じ主キーの値を共有します。 そのため2つのオ"
@@ -3294,23 +3338,23 @@
 "代入しなければなりません。"
 
 #. Tag: para
-#: basic_mapping.xml:1759
-#, no-c-format
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "主キー関連を行うためには、以下のマッピングを <literal>Employee</literal> と "
 "<literal>Person</literal> のそれぞれに追加してください。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1765
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3318,19 +3362,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1767
-#, no-c-format
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "ここで、PERSONとEMPLOYEEテーブルの関係する行の主キーが同じであることを確実に"
 "しなければいけません。 ここでは、<literal>foreign</literal> という特殊な"
 "Hibernate識別子生成戦略を使います:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1773
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3347,13 +3391,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1775
-#, no-c-format
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "<literal>Employee</literal> インスタンスが、<literal>Person</literal> の "
 "<literal>employee</literal> プロパティで参照されるように、 新しくセーブされ"
@@ -3364,18 +3407,18 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:1781
-#, no-c-format
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "もう1つの方法として、<literal>Employee</literal> から <literal>Person</"
 "literal> への ユニーク制約を使った外部キー関連は以下のように表現されます:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1786
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3383,17 +3426,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1788
-#, no-c-format
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr ""
 "そしてこの関連は、 以下の記述を <literal>Person</literal> のマッピングに追加"
 "することで双方向にすることができます:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1793
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3401,13 +3444,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1798
-#, no-c-format
-msgid "natural-id"
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr "natural-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1800
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3418,15 +3461,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1802
-#, no-c-format
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "主キーとして代理キーの使用を推奨しますが、 すべてのエンティティに対して自然"
@@ -3437,10 +3480,10 @@
 "ングはより自己記述的になります。"
 
 #. Tag: para
-#: basic_mapping.xml:1811
-#, no-c-format
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3448,39 +3491,40 @@
 "<literal>hashCode()</literal> の実装を強くお勧めします。"
 
 #. Tag: para
-#: basic_mapping.xml:1816
-#, no-c-format
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr ""
 "このマッピングは自然主キーを使ったエンティティでの使用を意図していません。"
 
 #. Tag: para
-#: basic_mapping.xml:1822
-#, no-c-format
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr ""
 "<literal>mutable</literal> (オプション, デフォルトは <literal>false</"
 "literal> ): デフォルトでは、自然識別子プロパティは不変(定数)と想定されていま"
 "す。"
 
 #. Tag: title
-#: basic_mapping.xml:1832
-#, no-c-format
-msgid "component, dynamic-component"
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr "component, dynamic-component"
 
 #. Tag: para
-#: basic_mapping.xml:1834
-#, no-c-format
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr ""
 "<literal>&lt;component&gt;</literal> 要素は、 子オブジェクトのプロパティを親"
 "クラスのテーブルのカラムへマッピングします。 コンポーネントは自分のプロパ"
@@ -3488,7 +3532,7 @@
 "ト」を見てください。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1852
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3510,21 +3554,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1860
-#, no-c-format
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>class</literal> (オプション - デフォルトはリフレクションにより決定"
 "されるプロパティの型): コンポーネント(子)クラスの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:1866 basic_mapping.xml:1955
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
 #, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>insert</literal> :マッピングされたカラムがSQLの <literal>INSERT</"
@@ -3534,11 +3578,11 @@
 "literal> に現れるようにするかどうかを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1872 basic_mapping.xml:1961
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
 #, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>update</literal> : マッピングされたカラムがSQL の <literal>UPDATE</"
@@ -3548,24 +3592,24 @@
 "literal> に現れるようにするかどうかを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1884
-#, no-c-format
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (optional - デフォルトは <literal>false</literal> ): "
 "インスタンス変数に最初にアクセスしたときに、 コンポーネントを遅延してフェッチ"
 "するよう指定します。 (バイトコード実装を作成する時間が必要になります)"
 
 #. Tag: para
-#: basic_mapping.xml:1891
-#, no-c-format
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (オプション - デフォルトは <literal>true</"
@@ -3574,11 +3618,11 @@
 "べきかを決定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1899 basic_mapping.xml:1975
-#, no-c-format
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "<literal>unique</literal> (オプション - デフォルトは <literal>false</"
@@ -3586,7 +3630,7 @@
 "在するかを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3596,7 +3640,7 @@
 "テーブルカラムにマッピングします。"
 
 #. Tag: para
-#: basic_mapping.xml:1913
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3608,12 +3652,13 @@
 "parent&gt;</literal> サブ要素を許可します。"
 
 #. Tag: para
-#: basic_mapping.xml:1919
-#, no-c-format
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr ""
 "<literal>&lt;dynamic-component&gt;</literal> 要素は、 <literal>Map</literal> "
 "がコンポーネントとしてマッピングされることを可能にします。 プロパティ名はmap"
@@ -3621,20 +3666,20 @@
 "い。"
 
 #. Tag: title
-#: basic_mapping.xml:1928
-#, no-c-format
-msgid "properties"
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr "properties"
 
 #. Tag: para
-#: basic_mapping.xml:1930
-#, no-c-format
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "<literal>&lt;properties&gt;</literal> 要素はクラスのプロパティの指定された、 "
 "論理的なグルーピングを可能にします。 この構造の最も重要な使用方法は、 "
@@ -3643,7 +3688,7 @@
 "す。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1946
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3661,22 +3706,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1949
-#, no-c-format
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>name</literal> : グルーピングの論理名。 実際のプロパティ名では "
 "<emphasis>ありません</emphasis> 。"
 
 #. Tag: para
-#: basic_mapping.xml:1967
-#, no-c-format
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (オプション - デフォルトは <literal>true</"
@@ -3685,7 +3730,7 @@
 "やすべきかを決定します。"
 
 #. Tag: para
-#: basic_mapping.xml:1984
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3695,11 +3740,12 @@
 "あった場合:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1988
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3711,17 +3757,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1990
-#, no-c-format
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "主キーの代わりに <literal>Person</literal> テーブルのユニークキーへの参照を持"
 "つ、 レガシーデータの関連を持つかもしれません。:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1995
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3733,35 +3779,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1997
-#, no-c-format
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr ""
 "しかし、このようなレガシーデータマッピングのコンテキスト外への使用は推奨しま"
 "せん。"
 
 #. Tag: title
-#: basic_mapping.xml:2005
-#, no-c-format
-msgid "subclass"
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr "subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2007
-#, no-c-format
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 "最後にポリモーフィックな永続化には、ルートの永続クラスの各サブクラスの定義が"
 "必要です。 table-per-class-hierarchyマッピング戦略では、 <literal>&lt;"
 "subclass&gt;</literal> 定義が使われます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2020
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3781,28 +3827,28 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2023 basic_mapping.xml:2081 basic_mapping.xml:2144
-#, no-c-format
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr "<literal>name</literal>:サブクラスの完全修飾されたクラス名。"
 
 #. Tag: para
-#: basic_mapping.xml:2028
-#, no-c-format
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>discriminator-value</literal>(オプション - デフォルトはクラス"
 "名): 個々のサブクラスを区別するための値。"
 
 #. Tag: para
-#: basic_mapping.xml:2034 basic_mapping.xml:2091 basic_mapping.xml:2154
+#: basic_mapping.xml:2061
 #, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>proxy</literal>(オプション): 遅延初期化プロキシに使うクラスやイン"
@@ -3815,11 +3861,11 @@
 "ンターフェイスを指定します。"
 
 #. Tag: para
-#: basic_mapping.xml:2040 basic_mapping.xml:2097 basic_mapping.xml:2160
+#: basic_mapping.xml:2067
 #, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>lazy</literal>(オプション, デフォルトは <literal>true</"
@@ -3833,14 +3879,14 @@
 "<literal>lazy=\"false\"</literal> とすると、遅延フェッチが使用できません。"
 
 #. Tag: para
-#: basic_mapping.xml:2048
-#, no-c-format
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "各サブクラスでは、永続プロパティとサブクラスを定義します。 <literal>&lt;"
 "version&gt;</literal> と <literal>&lt;id&gt;</literal> プロパティは、 ルート"
@@ -3849,29 +3895,29 @@
 "指定されると、完全修飾されたJavaクラス名が使われます。"
 
 #. Tag: para
-#: basic_mapping.xml:2056 basic_mapping.xml:2114 basic_mapping.xml:2172
-#, no-c-format
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
+#, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr ""
 "継承のマッピングに関する情報は <xref linkend=\"inheritance\"/> を見てくださ"
 "い。"
 
 #. Tag: title
-#: basic_mapping.xml:2063
-#, no-c-format
-msgid "joined-subclass"
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "joined-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2065
-#, no-c-format
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "もう1つの方法として、各サブクラスを自身のテーブルへマッピングすることができま"
 "す (table-per-subclass mapping strategy)。 継承した状態はスーパークラスのテー"
@@ -3879,7 +3925,7 @@
 "素を使用します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2078
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -3905,27 +3951,62 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2086 basic_mapping.xml:2149
-#, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr "<literal>table</literal> :サブクラステーブルの名前。"
 
 #. Tag: para
-#: basic_mapping.xml:2105
-#, no-c-format
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal>(オプション): 遅延初期化プロキシに使うクラスやイン"
+"ターフェイスを指定します。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (オプション): 遅延初期化プロキシに使用するクラスやイ"
+"ンターフェイスを指定します。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (オプション): 遅延初期化プロキシに使用するクラスやイ"
+"ンターフェイスを指定します。"
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal>(オプション, デフォルトは <literal>true</"
+"literal> ): <literal>lazy=\"false\"</literal> と設定すると、遅延フェッチが"
+"使用できません。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (オプション, デフォルトは <literal>true</literal> ): "
+"<literal>lazy=\"false\"</literal> とすると、遅延フェッチが使用できません。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (オプション, デフォルトは <literal>true</literal> ): "
+"<literal>lazy=\"false\"</literal> とすると、遅延フェッチが使用できません。"
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "このマッピング戦略には、識別カラムは必要ありません。 しかし各サブクラスは "
 "<literal>&lt;key&gt;</literal> 要素を使い、 オブジェクト識別子を保持するテー"
 "ブルカラムを定義しなければなりません。 この章の初めのマッピングは以下のように"
 "書き直せます:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2112
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3963,24 +4044,24 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2121
-#, no-c-format
-msgid "union-subclass"
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "union-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2123
-#, no-c-format
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "3つ目の選択肢は、継承階層の具象クラスのみをテーブルにマッピングすることです "
 "(the table-per-concrete-class戦略)。 それぞれのテーブルは継承の状態を含めすべ"
@@ -3991,7 +4072,7 @@
 "subclass&gt;</literal> マッピングを使う必要があります。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2141
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -4016,31 +4097,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2168
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
 msgstr "このマッピング戦略では識別カラムやキーカラムは必要ありません。"
 
 #. Tag: title
-#: basic_mapping.xml:2179
-#, no-c-format
-msgid "join"
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "join"
 
 #. Tag: para
-#: basic_mapping.xml:2181
-#, no-c-format
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "<literal>&lt;join&gt;</literal> 要素を使うことで、 1つのクラスのプロパティを"
 "いくつものテーブルにマッピングすることができます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2195
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -4059,22 +4140,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2199
-#, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal> :結合したテーブルの名前"
 
 #. Tag: para
-#: basic_mapping.xml:2216
-#, no-c-format
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -4090,24 +4171,24 @@
 "します。"
 
 #. Tag: para
-#: basic_mapping.xml:2229
-#, no-c-format
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (オプション - デフォルトは <literal>false</"
 "literal> ): もし可能であれば、Hibernateはこの結合で定義されているプロパティに"
 "対し 挿入や更新を行いません。"
 
 #. Tag: para
-#: basic_mapping.xml:2236
-#, no-c-format
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optional</literal> (オプション - デフォルトは <literal>false</"
@@ -4116,17 +4197,17 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:2245
-#, no-c-format
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "例えば人のアドレスの情報を分離したテーブルにマッピングすることが可能です (す"
 "べてのプロパティに対して値型のセマンティクスを保持します)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2250
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -4144,10 +4225,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2252
-#, no-c-format
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4157,26 +4238,26 @@
 "うに、1つのクラス階層で継承のマッピング戦略を切り替える時には有用です。"
 
 #. Tag: title
-#: basic_mapping.xml:2262
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2264
-#, no-c-format
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "今まで何度か <literal>&lt;key&gt;</literal> 要素が出てきました。 この要素は新"
 "しいテーブルへの結合を定義したり、 結合テーブルで外部キーを定義したりする親要"
 "素のどこにでも現れ、 オリジナルテーブルの主キーを参照します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2280
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4190,11 +4271,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2291
-#, no-c-format
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (オプション, デフォルトは <literal>noaction</"
@@ -4202,63 +4283,63 @@
 "定します。"
 
 #. Tag: para
-#: basic_mapping.xml:2298
-#, no-c-format
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (オプション): オリジナルテーブルの主キーでは"
 "ないカラムを参照する外部キーを指定します (レガシーデータに対して提供されま"
 "す)。"
 
 #. Tag: para
-#: basic_mapping.xml:2305
-#, no-c-format
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (オプション): 外部キーカラムがnull値を許容しない"
 "ことを指定します (このことは外部キーが主キーの一部であることを暗黙的に示しま"
 "す)。"
 
 #. Tag: para
-#: basic_mapping.xml:2312
-#, no-c-format
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (オプション): 外部キーを決して更新してはならないこ"
 "とを指定します (このことは外部キーが主キーの一部であることを暗黙的に示しま"
 "す)。"
 
 #. Tag: para
-#: basic_mapping.xml:2319
-#, no-c-format
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (オプション): 外部キーがユニーク制約を持つべきであ"
 "ることを指定します (このことは外部キーが主キーの一部であることを暗黙的に示し"
 "ます)。"
 
 #. Tag: para
-#: basic_mapping.xml:2327
-#, no-c-format
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "削除のパフォーマンスが重要であるシステムには、 すべてのキーを <literal>on-"
 "delete=\"cascade\"</literal> と定義することを推奨します。 そうすることで"
@@ -4268,12 +4349,12 @@
 "るということに注意してください。"
 
 #. Tag: para
-#: basic_mapping.xml:2335
-#, no-c-format
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4283,19 +4364,19 @@
 "ラムを宣言 <emphasis> しなくてはなりません</emphasis> 。"
 
 #. Tag: title
-#: basic_mapping.xml:2345
-#, no-c-format
-msgid "column and formula elements"
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "column と formula 要素"
 
 #. Tag: para
-#: basic_mapping.xml:2346
-#, no-c-format
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "<literal>column</literal> 属性を記述できる任意のマッピング要素はまた、 "
 "<literal>&lt;column&gt;</literal> サブ要素も記述できます。 同様に "
@@ -4303,7 +4384,7 @@
 "段です。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2352
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4321,16 +4402,16 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2354
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2356
-#, no-c-format
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4339,7 +4420,7 @@
 "結合条件などです。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2362
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4350,20 +4431,20 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2367
-#, no-c-format
-msgid "import"
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "import"
 
 #. Tag: para
-#: basic_mapping.xml:2369
-#, no-c-format
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "アプリケーションに同じ名前の2つの永続クラスがあり、 Hibernateクエリで完全修飾"
 "された(パッケージの)名前を指定したくないと仮定します。 そのような場合は "
@@ -4372,13 +4453,13 @@
 "フェイスでさえもインポートできます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2383
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4388,41 +4469,40 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2386
-#, no-c-format
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr "<literal>class</literal>:Javaクラスの完全修飾されたクラス名。"
 
 #. Tag: para
-#: basic_mapping.xml:2391
-#, no-c-format
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal>(オプション - デフォルトは修飾されていないクラス"
 "名): クエリ言語で使われる名前。"
 
 #. Tag: title
-#: basic_mapping.xml:2402
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2404
-#, no-c-format
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "プロパティマッピングにはさらにもう1つの型があります。 <literal>&lt;any&gt;</"
 "literal> マッピング要素は、 複数のテーブルからクラスへのポリモーフィックな関"
@@ -4434,11 +4514,11 @@
 "す。"
 
 #. Tag: para
-#: basic_mapping.xml:2414
-#, no-c-format
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4449,7 +4529,7 @@
 "typeの値からクラス名へのマッピングを指定しなければなりません。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2421
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4462,7 +4542,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2432
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4483,29 +4563,29 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2435
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>:プロパティ名。"
 
 #. Tag: para
-#: basic_mapping.xml:2440
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>:識別子の型。"
 
 #. Tag: para
-#: basic_mapping.xml:2445
-#, no-c-format
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal>(オプション - デフォルトは <literal>string</"
 "literal> ): ディスクリミネータマッピングで許された型"
 
 #. Tag: para
-#: basic_mapping.xml:2451
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4515,12 +4595,12 @@
 "literal> ): カスケードのスタイル。"
 
 #. Tag: para
-#: basic_mapping.xml:2463
-#, no-c-format
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (オプション - デフォルトは <literal>true</"
@@ -4529,39 +4609,37 @@
 "きかを定義します。"
 
 #. Tag: title
-#: basic_mapping.xml:2478
-#, no-c-format
-msgid "Hibernate Types"
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Hibernateの型"
 
 #. Tag: title
-#: basic_mapping.xml:2481
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr "エンティティと値"
 
 #. Tag: para
-#: basic_mapping.xml:2483
+#: basic_mapping.xml:2510
 #, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"永続サービスに関わる様々なJava言語レベルのオブジェクトの振る舞いを理解するた"
-"めには、 オブジェクトを2つのグループに分ける必要があります:"
 
 #. Tag: para
-#: basic_mapping.xml:2488
-#, no-c-format
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "<emphasis> エンティティ</emphasis> はエンティティへの参照を保持する、 他のす"
@@ -4575,16 +4653,16 @@
 "ます。 またそれらはバージョン付けすることもできます。"
 
 #. Tag: para
-#: basic_mapping.xml:2499
-#, no-c-format
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4598,20 +4676,20 @@
 "で、 複数のエンティティやコレクションがこれを共有することはできません。"
 
 #. Tag: para
-#: basic_mapping.xml:2510
-#, no-c-format
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "これまで「永続クラス」という言葉をエンティティの意味で使ってきました。 これか"
 "らもそうしていきます。 厳密に言うと、永続状態を持つユーザ定義のクラスのすべて"
@@ -4625,26 +4703,25 @@
 "る良いヒントになります。 一方合成集約や集約は、通常値型へ変換されます。"
 
 #. Tag: para
-#: basic_mapping.xml:2524
-#, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr "本ドキュメントを通して、何度もこの概念を取り上げます。"
 
 #. Tag: para
-#: basic_mapping.xml:2528
-#, no-c-format
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "Java型のシステム(もしくは開発者が定義したエンティティと値型)を SQL/データベー"
 "ス型のシステムにマッピングすることは難しいです。 Hibernateは2つのシステムの"
@@ -4657,31 +4734,33 @@
 "マッピング型を記述し、同様にカスタムの変換戦略を実装することができます。"
 
 #. Tag: para
-#: basic_mapping.xml:2541
-#, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr ""
 "コレクションを除く組み込みのHibernateの型はすべて、nullセマンティクスをサポー"
 "トします。"
 
 #. Tag: title
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr "基本的な型"
 
 #. Tag: para
-#: basic_mapping.xml:2550
+#: basic_mapping.xml:2577
 #, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr ""
 "組み込みの <emphasis>基本的なマッピング型</emphasis> は大まかに以下のように分"
 "けられます。 <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2555
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4691,7 +4770,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2558
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4705,13 +4784,13 @@
 "lang.Boolean</literal> の代替エンコードです。"
 
 #. Tag: literal
-#: basic_mapping.xml:2567
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2569
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4721,13 +4800,13 @@
 "Oracleの <literal>VARCHAR2</literal> )への型マッピング。"
 
 #. Tag: literal
-#: basic_mapping.xml:2576
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2578
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4739,13 +4818,13 @@
 "らと等価なもの) への型マッピング。"
 
 #. Tag: literal
-#: basic_mapping.xml:2586
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2588
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4756,13 +4835,13 @@
 "グ。"
 
 #. Tag: literal
-#: basic_mapping.xml:2596
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2598
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4774,13 +4853,13 @@
 "literal> )への型マッピング。"
 
 #. Tag: literal
-#: basic_mapping.xml:2606
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2608
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4798,13 +4877,13 @@
 "タンスは、 それらの <literal>ID</literal> にマッピングされます。"
 
 #. Tag: literal
-#: basic_mapping.xml:2620
-#, fuzzy, no-c-format
-msgid "<literal>class</literal>"
-msgstr "<literal>all</literal> すべてのカラムをチェックします。"
+#: basic_mapping.xml:2647
+#, no-c-format
+msgid "class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4816,25 +4895,25 @@
 "literal> はその完全修飾された名前にマッピングされます。"
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "バイト配列は、適切なSQLのバイナリ型にマッピングされます。"
 
 #. Tag: literal
-#: basic_mapping.xml:2638
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2640
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4844,16 +4923,16 @@
 "literal> 型にマッピングされます。"
 
 #. Tag: literal
-#: basic_mapping.xml:2647
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2649
-#, no-c-format
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4863,19 +4942,19 @@
 "もできます。"
 
 #. Tag: literal
-#: basic_mapping.xml:2658
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2660
-#, no-c-format
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "JDBCクラス <literal>java.sql.Clob</literal> と <literal>java.sql.Blob</"
 "literal> に対する型マッピング。 blobやclobオブジェクトはトランザクションの外"
@@ -4883,7 +4962,7 @@
 "らにはドライバサポートが一貫していません。)"
 
 #. Tag: literal
-#: basic_mapping.xml:2670
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -4893,16 +4972,16 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2674
-#, no-c-format
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "ほとんどの場合に可変であるJavaの型に対する型マッピング。 Hibernateは不変な"
 "Javaの型に対しては最適化を行い、 アプリケーションはそれを不変オブジェクトとし"
@@ -4912,19 +4991,20 @@
 "ティに対して新しい(同一でない)オブジェクトを割り当てなければなりません。"
 
 #. Tag: para
-#: basic_mapping.xml:2689
-#, no-c-format
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "エンティティとコレクションのユニークな識別子は、<literal>binary</literal> , "
 "<literal>blob</literal> , <literal>clob</literal> を除く、どんな基本型でも構"
 "いません。 (複合識別子でも構いません。以下を見てください。)"
 
 #. Tag: para
-#: basic_mapping.xml:2695
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -4937,20 +5017,20 @@
 "STRING</literal> は <literal>string</literal> 型を表現しています。"
 
 #. Tag: title
-#: basic_mapping.xml:2704
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr "カスタム型"
 
 #. Tag: para
-#: basic_mapping.xml:2706
-#, no-c-format
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -4967,14 +5047,14 @@
 "続化できます。"
 
 #. Tag: para
-#: basic_mapping.xml:2717
-#, no-c-format
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "カスタム型を実装するには、<literal>org.hibernate.UserType</literal> または "
 "<literal>org.hibernate.CompositeUserType</literal> を実装し、 型の完全修飾さ"
@@ -4983,7 +5063,7 @@
 "さい。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2725
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -4994,7 +5074,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2727
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -5004,7 +5084,7 @@
 "グできることに注目してください。"
 
 #. Tag: para
-#: basic_mapping.xml:2732
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -5017,10 +5097,10 @@
 "ンターフェイスは、より特殊な使用法に対してのサポートを提供します。"
 
 #. Tag: para
-#: basic_mapping.xml:2738
-#, no-c-format
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -5033,7 +5113,7 @@
 "literal> 要素を使用できます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2746
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -5044,7 +5124,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2748
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -5056,14 +5136,14 @@
 "対する値を検索することができます。"
 
 #. Tag: para
-#: basic_mapping.xml:2753
-#, no-c-format
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "特定の <literal>UserType</literal> を頻繁に使用するならば、短い名前を定義する"
 "と便利になるでしょう。 <literal>&lt;typedef&gt;</literal> 要素を使ってこのよ"
@@ -5071,7 +5151,7 @@
 "メータを持つならば、 パラメータのデフォルト値のリストを含むこともできます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2760
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -5081,13 +5161,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2764
+#: basic_mapping.xml:2791
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -5097,18 +5177,17 @@
 "メータをその都度オーバーライドすることが可能です。"
 
 #. Tag: para
-#: basic_mapping.xml:2769
-#, no-c-format
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "Hibernateの幅広い組み込み型とコンポーネントに対するサポートは、 カスタム型を"
 "めったに <emphasis>使わない</emphasis> ということを意味します。 それでもな"
@@ -5120,19 +5199,19 @@
 "マッピングドキュメントは起こりうる変化に対応できます。"
 
 #. Tag: title
-#: basic_mapping.xml:2785
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "1つのクラスに1つ以上のマッピング"
 
 #. Tag: para
-#: basic_mapping.xml:2786
-#, no-c-format
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -5144,7 +5223,7 @@
 "エンティティ名を指定しなければなりません。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2794
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -5167,30 +5246,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2796
-#, no-c-format
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "関連が<literal>class</literal> の代わりに <literal>entity-name</literal> を"
 "使って、 どのように指定されるのかに注目してください。"
 
 #. Tag: title
-#: basic_mapping.xml:2804
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "バッククォートで囲んだ SQL 識別子"
 
 #. Tag: para
-#: basic_mapping.xml:2805
-#, no-c-format
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "マッピングドキュメントでテーブルやカラムの名前をバッククォートで囲むことで、 "
 "Hibernateで生成されたSQL中の識別子を引用させることができます。 HibernateはSQL"
@@ -5199,7 +5278,7 @@
 "す)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2812
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5211,36 +5290,36 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "メタデータの代替手段"
 
 #. Tag: para
-#: basic_mapping.xml:2820
-#, no-c-format
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XMLの記述以外に、 HibernateではO/Rマッピングのメタデータを定義する代替方法が"
 "あります。"
 
 #. Tag: title
-#: basic_mapping.xml:2825
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "XDoclet マークアップの使用"
 
 #. Tag: para
-#: basic_mapping.xml:2827
-#, no-c-format
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "多くのHibernateユーザはXDocletの <literal>@hibernate.tags</literal> を使っ"
 "て、 ソースコード内に直接マッピング情報を埋め込むことを好みます。 これは厳密"
@@ -5248,7 +5327,7 @@
 "しかしXDocletを使った以下の <literal>Cat</literal> マッピングの例を示します。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2834
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5358,32 +5437,32 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2836
-#, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr ""
 "Hibernateのウェブサイトには、XDocletとHibernateに関するサンプルが多数ありま"
 "す。"
 
 #. Tag: title
-#: basic_mapping.xml:2843
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "JDK 5.0 アノテーションの使用"
 
 #. Tag: para
-#: basic_mapping.xml:2845
-#, no-c-format
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "JDK5.0ではタイプセーフかつコンパイル時にチェックできる、 言語レベルのXDoclet"
@@ -5398,13 +5477,13 @@
 "れはEJB3(JSR-220)とHibernate3のメタデータをどちらもサポートしています。"
 
 #. Tag: para
-#: basic_mapping.xml:2856
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr "以下はEJBのエンティティビーンとして注釈されたPOJOクラスの例です。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2860
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5432,35 +5511,34 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2862
-#, no-c-format
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "JDK5.0のアノテーション(とJSR-220)のサポートは進行中の作業であり、完全ではない"
 "ことに注意してください。 さらに詳しい情報はHibernateのアノテーション・モ"
 "ジュールを参照してください。"
 
 #. Tag: title
-#: basic_mapping.xml:2871
-#, no-c-format
-msgid "Generated Properties"
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "生成プロパティ"
 
 #. Tag: para
-#: basic_mapping.xml:2872
-#, no-c-format
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "生成プロパティとは、データベースによって生成された値を持つプロパティです。 通"
 "常、Hibernateアプリケーションは、データベースが値を生成したプロパティを含むオ"
@@ -5471,13 +5549,13 @@
 "生成された値を読み込むための SELECT SQL が発行されます。"
 
 #. Tag: para
-#: basic_mapping.xml:2881
-#, no-c-format
+#: basic_mapping.xml:2911
+#, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "生成プロパティは、挿入不可能かつ更新不可能でなければなりません。 <xref "
@@ -5487,25 +5565,25 @@
 "マークできます。"
 
 #. Tag: para
-#: basic_mapping.xml:2888
-#, no-c-format
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr ""
 "<literal>never</literal> (デフォルト) - 与えられたプロパティの値は、 データ"
 "ベースから生成されないことを意味します。"
 
 #. Tag: para
-#: basic_mapping.xml:2892
-#, no-c-format
+#: basic_mapping.xml:2922
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - 与えられたプロパティの値は挿入時に生成されるが、 "
 "続いて起こる更新時には生成されないこと示します。 作成された日付などは、このカ"
@@ -5515,32 +5593,33 @@
 "ンは利用できないことに注意してください。"
 
 #. Tag: para
-#: basic_mapping.xml:2900
-#, no-c-format
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr ""
 "<literal>always</literal> - 挿入時も更新時もプロパティの値が生成されることを"
 "示します。"
 
 #. Tag: title
-#: basic_mapping.xml:2907
-#, no-c-format
-msgid "Auxiliary Database Objects"
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "補助的なデータベース・オブジェクト"
 
 #. Tag: para
-#: basic_mapping.xml:2908
-#, no-c-format
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Hibernateのスキーマ・エボリューションツールと連動することで、 任意のデータ"
 "ベース・オブジェクト(トリガーやストアドプロシージャなど)のCREATEとDROPによ"
@@ -5552,17 +5631,17 @@
 "義するための、2つの基本的な方法があります。"
 
 #. Tag: para
-#: basic_mapping.xml:2917
-#, no-c-format
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr ""
 "1つ目の方法は、CREATEとDROPコマンドをマッピングファイルの外に、明示的に記載す"
 "ることです。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2921
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5575,19 +5654,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2922
-#, no-c-format
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "2つ目の方法は、CREATEとDROPコマンドの組み立て方を知っているカスタムクラスを提"
 "供することです。 このカスタムクラスは <literal>org.hibernate.mapping."
 "AuxiliaryDatabaseObject</literal> インタフェースを 実装しなければなりません。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2927
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5599,32 +5678,64 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2928
-#, no-c-format
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr ""
 "さらに、あるデータベース方言が使用される時にだけ適用するといったように、 デー"
 "タベース・オブジェクトが使われるケースを限定できます。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
-#~ msgid "class"
-#~ msgstr "class"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr "<literal>type</literal>(オプション):Hibernateの型を示す名前。"
 
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade</literal>(オプション): どの操作を、親オブジェクトから"
+#~ "関連オブジェクトへとカスケードさせるかを指定します。"
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (オプション - デフォルトは "
+#~ "<literal>true</literal> ): このプロパティの更新に楽観的ロックの取得を要求"
+#~ "するかどうかを指定します。 言い換えれば、このプロパティがダーティであると"
+#~ "きにバージョンを増やすべきかを決定します。"
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "永続サービスに関わる様々なJava言語レベルのオブジェクトの振る舞いを理解する"
+#~ "ためには、 オブジェクトを2つのグループに分ける必要があります:"
+
+#, fuzzy
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>all</literal> すべてのカラムをチェックします。"
+
 #~ msgid "id"
 #~ msgstr "id"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: batch.xml:5
+#: batch.xml:29
 #, no-c-format
 msgid "Batch processing"
 msgstr "バッチ処理"
 
 #. Tag: para
-#: batch.xml:7
-#, no-c-format
+#: batch.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "Hibernateを使ってデータベースに100,000行を挿入する愚直な方法は、このようなも"
 "のです:"
 
 #. Tag: programlisting
-#: batch.xml:12
+#: batch.xml:36
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -41,26 +41,26 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:14
-#, no-c-format
+#: batch.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "これは50,000番目の行のあたりで <literal>OutOfMemoryException</literal> で失敗"
 "するでしょう。 Hibernateがセッションレベルキャッシュで、 新しく挿入されたすべ"
 "ての <literal>Customer</literal> インスタンスをキャッシュするからです。"
 
 #. Tag: para
-#: batch.xml:20
-#, no-c-format
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "この章では、この問題を回避する方法を紹介します。 しかしバッチ処理をするなら、"
 "JDBCバッチが使用可能であることが非常に重要です。 そうでなければ手頃なパフォー"
@@ -68,39 +68,39 @@
 "してください:"
 
 #. Tag: programlisting
-#: batch.xml:27
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:29
-#, no-c-format
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "Note that Hibernate disables insert batching at the JDBC level transparently "
 "if you use an <literal>identiy</literal> identifier generator."
 
 #. Tag: para
-#: batch.xml:34
-#, no-c-format
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr ""
 "また二次キャッシュが全く効かないプロセスで、 このような作業をしたいと思うかも"
 "しれません:"
 
 #. Tag: programlisting
-#: batch.xml:39
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:41
+#: batch.xml:66
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -112,25 +112,25 @@
 "することができるからです。"
 
 #. Tag: title
-#: batch.xml:47
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr "バッチ挿入"
 
 #. Tag: para
-#: batch.xml:49
-#, no-c-format
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "新しいオブジェクトを永続化するとき、一次キャッシュのサイズを制限するため、 "
 "セッションを <literal>flush()</literal> して <literal>clear()</literal> しな"
 "ければなりません。"
 
 #. Tag: programlisting
-#: batch.xml:55
+#: batch.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -151,25 +151,25 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:60
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr "バッチ更新"
 
 #. Tag: para
-#: batch.xml:62
-#, no-c-format
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "データを復元したり更新したりするには同じアイディアを適用します。 それに加え"
 "て、データの行を多く返すクエリに対して有効な サーバーサイドのカーソルの利点を"
 "生かしたければ <literal>scroll()</literal> を使う必要があります。"
 
 #. Tag: programlisting
-#: batch.xml:68
+#: batch.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -194,28 +194,28 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:73
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr "StatelessSessionインターフェイス"
 
 #. Tag: para
-#: batch.xml:74
-#, no-c-format
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "また別の方法として、Hibernateはコマンド指向のAPIを用意しています。 これは分離"
 "オブジェクトの形で、 データベースとのデータストリームのやり取りに使うことがで"
@@ -232,7 +232,7 @@
 "り、JDBCに非常によく似ています。"
 
 #. Tag: programlisting
-#: batch.xml:89
+#: batch.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -251,29 +251,28 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:91
-#, no-c-format
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr ""
 "このコード例では、クエリが返す <literal>Customer</literal> インスタンスは即座"
 "に(セッションから)分離されることに注意してください。 これは、どのような永続"
 "コンテキストとも決して関連しません。"
 
 #. Tag: para
-#: batch.xml:97
-#, no-c-format
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "<literal>StatelessSession</literal> インターフェイスで定義されている "
 "<literal>insert(), update(), delete()</literal> は、 低レベルの直接的なデータ"
@@ -283,24 +282,24 @@
 "saveOrUpdate(), delete()</literal> とは非常に異なる意味を持ちます。"
 
 #. Tag: title
-#: batch.xml:110
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr "DMLスタイルの操作"
 
 #. Tag: para
-#: batch.xml:112
-#, no-c-format
+#: batch.xml:137
+#, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr ""
 "すでに議論したように、自動的かつ透過的なオブジェクト/リレーショナルマッピング"
 "は、 オブジェクトの状態の管理であると考えられます。 これはメモリ内のオブジェ"
@@ -312,31 +311,37 @@
 "言語(<xref linkend=\"queryhql\">HQL</xref>) を通して実行されます。"
 
 #. Tag: para
-#: batch.xml:122
-#, no-c-format
+#: batch.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "<literal>UPDATE</literal> と <literal>DELETE</literal> 文の疑似構文は: "
 "<literal>( UPDATE | DELETE ) FROM? エンティティ名 (WHERE 条件節)?</literal> "
 "です。 注意すべき点がいくつかあります:"
 
 #. Tag: para
-#: batch.xml:130
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "from節において、FROMキーワードはオプションです。"
 
 #. Tag: para
-#: batch.xml:135
-#, no-c-format
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr ""
 "from節では単一のエンティティ名だけが可能で、 任意で別名を付けることができま"
 "す。 エンティティ名に別名が与えられると、どのようなプロパティ参照も、 その別"
@@ -344,31 +349,31 @@
 "ば、 どのようなプロパティ参照も修飾してはなりません。"
 
 #. Tag: para
-#: batch.xml:143
-#, no-c-format
+#: batch.xml:170
+#, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "(暗黙的であれ明示的であれ)<xref linkend=\"queryhql-joins-forms\">結合</"
 "xref> をバルクHQLクエリ内で指定することはできません。 サブクエリはwhere節で使"
 "うことができます サブクエリそのものは、結合を含められます。"
 
 #. Tag: para
-#: batch.xml:150
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr "where節はオプションです。"
 
 #. Tag: para
-#: batch.xml:156
-#, no-c-format
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "例として、HQLの <literal>UPDATE</literal> を実行するには、 <literal>Query."
 "executeUpdate()</literal> メソッドを使ってください。 (このメソッドはおなじみ"
@@ -376,7 +381,7 @@
 "した): d"
 
 #. Tag: programlisting
-#: batch.xml:162
+#: batch.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -395,16 +400,16 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:164
-#, no-c-format
+#: batch.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -418,7 +423,7 @@
 "literal> キーワードを追加することで行えます。"
 
 #. Tag: programlisting
-#: batch.xml:174
+#: batch.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -434,19 +439,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:176
-#, no-c-format
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "カスタムバージョン型(<literal>org.hibernate.usertype.UserVersionType</"
 "literal>) は <literal>update versioned</literal> 文と一緒に使えないことに注"
 "意してください。"
 
 #. Tag: para
-#: batch.xml:181
+#: batch.xml:208
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -456,7 +461,7 @@
 "executeUpdate()</literal> メソッドを使ってください:"
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:213
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -472,19 +477,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
-#, no-c-format
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "<literal>Query.executeUpdate()</literal> メソッドが返す <literal>int</"
 "literal> の値は、この操作が影響を及ぼしたエンティティの数です。 これが影響す"
@@ -496,7 +501,7 @@
 "ブルと継承階層をさらに下ったjoined-subclassのテーブルの削除になります。"
 
 #. Tag: para
-#: batch.xml:199
+#: batch.xml:226
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -508,7 +513,7 @@
 "す:"
 
 #. Tag: para
-#: batch.xml:207
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -518,14 +523,14 @@
 "INTO ... VALUES ... の形式はサポートされていません。"
 
 #. Tag: para
-#: batch.xml:210
-#, no-c-format
+#: batch.xml:237
+#, fuzzy, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 "プロパティリストは、SQLの <literal>INSERT</literal> 文における <literal>カラ"
@@ -536,15 +541,15 @@
 "フィックではありません。"
 
 #. Tag: para
-#: batch.xml:220
-#, no-c-format
+#: batch.xml:247
+#, fuzzy, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
@@ -561,22 +566,22 @@
 "らを区別できなくても、変換することができても、この問題は発生します。"
 
 #. Tag: para
-#: batch.xml:232
-#, no-c-format
+#: batch.xml:259
+#, fuzzy, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 "idプロパティに対して、insert文には二つの選択肢があります。 プロパティリストで"
 "明示的にidプロパティを指定するか (この場合、対応するselect式から値が取られま"
@@ -591,15 +596,15 @@
 "択可能な方法がないため、このジェネレータを使うことはできません。"
 
 #. Tag: para
-#: batch.xml:247
-#, no-c-format
+#: batch.xml:274
+#, fuzzy, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 "<literal>version</literal> や <literal>timestamp</literal> としてマッピングさ"
 "れるプロパティに対して、 insert文には二つの選択肢があります。 プロパティリス"
@@ -609,13 +614,15 @@
 "ます)のいずれかです。"
 
 #. Tag: para
-#: batch.xml:257
-#, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+#: batch.xml:284
+#, fuzzy, no-c-format
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr "HQLの <literal>INSERT</literal> 文の実行例です:"
 
 #. Tag: programlisting
-#: batch.xml:261
+#: batch.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: best_practices.xml:5
+#: best_practices.xml:29
 #, no-c-format
 msgid "Best Practices"
 msgstr "ベストプラクティス"
 
 #. Tag: term
-#: best_practices.xml:9
-#, no-c-format
+#: best_practices.xml:33
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "クラスは細かい粒度で書き <literal>&lt;component&gt;</literal> でマッピングし"
 "ましょう。"
 
 #. Tag: para
-#: best_practices.xml:11
+#: best_practices.xml:35
 #, no-c-format
 msgid ""
 "Use an <literal>Address</literal> class to encapsulate <literal>street</"
@@ -41,31 +41,31 @@
 "ればコードが再利用しやすくなり、リファクタリングも簡単になります。"
 
 #. Tag: term
-#: best_practices.xml:19
-#, no-c-format
-msgid "Declare identifier properties on persistent classes."
+#: best_practices.xml:43
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "永続クラスには識別子プロパティを定義しましょう。"
 
 #. Tag: para
-#: best_practices.xml:21
-#, no-c-format
+#: best_practices.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "Hibernateでは識別子プロパティはオプションですが、 使用すべき理由がたくさんあ"
 "ります。 識別子は「人工的」(生成された、業務的な意味を持たない) なものにす"
 "ることをおすすめします。"
 
 #. Tag: term
-#: best_practices.xml:29
-#, no-c-format
-msgid "Identify natural keys."
+#: best_practices.xml:53
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "自然キーを見つけましょう。"
 
 #. Tag: para
-#: best_practices.xml:31
+#: best_practices.xml:55
 #, no-c-format
 msgid ""
 "Identify natural keys for all entities, and map them using <literal>&lt;"
@@ -79,85 +79,85 @@
 "ましょう。"
 
 #. Tag: term
-#: best_practices.xml:39
-#, no-c-format
-msgid "Place each class mapping in its own file."
+#: best_practices.xml:63
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "クラスのマッピングはそれぞれのクラス専用のファイルに書きましょう。"
 
 #. Tag: para
-#: best_practices.xml:41
-#, no-c-format
+#: best_practices.xml:65
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "単一の巨大なマッピングドキュメントを使用しないでください。 <literal>com.eg."
 "Foo</literal> クラスなら <literal>com/eg/Foo.hbm.xml</literal> ファイルにマッ"
 "ピングしましょう。 このことは、特にチームでの開発に意味があります。"
 
 #. Tag: term
-#: best_practices.xml:49
-#, no-c-format
-msgid "Load mappings as resources."
+#: best_practices.xml:73
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "リソースとしてマッピングをロードしましょう。"
 
 #. Tag: para
-#: best_practices.xml:51
+#: best_practices.xml:75
 #, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr "マッピングを、それらがマッピングするするクラスと一緒に配置しましょう。"
 
 #. Tag: term
-#: best_practices.xml:57
-#, no-c-format
-msgid "Consider externalising query strings."
+#: best_practices.xml:81
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "クエリ文字列を外部に置くことを考えましょう"
 
 #. Tag: para
-#: best_practices.xml:59
-#, no-c-format
+#: best_practices.xml:83
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "クエリがANSI標準でないSQL関数を呼んでいるなら、これはよいプラクティスです。 "
 "クエリ文字列をマッピングファイルへ外出しすればアプリケーションがポータブルに"
 "なります。"
 
 #. Tag: term
-#: best_practices.xml:67
+#: best_practices.xml:91
 #, no-c-format
 msgid "Use bind variables."
 msgstr "バインド変数を使いましょう。"
 
 #. Tag: para
-#: best_practices.xml:69
-#, no-c-format
+#: best_practices.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "JDBCの場合と同じように、定数でない値は必ず\"?\"で置き換えましょう。 定数でな"
 "い値をバインドするために、クエリで文字列操作を使ってはいけません。 名前付きの"
 "パラメータを使うようにするとさらに良いです。"
 
 #. Tag: term
-#: best_practices.xml:77
-#, no-c-format
-msgid "Don't manage your own JDBC connections."
+#: best_practices.xml:101
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "JDBCコネクションを管理してはいけません。"
 
 #. Tag: para
-#: best_practices.xml:79
-#, no-c-format
+#: best_practices.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "HibernateではアプリケーションがJDBCコネクションを管理することが許されていま"
 "す。 しかしこれは最終手段だと思ってください。 組み込みのコネクションプロバイ"
@@ -165,20 +165,20 @@
 "ConnectionProvider</literal> を実装することを考えてください。"
 
 #. Tag: term
-#: best_practices.xml:87
-#, no-c-format
-msgid "Consider using a custom type."
+#: best_practices.xml:111
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "カスタム型の使用を考えましょう。"
 
 #. Tag: para
-#: best_practices.xml:89
-#, no-c-format
+#: best_practices.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "あるライブラリから持ってきたJava型を永続化する必要があるとしましょう。 しかし"
 "その型には、コンポーネントとしてマッピングするために必要なアクセサがないとし"
@@ -187,22 +187,22 @@
 "のコードを扱えます。"
 
 #. Tag: term
-#: best_practices.xml:98
-#, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+#: best_practices.xml:122
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "ボトルネックを解消するにはJDBCをハンドコードしましょう。"
 
 #. Tag: para
-#: best_practices.xml:100
-#, no-c-format
+#: best_practices.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "システムのパフォーマンスクリティカルな領域では、 ある種の操作にJDBCを直接使う"
 "と良いかもしれません。 しかし何がボトルネックになっているか <emphasis>はっき"
@@ -213,19 +213,19 @@
 "バイダが使えるからです。"
 
 #. Tag: term
-#: best_practices.xml:110
-#, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+#: best_practices.xml:134
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "<literal>Session</literal> のフラッシュを理解しましょう。"
 
 #. Tag: para
-#: best_practices.xml:112
-#, no-c-format
+#: best_practices.xml:136
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "Sessionが永続状態をデータベースと同期させることがときどきあります。 しかしこ"
@@ -234,20 +234,20 @@
 "ことで、 不必要なフラッシュを最小限にできます。"
 
 #. Tag: term
-#: best_practices.xml:121
-#, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+#: best_practices.xml:145
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr "3層アーキテクチャでは分離オブジェクトの使用を考えましょう。"
 
 #. Tag: para
-#: best_practices.xml:123
-#, no-c-format
+#: best_practices.xml:147
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "サーブレット / セッションビーンアーキテクチャを使うとき、 サーブレット層 / "
 "JSP層間でセッションビーンでロードした永続オブジェクトをやり取りできます。 そ"
@@ -256,26 +256,26 @@
 "ジェクトとデータベースを同期させてください。"
 
 #. Tag: term
-#: best_practices.xml:132
-#, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#: best_practices.xml:156
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr "2層アーキテクチャでは長い永続コンテキストの使用を考えましょう。"
 
 #. Tag: para
-#: best_practices.xml:134
-#, no-c-format
+#: best_practices.xml:158
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "最高のスケーラビリティを得るには、 データベーストランザクションをできるだけ短"
@@ -292,20 +292,20 @@
 "ないでください。 そうでなければ、古いデータで作業することになります。"
 
 #. Tag: term
-#: best_practices.xml:148
-#, no-c-format
-msgid "Don't treat exceptions as recoverable."
+#: best_practices.xml:172
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "例外を復帰可能なものとして扱ってはいけません。"
 
 #. Tag: para
-#: best_practices.xml:150
-#, no-c-format
+#: best_practices.xml:174
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -318,22 +318,22 @@
 "<literal>Session.get()</literal> かクエリを使ってください。"
 
 #. Tag: term
-#: best_practices.xml:160
-#, no-c-format
-msgid "Prefer lazy fetching for associations."
+#: best_practices.xml:184
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "関連にはなるべく遅延フェッチを使いましょう。"
 
 #. Tag: para
-#: best_practices.xml:162
-#, no-c-format
+#: best_practices.xml:186
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "即時フェッチは控えめにしましょう。 二次キャッシュには完全に保持されないような"
 "クラスの関連には、 プロキシと遅延コレクションを使ってください。 キャッシュさ"
@@ -343,19 +343,19 @@
 "join fetch</literal> を使ってください。"
 
 #. Tag: term
-#: best_practices.xml:172
-#, no-c-format
+#: best_practices.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "フェッチされていないデータに関わる問題を避けるために、 <emphasis>ビューの中で"
 "オープンセッションを使う(open session in view)</emphasis> パターンか、統制さ"
 "れた <emphasis>組み立てフェーズ(assembly phase)</emphasis> を使いましょう。"
 
 #. Tag: para
-#: best_practices.xml:177
-#, no-c-format
+#: best_practices.xml:201
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -363,12 +363,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernateは <emphasis>Data Transfer Objects</emphasis> (DTO)を書く退屈な作業"
 "から開発者を解放します。 伝統的なEJBアーキテクチャではDTOは二つ目的がありま"
@@ -383,21 +383,21 @@
 "全にデータアクセスするための基本的な要件です。"
 
 #. Tag: term
-#: best_practices.xml:191
-#, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+#: best_practices.xml:215
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "Hibernateからビジネスロジックを抽象化することを考えましょう。"
 
 #. Tag: para
-#: best_practices.xml:193
-#, no-c-format
+#: best_practices.xml:217
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "インターフェイスで(Hibernateの)データアクセスコードを隠蔽しましょう。 "
 "<emphasis>DAO</emphasis> と <emphasis>Thread Local Session</emphasis> パター"
@@ -407,21 +407,21 @@
 "ないようなアプリケーションには当てはまりません。)"
 
 #. Tag: term
-#: best_practices.xml:203
-#, no-c-format
-msgid "Don't use exotic association mappings."
+#: best_practices.xml:227
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "珍しい関連マッピングは使わないようにしましょう。"
 
 #. Tag: para
-#: best_practices.xml:205
-#, no-c-format
+#: best_practices.xml:229
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "よいユースケースに本当の多対多関連があることは稀(まれ)です。 ほとんどの場合"
 "「リンクテーブル」の付加的な情報が必要になります。 この場合、リンククラスに2"
@@ -430,13 +430,13 @@
 "い。"
 
 #. Tag: term
-#: best_practices.xml:215
-#, no-c-format
-msgid "Prefer bidirectional associations."
+#: best_practices.xml:239
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "なるべく双方向関連にしましょう。"
 
 #. Tag: para
-#: best_practices.xml:217
+#: best_practices.xml:241
 #, no-c-format
 msgid ""
 "Unidirectional associations are more difficult to query. In a large "

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: collection_mapping.xml:5
-#, no-c-format
-msgid "Collection Mapping"
+#: collection_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Collection mapping"
 msgstr "コレクションのマッピング"
 
 #. Tag: title
-#: collection_mapping.xml:8
+#: collection_mapping.xml:32
 #, no-c-format
 msgid "Persistent collections"
 msgstr "コレクションの永続化"
 
 #. Tag: para
-#: collection_mapping.xml:10
-#, no-c-format
+#: collection_mapping.xml:34
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "コレクション型のフィールドを永続化するには、 そのコレクション型がインターフェ"
 "イス型である必要があります。 例えば、"
 
 #. Tag: programlisting
-#: collection_mapping.xml:15
+#: collection_mapping.xml:39
 #, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
@@ -48,15 +48,15 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:17
-#, no-c-format
+#: collection_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "実在するインターフェイスには <literal>java.util.Set</literal>、 "
 "<literal>java.util.Collection</literal>、<literal>java.util.List</literal>、 "
@@ -67,16 +67,16 @@
 "成する必要があります。)"
 
 #. Tag: para
-#: collection_mapping.xml:26
-#, no-c-format
+#: collection_mapping.xml:50
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "<literal>HashSet</literal> のインスタンスを持つインスタンス変数が どのように"
 "初期化されるかに注目してみましょう。 これは新たに生成された(永続化されていな"
@@ -87,7 +87,7 @@
 "要です。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:36
+#: collection_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -102,13 +102,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:38
-#, no-c-format
+#: collection_mapping.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "Hibernateにより注入された永続性コレクションは、インターフェイス型に応じて、 "
 "<literal>HashMap</literal> や <literal>HashSet</literal>、 <literal>TreeMap</"
@@ -116,16 +116,16 @@
 "振舞います。"
 
 #. Tag: para
-#: collection_mapping.xml:45
-#, no-c-format
+#: collection_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "コレクションインスタンスは、値型として普通に振舞います。 永続化オブジェクトに"
@@ -138,37 +138,51 @@
 "区別しません。"
 
 #. Tag: para
-#: collection_mapping.xml:56
-#, no-c-format
+#: collection_mapping.xml:80
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "しかしそれほど心配しなくても構いません。 普段使っているJavaのコレクションと同"
 "じように、永続化コレクションを使ってください。 双方向関連の意味を理解すればよ"
 "いのです(これは後ほど説明します)。"
 
 #. Tag: title
-#: collection_mapping.xml:65
+#: collection_mapping.xml:89
 #, no-c-format
 msgid "Collection mappings"
 msgstr "コレクションのマッピング"
 
 #. Tag: para
-#: collection_mapping.xml:67
-#, no-c-format
+#: collection_mapping.xml:92
+#, fuzzy, no-c-format
 msgid ""
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
+msgstr ""
+"多くの一般的なリレーショナルモデルをカバーしたために、 コレクションのために利"
+"用できるマッピングにはかなりの幅があります。 様々なマッピング宣言がどのように"
+"データベーステーブルに変換されるかを知るために、 スキーマ生成ツールを使ってみ"
+"ると良いでしょう。"
+
+#. Tag: para
+#: collection_mapping.xml:99
+#, fuzzy, no-c-format
+msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "コレクションをマッピングするためのマッピング要素は、インターフェイスの型に依"
 "存します。 例えば、<literal>&lt;set&gt;</literal> 要素は <literal>Set</"
 "literal> 型を マッピングするために使います。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:73
+#: collection_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Product\">\n"
@@ -181,7 +195,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:75
+#: collection_mapping.xml:107
 #, no-c-format
 msgid ""
 "Apart from <literal>&lt;set&gt;</literal>, there is also <literal>&lt;"
@@ -197,7 +211,7 @@
 "に示します。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:100
+#: collection_mapping.xml:132
 #, no-c-format
 msgid ""
 "<![CDATA[<map\n"
@@ -226,39 +240,40 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:103
-#, no-c-format
-msgid "<literal>name</literal> the collection property name"
+#: collection_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr "<literal>name</literal> コレクション型であるプロパティの名前"
 
 #. Tag: para
-#: collection_mapping.xml:108
-#, no-c-format
+#: collection_mapping.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (オプション - デフォルトはプロパティ名)コレクショ"
 "ンテーブルの名前 (一対多関連では使用しません)。"
 
 #. Tag: para
-#: collection_mapping.xml:114
-#, no-c-format
+#: collection_mapping.xml:146
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (オプション)テーブルスキーマの名前。 ルート要素で"
 "宣言されているスキーマより優先されます。"
 
 #. Tag: para
-#: collection_mapping.xml:120
-#, no-c-format
+#: collection_mapping.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (オプション - デフォルトは <literal>true</"
 "literal>) 遅延フェッチを無効にし、関連を常に即時にフェッチにするために使用し"
@@ -267,44 +282,45 @@
 "なコレクションに適しています)。"
 
 #. Tag: para
-#: collection_mapping.xml:129
-#, no-c-format
+#: collection_mapping.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (オプション - デフォルトは <literal>false</"
 "literal>) このコレクションが双方向関連の「逆」側であるとマークします。"
 
 #. Tag: para
-#: collection_mapping.xml:135
-#, no-c-format
+#: collection_mapping.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (オプション - デフォルトは <literal>none</"
 "literal>) 子エンティティへのカスケード操作を有効にします。"
 
 #. Tag: para
-#: collection_mapping.xml:141
-#, no-c-format
+#: collection_mapping.xml:173
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal> (オプション)コレクションを自然な順序でソートする場"
 "合は <literal>natural</literal> を指定します。 あるいはComparatorクラスを指定"
 "します。"
 
 #. Tag: para
-#: collection_mapping.xml:147
-#, no-c-format
+#: collection_mapping.xml:179
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (オプション、JDK1.4のみ) <literal>Map</"
 "literal>、<literal>Set</literal>、bagのイテレーション順序を定義する テーブル"
@@ -312,23 +328,24 @@
 "<literal>desc</literal> を指定します。"
 
 #. Tag: para
-#: collection_mapping.xml:154
-#, no-c-format
+#: collection_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (オプション)コレクションの検索や削除の際に使う 任"
 "意のSQLの<literal>WHERE</literal> 条件を指定します (利用可能なデータの一部分"
 "だけをコレクションが含むべきときに、これは有用です)。"
 
 #. Tag: para
-#: collection_mapping.xml:161
-#, no-c-format
+#: collection_mapping.xml:193
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal>(オプション - デフォルトは <literal>select</"
@@ -337,35 +354,35 @@
 "択してください。"
 
 #. Tag: para
-#: collection_mapping.xml:168
-#, no-c-format
+#: collection_mapping.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (オプション - デフォルトは <literal>1</"
 "literal>) コレクションのインスタンスの遅延フェッチのための「バッチサイズ」を"
 "指定します。"
 
 #. Tag: para
-#: collection_mapping.xml:174
-#, no-c-format
+#: collection_mapping.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal> (オプション - デフォルトは <literal>property</"
 "literal>) コレクション型プロパティの値にアクセスするために使用する戦略です。"
 
 #. Tag: para
-#: collection_mapping.xml:180
-#, no-c-format
+#: collection_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>optimistic-lock</literal>(オプション - デフォルトは <literal>true</"
 "literal>) コレクションの状態を変えることによって、 そのオーナーであるエン"
@@ -373,30 +390,31 @@
 "ほとんどの場合において無効に設定するのが妥当です。)"
 
 #. Tag: para
-#: collection_mapping.xml:188
-#, no-c-format
+#: collection_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable</literal>(オプション - デフォルトは <literal>true</"
 "literal>) <literal>false</literal> 値は、コレクションの要素が変更されないこ"
 "とを表します (ある場合には、少しパフォーマンスを高めます)。"
 
 #. Tag: title
-#: collection_mapping.xml:198
+#: collection_mapping.xml:230
 #, no-c-format
 msgid "Collection foreign keys"
 msgstr "コレクションの外部キー"
 
 #. Tag: para
-#: collection_mapping.xml:200
-#, no-c-format
+#: collection_mapping.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -406,12 +424,12 @@
 "キーカラムは <literal>&lt;key&gt;</literal> 要素によりマッピングします。"
 
 #. Tag: para
-#: collection_mapping.xml:208
-#, no-c-format
+#: collection_mapping.xml:240
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "外部キーカラムにはnull設定制約があるかもしれません。 ほとんどのコレクションに"
@@ -420,27 +438,27 @@
 "を指定する必要があるかもしれません。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:215
+#: collection_mapping.xml:247
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:217
-#, no-c-format
+#: collection_mapping.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 "外部キーの制約が <literal>ON DELETE CASCADE</literal> を使うかもしれません。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:221
+#: collection_mapping.xml:253
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" on-delete=\"cascade\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:223
+#: collection_mapping.xml:255
 #, no-c-format
 msgid ""
 "See the previous chapter for a full definition of the <literal>&lt;key&gt;</"
@@ -450,22 +468,22 @@
 "ださい。"
 
 #. Tag: title
-#: collection_mapping.xml:231
+#: collection_mapping.xml:263
 #, no-c-format
 msgid "Collection elements"
 msgstr "コレクションの要素"
 
 #. Tag: para
-#: collection_mapping.xml:233
-#, no-c-format
+#: collection_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "コレクションは他のHibernateの型のほとんど(すべての基本型、カスタム型、コン"
 "ポーネント、 他のエンティティへの参照)を格納することができます。 次の点は重"
@@ -476,7 +494,7 @@
 "に保持していると見なしているだけです。"
 
 #. Tag: para
-#: collection_mapping.xml:242
+#: collection_mapping.xml:274
 #, no-c-format
 msgid ""
 "The contained type is referred to as the <emphasis>collection element type</"
@@ -494,26 +512,26 @@
 "ピングし、次の二つはエンティティの関連をマッピングするのに使われます。"
 
 #. Tag: title
-#: collection_mapping.xml:254
+#: collection_mapping.xml:286
 #, no-c-format
 msgid "Indexed collections"
 msgstr "インデックス付きのコレクション"
 
 #. Tag: para
-#: collection_mapping.xml:256
-#, no-c-format
+#: collection_mapping.xml:288
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "setとbagを除く全てのコレクションマッピングには、 コレクションテーブルの中に "
 "<emphasis>インデックス用のカラム</emphasis> が必要です。 そのカラムに、配列"
@@ -528,7 +546,7 @@
 "納します(デフォルトでは0から番号が付けられます)。"
 
 #. Tag: sect2
-#: collection_mapping.xml:267
+#: collection_mapping.xml:299
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -536,10 +554,10 @@
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -550,11 +568,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -564,24 +582,24 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:348
-#, no-c-format
+#: collection_mapping.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "もしテーブルにインデックスカラムがなくても、プロパティ型として "
 "<literal>List</literal> を使いたければ、 Hibernateの <emphasis>&lt;bag&gt;</"
@@ -589,33 +607,19 @@
 "る時、順序を保持しません。 しかし、(メモリ上で)ソートしたり、(SQLで)順序"
 "付けしたり(order by)することもできます。"
 
-#. Tag: para
-#: collection_mapping.xml:357
-#, no-c-format
-msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
-msgstr ""
-"多くの一般的なリレーショナルモデルをカバーしたために、 コレクションのために利"
-"用できるマッピングにはかなりの幅があります。 様々なマッピング宣言がどのように"
-"データベーステーブルに変換されるかを知るために、 スキーマ生成ツールを使ってみ"
-"ると良いでしょう。"
-
 #. Tag: title
-#: collection_mapping.xml:364
+#: collection_mapping.xml:390
 #, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "値のコレクションと多対多関連"
 
 #. Tag: para
-#: collection_mapping.xml:366
-#, no-c-format
+#: collection_mapping.xml:392
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr ""
 "値のコレクションや多対多関連は、専用の <emphasis>コレクションテーブル</"
@@ -624,17 +628,17 @@
 "す。"
 
 #. Tag: para
-#: collection_mapping.xml:373
-#, no-c-format
+#: collection_mapping.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr ""
 "値のコレクションのために、<literal>&lt;element&gt;</literal>タグを使用しま"
 "す。"
 
 #. Tag: sect2
-#: collection_mapping.xml:375
+#: collection_mapping.xml:401
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"element1b\" coords=\"2 50\"/> <area "
@@ -650,11 +654,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -675,43 +679,49 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:480
+#: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
-msgstr "以下にいくつか例を示します。 まずはStringのsetに関しての例です。"
+msgid "Here are some examples."
+msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:484
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -721,17 +731,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:486
-#, no-c-format
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "整数値を含むbag(bagは <literal>order-by</literal> 属性によって反復順序が定義"
 "されています)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:491
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -743,13 +753,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:493
-#, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr "エンティティの配列 - この場合、多対多の関連です。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:497
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -762,13 +772,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:499
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "文字列と日付のmap"
 
 #. Tag: programlisting
-#: collection_mapping.xml:503
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -782,13 +792,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:505
-#, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr "コンポーネントのlist(次の章で詳しく説明します)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:509
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -804,51 +814,51 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:514
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr "一対多関連"
 
 #. Tag: para
-#: collection_mapping.xml:516
-#, no-c-format
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr ""
 "<emphasis>一対多関連</emphasis> は、コレクション・テーブルを介さず、 外部キー"
 "により2つのクラスのテーブルを関連付けます。 このマッピングは標準的なJavaのコ"
 "レクションのセマンティクスをいくつか失います。"
 
 #. Tag: para
-#: collection_mapping.xml:524
-#, no-c-format
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr ""
 "エンティティクラスのインスタンスは、 2つ以上のコレクションのインスタンスに属"
 "してはいけません。"
 
 #. Tag: para
-#: collection_mapping.xml:530
-#, no-c-format
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "コレクションに含まれるエンティティクラスのインスタンスは、 コレクションイン"
 "デックスの値として2度以上現れてはいけません。"
 
 #. Tag: para
-#: collection_mapping.xml:537
-#, no-c-format
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr ""
 "<literal>Product</literal> から <literal>Part</literal> への関連は、 "
 "<literal>Part</literal> テーブルへの外部キーカラムと、場合によってはインデッ"
@@ -856,7 +866,7 @@
 "一対多関連であることを表しています。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:550
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -869,18 +879,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:553
-#, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+#: collection_mapping.xml:582
+#, fuzzy, no-c-format
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr "<literal>class</literal> (必須): 関連クラスの名前。"
 
 #. Tag: para
-#: collection_mapping.xml:558
-#, no-c-format
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (オプション - デフォルトは <literal>exception</"
@@ -889,10 +899,10 @@
 "して扱います。"
 
 #. Tag: para
-#: collection_mapping.xml:565
-#, no-c-format
+#: collection_mapping.xml:594
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "<literal>entity-name</literal> (オプション): <literal>class</literal> の代"
@@ -900,28 +910,27 @@
 "する、関連クラスのエンティティ名。"
 
 #. Tag: para
-#: collection_mapping.xml:573
-#, no-c-format
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "<literal>&lt;one-to-many&gt;</literal> 要素はカラムを宣言する必要がないことに"
 "注意してください。 同様に <literal>テーブル</literal> 名を指定する必要もあり"
 "ません。"
 
 #. Tag: para
-#: collection_mapping.xml:579
-#, no-c-format
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>とても重要な注意:</emphasis> もし <literal>&lt;one-to-many&gt;</"
 "literal> 関連の外部キーカラムが <literal>NOT NULL</literal>と宣言された場"
@@ -931,12 +940,12 @@
 "す。 双方向関連についてはこの章の後のほうで説明します。"
 
 #. Tag: para
-#: collection_mapping.xml:588
-#, no-c-format
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "次の例は、名称(<literal>Part</literal> の永続的なプロパティである "
 "<literal>partName</literal>) による <literal>Part</literal> エンティティの"
@@ -944,7 +953,7 @@
 "い。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:594
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -956,19 +965,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:600
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "高度なコレクション・マッピング"
 
 #. Tag: title
-#: collection_mapping.xml:603
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr "ソートされたコレクション"
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -980,7 +989,7 @@
 "ピング定義ファイルにコンパレータを指定しなければなりません。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:610
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -998,7 +1007,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:612
+#: collection_mapping.xml:643
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -1010,7 +1019,7 @@
 "実装したクラスの名前です。"
 
 #. Tag: para
-#: collection_mapping.xml:618
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -1020,15 +1029,15 @@
 "<literal>java.util.TreeMap</literal> のように振舞います。"
 
 #. Tag: para
-#: collection_mapping.xml:623
-#, no-c-format
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "もしデータベース自身にコレクションの要素を並べさせたいなら、 <literal>set</"
 "literal> や <literal>bag</literal>、<literal>map</literal> の <literal>order-"
@@ -1038,7 +1047,7 @@
 "はなく、SQLクエリ内で実行されます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:632
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1054,28 +1063,34 @@
 "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:634
-#, no-c-format
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "<literal>order-by</literal> 属性の値がSQL命令であって、HQL命令ではないことに"
 "注意してください!"
 
 #. Tag: para
-#: collection_mapping.xml:639
-#, no-c-format
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "関連は、コレクションの <literal>filter()</literal> を使うことで、 実行時に任"
 "意のcriteriaによってソートすることも可能です。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:644
+#: collection_mapping.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1083,13 +1098,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:649
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "双方向関連"
 
 #. Tag: para
-#: collection_mapping.xml:651
+#: collection_mapping.xml:685
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1100,37 +1115,36 @@
 "きます。 2種類の双方向関連がサポートされています。 <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:658
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr "one-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:660
-#, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "片側がsetかbag、もう片方が単一値です。"
 
 #. Tag: term
-#: collection_mapping.xml:666
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr "many-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:668
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "両側がsetかbagです。"
 
 #. Tag: para
-#: collection_mapping.xml:677
-#, no-c-format
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "2つの多対多関連で同じデータベーステーブルをマッピングし、 片方を "
 "<emphasis>inverse</emphasis> として宣言することで、 双方向の多対多関連を指定"
@@ -1138,17 +1152,18 @@
 "ス付きのコレクションは使えません)。"
 
 #. Tag: para
-#: collection_mapping.xml:684
-#, no-c-format
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "次に双方向の多対多関連の例を示します。 各カテゴリは多数のアイテムを持つことが"
 "でき、各アイテムは多くのカテゴリに属することが出来ます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:689
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1173,14 +1188,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:691
-#, no-c-format
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "関連のinverse側にのみ行われた変更は永続化 <emphasis>されません</emphasis>。 "
 "これは、Hibernateは全ての双方向関連について、メモリ上に2つの表現を持っている"
@@ -1190,7 +1205,7 @@
 "示します。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:699
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1205,7 +1220,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:701
+#: collection_mapping.xml:735
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1215,10 +1230,10 @@
 "す。"
 
 #. Tag: para
-#: collection_mapping.xml:705
-#, no-c-format
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1226,7 +1241,7 @@
 "ムにマッピングし、 多側に <literal>inverse=\"true\"</literal> と宣言します。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:711
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1249,30 +1264,30 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:713
-#, no-c-format
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "関連の片側に <literal>inverse=\"true\"</literal> を設定しても、 カスケード操"
 "作に影響を与えません。これらは直交した概念です!"
 
 #. Tag: title
-#: collection_mapping.xml:721
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "インデックス付きコレクションと双方向関連"
 
 #. Tag: para
-#: collection_mapping.xml:722
-#, no-c-format
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "片側が <literal>&lt;list&gt;</literal> や <literal>&lt;map&gt;</literal> であ"
 "る 双方向関連は、特によく考える必要があります。 インデックスカラムにマップさ"
@@ -1280,7 +1295,7 @@
 "で <literal>inverse=\"true\"</literal> を使い続けられます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:729
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1307,14 +1322,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
-#, no-c-format
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "しかし、子クラスにそのようなプロパティがない場合は、 関連を真に双方向であると"
 "考えることができません (関連の片側に利用できる情報がありますが、もう一方には"
@@ -1322,7 +1337,7 @@
 "literal> をマッピングできません。 代わりに、次のようなマッピングが使えます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:738
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1350,34 +1365,33 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:740
-#, no-c-format
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "注意: このマッピングでは、関連のコレクション値の側は、 外部キーをアップデー"
 "トする責任があります。"
 
 #. Tag: title
-#: collection_mapping.xml:748
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr "3項関連"
 
 #. Tag: para
-#: collection_mapping.xml:750
-#, no-c-format
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "3項関連のマッピングには3つのアプローチがあります。 1つ目は関連をインデックス"
 "として <literal>Map</literal> を使用するアプローチです。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1388,7 +1402,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:757
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1399,43 +1413,42 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:759
-#, no-c-format
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "2つ目は単純に関連をエンティティ・クラスとしてモデルを作り直すアプローチで、 頻"
 "繁に使われます。"
 
 #. Tag: para
-#: collection_mapping.xml:764
-#, no-c-format
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr ""
 "最後はcomposite要素を使うアプローチです。これに関する議論は後ほど行います。"
 
 #. Tag: literal
-#: collection_mapping.xml:771
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "<literal>&lt;idbag&gt;</literal>の使用"
 
 #. Tag: para
-#: collection_mapping.xml:773
-#, no-c-format
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "複合キーは悪いもので、エンティティは人工の識別子(代理キー)を持つべきであると"
 "いう考え方からは、 多対多関連と値のコレクションを複合キーを用いたテーブルへ"
@@ -1446,18 +1459,18 @@
 "のコレクションを マッピングする機能も備えています。"
 
 #. Tag: para
-#: collection_mapping.xml:784
-#, no-c-format
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "bagのセマンティックスを持った <literal>List</literal>(または "
 "<literal>Collection</literal>)を <literal>&lt;idbag&gt;</literal> 要素にマッ"
 "ピングできます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:789
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1470,13 +1483,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:791
-#, no-c-format
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "ご存知のように <literal>&lt;idbag&gt;</literal> はエンティティ・クラスのよう"
 "に 人工的なidジェネレータを持っています! 異なる代理キーをそれぞれのコレク"
@@ -1484,13 +1497,13 @@
 "つけ出す機構を持っていません。"
 
 #. Tag: para
-#: collection_mapping.xml:798
-#, no-c-format
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> を更新するパフォーマンスは 通常の "
 "<literal>&lt;bag&gt;</literal> よりも良いことに注目してください! Hibernateは"
@@ -1498,7 +1511,7 @@
 "新、削除できます。"
 
 #. Tag: para
-#: collection_mapping.xml:805
+#: collection_mapping.xml:837
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1509,21 +1522,26 @@
 "idbag&gt;</literal> コレクションの識別子に対して使えません。"
 
 #. Tag: title
-#: collection_mapping.xml:829
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr "コレクションの例"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "コレクションの例"
+
+#. Tag: para
+#: collection_mapping.xml:867
 #, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
-msgstr "これまでの節の説明では理解しにくいので、以下の例を見てください。"
+"The following class has a collection of <literal>Child</literal> instances:"
+msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:836
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1545,18 +1563,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:838
-#, no-c-format
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "このクラスは <literal>Child</literal> インスタンスのコレクションを持っていま"
 "す。 もし各々のchildが最大でも一つのparentを持っているならば、最も自然なマッ"
 "ピングは一対多関連です。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:844
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1582,13 +1600,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:846
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "これは以下のテーブル定義にマッピングします。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:850
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1598,7 +1616,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:852
+#: collection_mapping.xml:887
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1608,7 +1626,7 @@
 "てください。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:857
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1636,13 +1654,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:859
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "<literal>NOT NULL</literal> 制約に注意してください。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:863
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1654,19 +1672,19 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:865
-#, no-c-format
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "あるいは、もしこの関連は単方向であるべきと強く主張するのであれば、 "
 "<literal>&lt;key&gt;</literal> に <literal>NOT NULL</literal> 制約を宣言でき"
 "ます。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:871
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1692,15 +1710,15 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:873
-#, no-c-format
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr "一方で、もしchildが複数のparentを持てるならば、多対多関連が妥当です。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:878
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1726,13 +1744,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:880
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr "テーブル定義は以下のようになります。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:884
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1747,24 +1765,33 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:886
-#, no-c-format
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "parent/child関係のマッピングについてのより多くの例や完全な手順が必要であれ"
 "ば、 <xref linkend=\"example-parentchild\"/> をご覧ください。"
 
 #. Tag: para
-#: collection_mapping.xml:891
-#, no-c-format
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr "また、さらに特殊な関連マッピングも可能です。次の章で詳しく述べます。"
 
+#~ msgid "Collection Mapping"
+#~ msgstr "コレクションのマッピング"
+
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr "以下にいくつか例を示します。 まずはStringのsetに関しての例です。"
+
 #~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr "これまでの節の説明では理解しにくいので、以下の例を見てください。"
+
+#~ msgid ""
 #~ "<literal>column_name</literal> (required): The name of the column holding "
 #~ "the collection index values."
 #~ msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: component_mapping.xml:5
+#: component_mapping.xml:29
 #, no-c-format
 msgid "Component Mapping"
 msgstr "コンポーネントのマッピング"
 
 #. Tag: para
-#: component_mapping.xml:7
-#, no-c-format
+#: component_mapping.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "<emphasis>コンポーネント</emphasis> の概念は、Hibernateを通して様々な状況の中"
 "で 異なる目的のために再利用されます。"
 
 #. Tag: title
-#: component_mapping.xml:13
+#: component_mapping.xml:37
 #, no-c-format
 msgid "Dependent objects"
 msgstr "依存オブジェクト"
 
 #. Tag: para
-#: component_mapping.xml:15
-#, no-c-format
+#: component_mapping.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "コンポーネントは、エンティティの参照ではなく値型として永続化された、 包含され"
 "たオブジェクトです。コンポーネントという言葉については、コンポジションという "
@@ -47,7 +47,7 @@
 "トではありません)。 例えば、以下のPersonモデルのようなものです。"
 
 #. Tag: programlisting
-#: component_mapping.xml:21
+#: component_mapping.xml:45
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:23
+#: component_mapping.xml:47
 #, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
@@ -107,13 +107,13 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:25
-#, no-c-format
+#: component_mapping.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "いま、<literal>Name</literal> は <literal>Person</literal> のコンポーネントと"
 "して 永続化することが出来ます。ここで <literal>Name</literal> は永続化属性に"
@@ -121,13 +121,13 @@
 "ティを定義する必要が ないことに注意して下さい。"
 
 #. Tag: para
-#: component_mapping.xml:32
-#, no-c-format
-msgid "Our Hibernate mapping would look like:"
+#: component_mapping.xml:56
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "マッピング定義は以下のようになります。"
 
 #. Tag: programlisting
-#: component_mapping.xml:36
+#: component_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -145,7 +145,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:38
+#: component_mapping.xml:62
 #, no-c-format
 msgid ""
 "The person table would have the columns <literal>pid</literal>, "
@@ -157,16 +157,16 @@
 "literal> カラムを持ちます。"
 
 #. Tag: para
-#: component_mapping.xml:46
-#, no-c-format
+#: component_mapping.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "全ての値型のように、コンポーネントは参照の共有をすることができません。 言い換"
 "えると、二人のPersonは同じ名前を持つことができますが、二つのPersonオブジェク"
@@ -177,13 +177,13 @@
 "す。 これは大抵の場合問題ありません。"
 
 #. Tag: para
-#: component_mapping.xml:55
-#, no-c-format
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "コンポーネントの属性はどんなHibernateの型でも構いません(コレクション、many-"
 "to-one関連、 他のコンポーネントなど)。ネストされたコンポーネントは滅多に使わ"
@@ -191,7 +191,7 @@
 "の細かいオブジェクトモデルをサポートするように意図されています。"
 
 #. Tag: para
-#: component_mapping.xml:62
+#: component_mapping.xml:85
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -203,7 +203,7 @@
 "サブ要素を使用できます。"
 
 #. Tag: programlisting
-#: component_mapping.xml:68
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -222,19 +222,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:73
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "従属するオブジェクトのコレクション"
 
 #. Tag: para
-#: component_mapping.xml:75
-#, no-c-format
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "Hibernateはコンポーネントのコレクションをサポートしています(例えば "
 "<literal>Name</literal> 型の配列)。 <literal>&lt;element&gt;</literal> タグ"
@@ -242,7 +242,7 @@
 "ンポーネントコレクションを宣言してください。"
 
 #. Tag: programlisting
-#: component_mapping.xml:82
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -256,29 +256,28 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:84
-#, no-c-format
+#: component_mapping.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "注意: コンポジットエレメントの <literal>Set</literal> を定義したなら、 "
 "<literal>equals()</literal> と <literal>hashCode()</literal> を正しく実装する"
 "ことが重要です。"
 
 #. Tag: para
-#: component_mapping.xml:90
-#, no-c-format
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "コンポジットエレメントはコレクションを含まず、コンポーネントを含むこともあり"
 "ます。 コンポジットエレメント自身がコンポーネントを含んでいる場合は "
@@ -290,17 +289,16 @@
 "作はまだ若干異なることに注意してください。"
 
 #. Tag: para
-#: component_mapping.xml:102
-#, no-c-format
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "もし <literal>&lt;set&gt;</literal> を使用するのであれば、コンポジットエレメ"
 "ントのマッピングがnull値が可能な 属性をサポートしていないことに注意してくださ"
@@ -312,14 +310,14 @@
 "<literal>&lt;idbag&gt;</literal> を選択する必要があります。"
 
 #. Tag: para
-#: component_mapping.xml:113
-#, no-c-format
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -332,7 +330,7 @@
 "す。"
 
 #. Tag: programlisting
-#: component_mapping.xml:123
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -351,14 +349,14 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:125
-#, no-c-format
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "もちろん、双方向関連のナビゲーションのために反対側からpurchaseへの参照を作る"
 "ことは出来ません。 コンポーネントは値型であり、参照を共有できないことを覚えて"
@@ -367,13 +365,13 @@
 "ことは出来ません。"
 
 #. Tag: para
-#: component_mapping.xml:133
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "3項関連(あるいは4項など)も可能です。"
 
 #. Tag: programlisting
-#: component_mapping.xml:135
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -389,27 +387,27 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
-#, no-c-format
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr ""
 "コンポジットエレメントは他のエンティティへの関連として、 同じシンタックスを"
 "使っているクエリ内で使用できます。"
 
 #. Tag: title
-#: component_mapping.xml:145
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "Mapのインデックスとしてのコンポーネント"
 
 #. Tag: para
-#: component_mapping.xml:147
-#, no-c-format
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -419,52 +417,58 @@
 "ライドしてください。"
 
 #. Tag: title
-#: component_mapping.xml:156
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr "複合識別子としてのコンポーネント"
 
 #. Tag: para
-#: component_mapping.xml:158
-#, no-c-format
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "コンポーネントをエンティティクラスの識別子として使うことができます。 コンポー"
 "ネントクラスは以下の条件を満たす必要があります。"
 
 #. Tag: para
-#: component_mapping.xml:165
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "<literal>java.io.Serializable</literal> を実装しなければなりません。"
 
 #. Tag: para
-#: component_mapping.xml:170
-#, no-c-format
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "データベース上の複合キーの等価性と矛盾のないように、<literal>equals()</"
 "literal> と <literal>hashCode()</literal> を再実装しなければなりません。"
 
-#. Tag: emphasis
-#: component_mapping.xml:179
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "注意: Hibernate3において、2番目の条件は絶対的な条件ではありません。 しかしと"
 "にかく条件を満たしてください。"
 
 #. Tag: para
-#: component_mapping.xml:183
-#, no-c-format
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "複合キーを生成するために <literal>IdentifierGenerator</literal> を使用するこ"
@@ -472,11 +476,11 @@
 "ん。"
 
 #. Tag: para
-#: component_mapping.xml:188
-#, no-c-format
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -488,43 +492,43 @@
 "す。"
 
 #. Tag: programlisting
-#: component_mapping.xml:196
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:198
-#, no-c-format
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "このとき、<literal>OrderLine</literal> テーブルへ関連する外部キーもまた複合で"
 "す。 他のクラスのマッピングでこれを宣言しなければなりません。 "
 "<literal>OrderLine</literal> への関連は次のようにマッピングされます。"
 
 #. Tag: programlisting
-#: component_mapping.xml:204
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -536,17 +540,17 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:206
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(<literal>&lt;column&gt;</literal> タグはどこであっても <literal>column</"
-"literal> 属性の 代わりになります。)"
 
 #. Tag: para
-#: component_mapping.xml:211
+#: component_mapping.xml:244
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -556,7 +560,7 @@
 "外部キーを使います。"
 
 #. Tag: programlisting
-#: component_mapping.xml:216
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -570,7 +574,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:218
+#: component_mapping.xml:251
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -580,7 +584,7 @@
 "は 次のものを使用します。"
 
 #. Tag: programlisting
-#: component_mapping.xml:223
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -593,17 +597,15 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:225
-#, no-c-format
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 "(<literal>&lt;one-to-many&gt;</literal> 属性は、例によってカラムを宣言しませ"
 "ん)"
 
 #. Tag: para
-#: component_mapping.xml:229
+#: component_mapping.xml:262
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -613,7 +615,7 @@
 "外部キーも持っています。"
 
 #. Tag: programlisting
-#: component_mapping.xml:234
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -634,19 +636,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:239
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr "動的コンポーネント"
 
 #. Tag: para
-#: component_mapping.xml:241
-#, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr "<literal>Map</literal> 型のプロパティのマッピングも可能です。"
 
 #. Tag: programlisting
-#: component_mapping.xml:245
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -657,16 +659,16 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:247
-#, no-c-format
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "<literal>&lt;dynamic-component&gt;</literal> マッピングのセマンティクスは "
 "<literal>&lt;component&gt;</literal> と同一のものです。この種のマッピングの利"
@@ -674,3 +676,10 @@
 "す。また、DOMパーサを利用して、マッピングドキュメントのランタイム操作が可能で"
 "す。 さらに、<literal>Configuration</literal> オブジェクト経由でHibernateのコ"
 "ンフィグレーション時のメタモデルに アクセス(または変更)が可能です。"
+
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(<literal>&lt;column&gt;</literal> タグはどこであっても <literal>column</"
+#~ "literal> 属性の 代わりになります。)"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: configuration.xml:5
+#: configuration.xml:29
 #, no-c-format
 msgid "Configuration"
 msgstr "設定"
 
 #. Tag: para
-#: configuration.xml:7
-#, no-c-format
+#: configuration.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "Hibernateはさまざまな環境で動作するようにデザインされているため、非常に多くの"
 "設定要素があります。 幸いなことに、Hibernateは、公開されているパッケージの "
@@ -35,20 +35,20 @@
 "タマイズするだけです。"
 
 #. Tag: title
-#: configuration.xml:16
+#: configuration.xml:40
 #, no-c-format
 msgid "Programmatic configuration"
 msgstr "プログラム上の設定"
 
 #. Tag: para
-#: configuration.xml:18
-#, no-c-format
+#: configuration.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"An instance of <literal>org.hibernate.cfg.Configuration</literal> represents "
-"an entire set of mappings of an application's Java types to an SQL database. "
-"The <literal>Configuration</literal> is used to build an (immutable) "
-"<literal>SessionFactory</literal>. The mappings are compiled from various "
-"XML mapping files."
+"An instance of <classname>org.hibernate.cfg.Configuration</classname> "
+"represents an entire set of mappings of an application's Java types to an "
+"SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
+"interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "<literal>org.hibernate.cfg.Configuration</literal> のインスタンスは、 Javaの"
 "型とSQLデータベースのマッピング情報をすべて持っています。 The "
@@ -57,12 +57,13 @@
 "マッピング情報にします。"
 
 #. Tag: para
-#: configuration.xml:26
-#, no-c-format
+#: configuration.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"You may obtain a <literal>Configuration</literal> instance by instantiating "
-"it directly and specifying XML mapping documents. If the mapping files are "
-"in the classpath, use <literal>addResource()</literal>:"
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"instance by instantiating it directly and specifying XML mapping documents. "
+"If the mapping files are in the classpath, use <literal>addResource()</"
+"literal>. For example:"
 msgstr ""
 "通常、<literal>Configuration</literal> インスタンスは、特定のXMLマッピング"
 "ファイル によって直接初期化されます。もし、マッピングファイルがクラスパスに設"
@@ -70,7 +71,7 @@
 "literal> :"
 
 #. Tag: programlisting
-#: configuration.xml:32
+#: configuration.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -79,17 +80,17 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:34
-#, no-c-format
+#: configuration.xml:57
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "代替案(こちらのほうが良いときもあります)としてマッピングクラスを指定する方法"
 "もあります。Hibernateに、マッピングファイルを 見つけさせてください:"
 
 #. Tag: programlisting
-#: configuration.xml:39
+#: configuration.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -98,12 +99,12 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:41
-#, no-c-format
+#: configuration.xml:64
+#, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <literal>/org/hibernate/"
-"auction/Item.hbm.xml</literal> and <literal>/org/hibernate/auction/Bid.hbm."
-"xml</literal> in the classpath. This approach eliminates any hardcoded "
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
+"auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
+"xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
 msgstr ""
 "Hibernateは、クラスパスにある以下のような名前のマッピングファイルを見つけま"
@@ -112,16 +113,16 @@
 "れたファイル名を排除できます。"
 
 #. Tag: para
-#: configuration.xml:48
-#, no-c-format
+#: configuration.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Configuration</literal> also allows you to specify configuration "
-"properties:"
+"A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
+"specify configuration properties. For example:"
 msgstr ""
 "<literal>Configuration</literal> は、設定プロパティを指定することもできます:"
 
 #. Tag: programlisting
-#: configuration.xml:53
+#: configuration.xml:75
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -135,37 +136,37 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:55
-#, no-c-format
+#: configuration.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr ""
 "Hibernateに設定プロパティを通す方法は1つではありません。 さまざまなオプション"
 "を用意しています:"
 
 #. Tag: para
-#: configuration.xml:62
-#, no-c-format
+#: configuration.xml:84
+#, fuzzy, no-c-format
 msgid ""
-"Pass an instance of <literal>java.util.Properties</literal> to "
+"Pass an instance of <classname>java.util.Properties</classname> to "
 "<literal>Configuration.setProperties()</literal>."
 msgstr ""
 "<literal>java.util.Properties</literal> インスタンスを "
 "<literal>Configuration.setProperties()</literal> に渡します。"
 
 #. Tag: para
-#: configuration.xml:68
-#, no-c-format
+#: configuration.xml:90
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>hibernate.properties</literal> in a root directory of the "
-"classpath."
+"Place a file named <filename>hibernate.properties</filename> in a root "
+"directory of the classpath."
 msgstr ""
 "<literal>hibernate.properties</literal> を クラスパスのルートディレクトリに置"
 "きます。"
 
 #. Tag: para
-#: configuration.xml:74
+#: configuration.xml:95
 #, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
@@ -175,49 +176,49 @@
 "literal> を使うように設定します。"
 
 #. Tag: para
-#: configuration.xml:80
-#, no-c-format
+#: configuration.xml:100
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "<literal>&lt;property&gt;</literal> 要素を <literal>hibernate.cfg.xml</"
 "literal> (後述)に設定します。"
 
 #. Tag: para
-#: configuration.xml:87
+#: configuration.xml:107
 #, no-c-format
 msgid ""
-"<literal>hibernate.properties</literal> is the easiest approach if you want "
-"to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
-"今すぐ始めたいのなら、<literal>hibernate.properties</literal> を使うのが一番"
-"の近道です。"
 
 #. Tag: para
-#: configuration.xml:92
-#, no-c-format
+#: configuration.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Configuration</literal> is intended as a startup-time object, "
-"to be discarded once a <literal>SessionFactory</literal> is created."
+"The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
+"startup-time object that will be discarded once a <literal>SessionFactory</"
+"literal> is created."
 msgstr ""
 "<literal>Configuration</literal> は、起動時にだけあるオブジェクトであり、 一"
 "度 <literal>SessionFactory</literal> を生成した後は、破棄されることを意図して"
 "います。"
 
 #. Tag: title
-#: configuration.xml:100
+#: configuration.xml:119
 #, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "SessionFactoryを取得する"
 
 #. Tag: para
-#: configuration.xml:102
-#, no-c-format
+#: configuration.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"When all mappings have been parsed by the <literal>Configuration</literal>, "
-"the application must obtain a factory for <literal>Session</literal> "
-"instances. This factory is intended to be shared by all application threads:"
+"When all mappings have been parsed by the <classname>org.hibernate.cfg."
+"Configuration</classname>, the application must obtain a factory for "
+"<interfacename>org.hibernate.Session</interfacename> instances. This factory "
+"is intended to be shared by all application threads:"
 msgstr ""
 "<literal>Configuration</literal> がすべてのマッピング情報を解析したら、 アプ"
 "リケーションは、 <literal>Session</literal> ファクトリインスタンスを取得しま"
@@ -225,65 +226,67 @@
 "きです。"
 
 #. Tag: programlisting
-#: configuration.xml:108
+#: configuration.xml:127
 #, no-c-format
 msgid "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:110
-#, no-c-format
+#: configuration.xml:129
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does allow your application to instantiate more than one "
-"<literal>SessionFactory</literal>. This is useful if you are using more than "
-"one database."
+"<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful "
+"if you are using more than one database."
 msgstr ""
 "Hibernateは、 <literal>SessionFactory</literal> を複数生成することができま"
 "す。 これは、複数のデータベースを使用する場合に便利です。"
 
 #. Tag: title
-#: configuration.xml:119
+#: configuration.xml:138
 #, no-c-format
 msgid "JDBC connections"
 msgstr "JDBCコネクション"
 
 #. Tag: para
-#: configuration.xml:121
-#, no-c-format
+#: configuration.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <literal>SessionFactory</literal> create and "
-"pool JDBC connections for you. If you take this approach, opening a "
-"<literal>Session</literal> is as simple as:"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
+"interfacename> create and pool JDBC connections for you. If you take this "
+"approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
+"as simple as:"
 msgstr ""
 "通常、開発者は <literal>SessionFactory</literal> を生成し、SessionFactoryで"
 "JDBCコネクションをプーリングしたいと考えます。 そのアプローチを採用する場合、"
 "単純に <literal>Session</literal> をオープンしてください:"
 
 #. Tag: programlisting
-#: configuration.xml:127
+#: configuration.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:129
-#, no-c-format
+#: configuration.xml:148
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "これだけで、プーリングしたJDBCコネクションを使って目的のデータベース にアクセ"
 "スすることができます。"
 
 #. Tag: para
-#: configuration.xml:134
-#, no-c-format
+#: configuration.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <literal>org.hibernate.cfg.Environment</literal>. We will now describe "
-"the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "そのためには、JDBCコネクションのプロパティをHibernateに設定する必要がありま"
 "す。 すべてのHibernateプロパティ名とセマンティクスは <literal>org.hibernate."
@@ -291,108 +294,108 @@
 "ン設定の中で一番重要なものです。"
 
 #. Tag: para
-#: configuration.xml:141
-#, no-c-format
+#: configuration.xml:159
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <literal>java.sql."
-"DriverManager</literal> if you set the following properties:"
+"Hibernate will obtain and pool connections using <classname>java.sql."
+"DriverManager</classname> if you set the following properties:"
 msgstr ""
 "もし、以下のプロパティを設定すると、Hibernateはコネクションを取得する(プール"
 "も)ために <literal>java.sql.DriverManager</literal> を使います。"
 
 #. Tag: title
-#: configuration.xml:147
+#: configuration.xml:165
 #, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Hibernate JDBCプロパティ"
 
 #. Tag: entry
-#: configuration.xml:153 configuration.xml:241 configuration.xml:338
-#: configuration.xml:529 configuration.xml:725 configuration.xml:832
-#: configuration.xml:920
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353
+#: configuration.xml:548 configuration.xml:743 configuration.xml:850
+#: configuration.xml:938
 #, no-c-format
 msgid "Property name"
 msgstr "プロパティ名"
 
 #. Tag: entry
-#: configuration.xml:154 configuration.xml:242 configuration.xml:339
-#: configuration.xml:530 configuration.xml:726 configuration.xml:833
-#: configuration.xml:921
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354
+#: configuration.xml:549 configuration.xml:744 configuration.xml:851
+#: configuration.xml:939
 #, no-c-format
 msgid "Purpose"
 msgstr "意味"
 
-#. Tag: literal
-#: configuration.xml:160
+#. Tag: property
+#: configuration.xml:178
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: emphasis
-#: configuration.xml:163
+#: configuration.xml:181
 #, no-c-format
 msgid "JDBC driver class"
 msgstr "JDBCドライバクラス"
 
-#. Tag: literal
-#: configuration.xml:168
+#. Tag: property
+#: configuration.xml:186
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: emphasis
-#: configuration.xml:171
+#: configuration.xml:189
 #, no-c-format
 msgid "JDBC URL"
 msgstr "jdbc URL"
 
-#. Tag: literal
-#: configuration.xml:176 configuration.xml:272
+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: emphasis
-#: configuration.xml:179
+#: configuration.xml:197
 #, no-c-format
 msgid "database user"
 msgstr "database user"
 
-#. Tag: literal
-#: configuration.xml:184 configuration.xml:280
+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: emphasis
-#: configuration.xml:187
+#: configuration.xml:205
 #, no-c-format
 msgid "database user password"
 msgstr "database user password"
 
-#. Tag: literal
-#: configuration.xml:192
+#. Tag: property
+#: configuration.xml:210
 #, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr "hibernate.connection.pool_size"
 
 #. Tag: emphasis
-#: configuration.xml:195
+#: configuration.xml:213
 #, no-c-format
 msgid "maximum number of pooled connections"
 msgstr "プールするコネクションの最大数"
 
 #. Tag: para
-#: configuration.xml:202
-#, no-c-format
+#: configuration.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
-"replace the <literal>hibernate.connection.pool_size</literal> property with "
-"connection pool specific settings. This will turn off Hibernate's internal "
-"pool. For example, you might like to use C3P0."
+"replace the <property>hibernate.connection.pool_size</property> property "
+"with connection pool specific settings. This will turn off Hibernate's "
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "Hibernateのコネクションプールアルゴリズムは非常に初歩的なものです。 これはす"
 "ぐに始められるようにと用意されたもので、<emphasis>製品として使用することを意"
@@ -404,15 +407,16 @@
 "ます。"
 
 #. Tag: para
-#: configuration.xml:212
-#, no-c-format
+#: configuration.xml:230
+#, fuzzy, no-c-format
 msgid ""
 "C3P0 is an open source JDBC connection pool distributed along with Hibernate "
-"in the <literal>lib</literal> directory. Hibernate will use its "
-"<literal>C3P0ConnectionProvider</literal> for connection pooling if you set "
-"<literal>hibernate.c3p0.*</literal> properties. If you'd like to use Proxool "
-"refer to the packaged <literal>hibernate.properties</literal> and the "
-"Hibernate web site for more information."
+"in the <filename>lib</filename> directory. Hibernate will use its "
+"<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
+"connection pooling if you set <property>hibernate.c3p0.*</property> "
+"properties. If you would like to use Proxool, refer to the packaged "
+"<filename>hibernate.properties</filename> and the Hibernate web site for "
+"more information."
 msgstr ""
 "C3P0はオープンソースJDBCコネクションプールで、Hibernateの <literal>lib</"
 "literal> ディレクトリにあります。もし、<literal>hibernate.c3p0.*</literal> プ"
@@ -422,15 +426,16 @@
 "の情報を取得してください。"
 
 #. Tag: para
-#: configuration.xml:221
-#, no-c-format
+#: configuration.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Here is an example <literal>hibernate.properties</literal> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr ""
 "C3P0用の <literal>hibernate.properties</literal> ファイルを例として示します:"
 
 #. Tag: programlisting
-#: configuration.xml:225
+#: configuration.xml:242
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
@@ -445,13 +450,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:227
-#, no-c-format
+#: configuration.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<literal>Datasource</literal> registered in JNDI. You'll need to set at "
-"least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "アプリケーションサーバ上で使う場合は、Hibernateを設定し、 アプリケーション"
 "サーバからコネクションを取得するようにしてください。 <literal>Datasource</"
@@ -459,43 +464,43 @@
 "い。"
 
 #. Tag: title
-#: configuration.xml:235
+#: configuration.xml:251
 #, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Hibernate データソースプロパティ"
 
-#. Tag: literal
-#: configuration.xml:248
+#. Tag: property
+#: configuration.xml:264
 #, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr "hibernate.connection.datasource"
 
 #. Tag: emphasis
-#: configuration.xml:251
+#: configuration.xml:267
 #, no-c-format
 msgid "datasource JNDI name"
 msgstr "データソースのJNDI名"
 
-#. Tag: literal
-#: configuration.xml:256
+#. Tag: property
+#: configuration.xml:272
 #, no-c-format
 msgid "hibernate.jndi.url"
 msgstr "hibernate.jndi.url"
 
 #. Tag: entry
-#: configuration.xml:258
+#: configuration.xml:274
 #, fuzzy, no-c-format
 msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr "JNDIプロバイダのURL"
 
-#. Tag: literal
-#: configuration.xml:264
+#. Tag: property
+#: configuration.xml:280
 #, no-c-format
 msgid "hibernate.jndi.class"
 msgstr "hibernate.jndi.class"
 
 #. Tag: entry
-#: configuration.xml:266
+#: configuration.xml:282
 #, no-c-format
 msgid ""
 "<emphasis>class of the JNDI <literal>InitialContextFactory</literal></"
@@ -503,29 +508,29 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:274
+#: configuration.xml:290
 #, no-c-format
 msgid "<emphasis>database user</emphasis> (optional)"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:282
+#: configuration.xml:298
 #, no-c-format
 msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:290
-#, no-c-format
+#: configuration.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example <literal>hibernate.properties</literal> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "アプリケーションサーバから提供されたJNDIデータソースを使う "
 "<literal>hibernate.properties</literal> ファイルの例を示します:"
 
 #. Tag: programlisting
-#: configuration.xml:295
+#: configuration.xml:311
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
@@ -537,7 +542,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:297
+#: configuration.xml:313
 #, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
@@ -547,13 +552,13 @@
 "テナ管理トランザクションに自動的に参加します。"
 
 #. Tag: para
-#: configuration.xml:302
-#, no-c-format
+#: configuration.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
-"\"<literal>hibernate.connection</literal>\" to the property name. For "
-"example, you may specify a <literal>charSet</literal> using "
-"<literal>hibernate.connection.charSet</literal>."
+"Arbitrary connection properties can be given by prepending "
+"\"<literal>hibernate.connection</literal>\" to the connection property name. "
+"For example, you can specify a <property>charSet</property> connection "
+"property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "任意のコネクションプロパティは、与えられた” <literal>hibernate.connnection</"
 "literal> ” プロパティ名によって与えられます。例えば、 <literal>charSet</"
@@ -561,13 +566,14 @@
 "literal> を使います。"
 
 #. Tag: para
-#: configuration.xml:308
-#, no-c-format
+#: configuration.xml:324
+#, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
-"implementing the interface <literal>org.hibernate.connection."
-"ConnectionProvider</literal>. You may select a custom implementation by "
-"setting <literal>hibernate.connection.provider_class</literal>."
+"You can define your own plugin strategy for obtaining JDBC connections by "
+"implementing the interface <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>, and specifying your custom "
+"implementation via the <property>hibernate.connection.provider_class</"
+"property> property."
 msgstr ""
 "JDBCコネクションを取得する戦略を持つ独自のプラグインを定義する場合は、 "
 "<literal>org.hibernate.connection.ConnectionProvider</literal> インターフェイ"
@@ -575,29 +581,29 @@
 "provider_class</literal> に設定してください。"
 
 #. Tag: title
-#: configuration.xml:317
+#: configuration.xml:333
 #, no-c-format
 msgid "Optional configuration properties"
 msgstr "オプション設定プロパティ"
 
 #. Tag: para
-#: configuration.xml:319
-#, no-c-format
+#: configuration.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "これらのプロパティはHibernateの挙動を制御するものです。 これらのプロパティは"
 "すべて妥当なデフォルト値があり、任意で設定します。"
 
-#. Tag: para
-#: configuration.xml:324
-#, no-c-format
+#. Tag: warning
+#: configuration.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <literal>hibernate.properties</literal>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>注意:これらのプロパティは\"システムレベル\"のみです。</emphasis> "
 "システムレベルプロパティは <literal>java -Dproperty=value</literal> 、もしく"
@@ -605,45 +611,55 @@
 "定方法は <emphasis>ありません</emphasis> 。"
 
 #. Tag: title
-#: configuration.xml:332
+#: configuration.xml:347
 #, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Hibernate設定プロパティ"
 
-#. Tag: literal
-#: configuration.xml:345
+#. Tag: property
+#: configuration.xml:360
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: configuration.xml:347
+#: configuration.xml:362
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a Hibernate <literal>Dialect</literal> which allows "
-"Hibernate to generate SQL optimized for a particular relational database."
+"The classname of a Hibernate <classname>org.hibernate.dialect.Dialect</"
+"classname> which allows Hibernate to generate SQL optimized for a particular "
+"relational database."
 msgstr ""
 "Hibernate <placeholder-1/> クラス名が入ります。 これはリレーショナルデータ"
 "ベースごとに最適化されたSQLを生成します。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:351
+#: configuration.xml:365
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:359
+#. Tag: para
+#: configuration.xml:369
 #, no-c-format
+msgid ""
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
+msgstr ""
+
+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr "hibernate.show_sql"
 
 #. Tag: entry
-#: configuration.xml:361
+#: configuration.xml:380
 #, fuzzy, no-c-format
 msgid ""
 "Write all SQL statements to console. This is an alternative to setting the "
@@ -655,39 +671,39 @@
 "<placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:365 configuration.xml:377 configuration.xml:471
-#: configuration.xml:484 configuration.xml:497 configuration.xml:510
-#: configuration.xml:564 configuration.xml:591 configuration.xml:605
-#: configuration.xml:660 configuration.xml:888 configuration.xml:903
-#: configuration.xml:993
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490
+#: configuration.xml:503 configuration.xml:516 configuration.xml:529
+#: configuration.xml:583 configuration.xml:610 configuration.xml:623
+#: configuration.xml:678 configuration.xml:906 configuration.xml:921
+#: configuration.xml:1011
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:373
+#. Tag: property
+#: configuration.xml:392
 #, no-c-format
 msgid "hibernate.format_sql"
 msgstr "hibernate.format_sql"
 
 #. Tag: entry
-#: configuration.xml:375
+#: configuration.xml:394
 #, fuzzy, no-c-format
 msgid "Pretty print the SQL in the log and console."
 msgstr "ログとコンソールのSQLを美しく表示します。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:385
+#. Tag: property
+#: configuration.xml:404
 #, no-c-format
 msgid "hibernate.default_schema"
 msgstr "hibernate.default_schema"
 
 #. Tag: entry
-#: configuration.xml:387
+#: configuration.xml:406
 #, fuzzy, no-c-format
 msgid ""
 "Qualify unqualified table names with the given schema/tablespace in "
@@ -697,71 +713,72 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:390
+#: configuration.xml:409
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:398
+#. Tag: property
+#: configuration.xml:417
 #, no-c-format
 msgid "hibernate.default_catalog"
 msgstr "hibernate.default_catalog"
 
 #. Tag: entry
-#: configuration.xml:400
+#: configuration.xml:419
 #, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr "生成されるSQL文のテーブルに設定するカタログです。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:403
+#: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:411
+#. Tag: property
+#: configuration.xml:430
 #, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr "hibernate.session_factory_name"
 
 #. Tag: entry
-#: configuration.xml:413
+#: configuration.xml:432
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>SessionFactory</literal> will be automatically bound to this "
-"name in JNDI after it has been created."
+"The <interfacename>org.hibernate.SessionFactory</interfacename> will be "
+"automatically bound to this name in JNDI after it has been created."
 msgstr ""
 "<placeholder-1/> は生成後、この名前でJNDIに登録されます。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:416 configuration.xml:859
+#: configuration.xml:435 configuration.xml:877
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:424
+#. Tag: property
+#: configuration.xml:443
 #, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr "hibernate.max_fetch_depth"
 
 #. Tag: entry
-#: configuration.xml:426
+#: configuration.xml:445
 #, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -770,55 +787,55 @@
 "す。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:430
-#, no-c-format
+#: configuration.xml:449
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis> 推奨する値は <literal>0</literal> "
 "から <literal>3</literal> です。"
 
-#. Tag: literal
-#: configuration.xml:439
+#. Tag: property
+#: configuration.xml:458
 #, no-c-format
 msgid "hibernate.default_batch_fetch_size"
 msgstr "hibernate.default_batch_fetch_size"
 
 #. Tag: entry
-#: configuration.xml:441
+#: configuration.xml:460
 #, fuzzy, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr "関連フェッチのデフォルトバッチサイズを指定します。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:443
-#, no-c-format
+#: configuration.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis> 推奨する値は <literal>4</"
 "literal> , <literal>8</literal> , <literal>16</literal> です。"
 
-#. Tag: literal
-#: configuration.xml:452
+#. Tag: property
+#: configuration.xml:471
 #, no-c-format
 msgid "hibernate.default_entity_mode"
 msgstr "hibernate.default_entity_mode"
 
 #. Tag: entry
-#: configuration.xml:454
+#: configuration.xml:473
 #, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "<placeholder-1/> からセッションをオープンしたときに 使用するエンティティのデ"
 "フォルトモードを設定します。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:457
+#: configuration.xml:476
 #, no-c-format
 msgid ""
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
@@ -827,17 +844,17 @@
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
 "literal>"
 
-#. Tag: literal
-#: configuration.xml:465
+#. Tag: property
+#: configuration.xml:484
 #, no-c-format
 msgid "hibernate.order_updates"
 msgstr "hibernate.order_updates"
 
 #. Tag: entry
-#: configuration.xml:467
+#: configuration.xml:486
 #, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
@@ -845,14 +862,14 @@
 "合、同時実行可能なシステムでは、まれにデッドロックが発生する可能性がありま"
 "す。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:479
+#. Tag: property
+#: configuration.xml:498
 #, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr "hibernate.generate_statistics"
 
 #. Tag: entry
-#: configuration.xml:481
+#: configuration.xml:500
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, Hibernate will collect statistics useful for performance tuning."
@@ -860,14 +877,14 @@
 "有効の場合、Hibernateはパフォーマンスチューニングに 有効な統計情報を収集しま"
 "す。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:492
+#. Tag: property
+#: configuration.xml:511
 #, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr "hibernate.use_identifer_rollback"
 
 #. Tag: entry
-#: configuration.xml:494
+#: configuration.xml:513
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, generated identifier properties will be reset to default values "
@@ -876,14 +893,14 @@
 "有効の場合、オブジェクトが削除されたときに 識別子プロパティをリセットし、デ"
 "フォルト値にしたものを生成します。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:505
+#. Tag: property
+#: configuration.xml:524
 #, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr "hibernate.use_sql_comments"
 
 #. Tag: entry
-#: configuration.xml:507
+#: configuration.xml:526
 #, fuzzy, no-c-format
 msgid ""
 "If turned on, Hibernate will generate comments inside the SQL, for easier "
@@ -893,19 +910,19 @@
 "フォルトの値は <placeholder-1/> です。 <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:521
+#: configuration.xml:540
 #, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "Hibernate JDBC とコネクションプロパティ"
 
-#. Tag: literal
-#: configuration.xml:536
+#. Tag: property
+#: configuration.xml:555
 #, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr "hibernate.jdbc.fetch_size"
 
 #. Tag: entry
-#: configuration.xml:538
+#: configuration.xml:557
 #, fuzzy, no-c-format
 msgid ""
 "A non-zero value determines the JDBC fetch size (calls <literal>Statement."
@@ -914,42 +931,42 @@
 "値が0でない場合、JDBCフェッチサイズを決定します ( <placeholder-1/> を呼びま"
 "す)。"
 
-#. Tag: literal
-#: configuration.xml:545
+#. Tag: property
+#: configuration.xml:564
 #, no-c-format
 msgid "hibernate.jdbc.batch_size"
 msgstr "hibernate.jdbc.batch_size"
 
 #. Tag: entry
-#: configuration.xml:547
+#: configuration.xml:566
 #, fuzzy, no-c-format
 msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr ""
 "値が0でない場合、HibernateがJDBC2バッチ更新を使用します。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:549
-#, no-c-format
+#: configuration.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis> 推奨する値は <literal>5</literal> "
 "から <literal>30</literal> です。"
 
-#. Tag: literal
-#: configuration.xml:557
+#. Tag: property
+#: configuration.xml:576
 #, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr "hibernate.jdbc.batch_versioned_data"
 
 #. Tag: entry
-#: configuration.xml:559
+#: configuration.xml:578
 #, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "もしJDBCドライバが <placeholder-1/> によって正確な行数を 返す場合、このプロパ"
@@ -957,80 +974,81 @@
 "す)。 Hibernateは、自動バージョンデータのためバッチDMLを使います。 デフォル"
 "トの値は <placeholder-3/> です。 <placeholder-4/>"
 
-#. Tag: literal
-#: configuration.xml:572
+#. Tag: property
+#: configuration.xml:591
 #, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr "hibernate.jdbc.factory_class"
 
 #. Tag: entry
-#: configuration.xml:574
+#: configuration.xml:593
 #, fuzzy, no-c-format
 msgid ""
-"Select a custom <literal>Batcher</literal>. Most applications will not need "
-"this configuration property."
+"Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfacename>. "
+"Most applications will not need this configuration property."
 msgstr ""
 "カスタム <placeholder-1/> を選びます。 ほとんどのアプリケーションに、この設定"
 "は必要ありません。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:577
+#: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:585
+#. Tag: property
+#: configuration.xml:604
 #, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr "hibernate.jdbc.use_scrollable_resultset"
 
 #. Tag: entry
-#: configuration.xml:587
+#: configuration.xml:606
 #, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "スクロール可能なリザルトセットを、Hibernateが使用します。 このプロパティは、"
 "JDBCコネクションがコネクションメタデータを サポートしていることが必須条件にな"
 "ります。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:599
+#. Tag: property
+#: configuration.xml:618
 #, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr "hibernate.jdbc.use_streams_for_binary"
 
 #. Tag: entry
-#: configuration.xml:601
+#: configuration.xml:620
 #, fuzzy, no-c-format
 msgid ""
 "Use streams when writing/reading <literal>binary</literal> or "
-"<literal>serializable</literal> types to/from JDBC (system-level property)."
+"<literal>serializable</literal> types to/from JDBC. <emphasis>*system-level "
+"property*</emphasis>"
 msgstr ""
 "JDBCへ/から <placeholder-1/> や <placeholder-2/> の書き込み/読み込みストリー"
 "ムを使います(システムレベルのプロパティ)。 <placeholder-3/>"
 
-#. Tag: literal
-#: configuration.xml:613
+#. Tag: property
+#: configuration.xml:631
 #, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr "hibernate.jdbc.use_get_generated_keys"
 
 #. Tag: entry
-#: configuration.xml:615
+#: configuration.xml:633
 #, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "挿入の後に自動生成された主キーを取得するための JDBC3 <placeholder-1/> の使用"
@@ -1039,100 +1057,101 @@
 "ではコネクションメタデータを使いドライバの能力を決定します。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:621 configuration.xml:751 configuration.xml:763
-#: configuration.xml:777 configuration.xml:815
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781
+#: configuration.xml:795 configuration.xml:833
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:629
+#. Tag: property
+#: configuration.xml:647
 #, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr "hibernate.connection.provider_class"
 
 #. Tag: entry
-#: configuration.xml:631
+#: configuration.xml:649
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a custom <literal>ConnectionProvider</literal> which "
-"provides JDBC connections to Hibernate."
+"The classname of a custom <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename> which provides JDBC connections to "
+"Hibernate."
 msgstr ""
 "JDBCコネクションをHibernateに提供する独自の <placeholder-1/> の 名前を指定し"
 "ます。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:634
+#: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:642
+#. Tag: property
+#: configuration.xml:660
 #, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr "hibernate.connection.isolation"
 
 #. Tag: entry
-#: configuration.xml:644
+#: configuration.xml:662
 #, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <literal>java.sql."
-"Connection</literal> for meaningful values but note that most databases do "
-"not support all isolation levels."
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
+"databases do not support all isolation levels and some define additional, "
+"non-standard isolations."
 msgstr ""
 "JDBCトランザクション分離レベルを設定します。 妥当な値を調べるためには "
 "<placeholder-1/> をチェックしてください。 しかし使用するデータベースが、すべ"
 "ての分離レベルをサポートしているとは限りません。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:648
+#: configuration.xml:666
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:656
+#. Tag: property
+#: configuration.xml:674
 #, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr "hibernate.connection.autocommit"
 
 #. Tag: entry
-#: configuration.xml:658
+#: configuration.xml:676
 #, fuzzy, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "プールされているJDBCコネクションの自動コミットを有効にする(非推奨)。 "
 "<placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:668
+#. Tag: property
+#: configuration.xml:686
 #, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr "hibernate.connection.release_mode"
 
 #. Tag: entry
-#: configuration.xml:670
+#: configuration.xml:688
 #, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "HibernateがJDBCコネクションをリリースするかを指定します。デフォルトでは セッ"
 "ションが明示的にクローズまたは切断されてもコネクションは保持します。 アプリ"
@@ -1144,11 +1163,11 @@
 "合、 <placeholder-5/> でクローズします。 <placeholder-6/><placeholder-7/>"
 
 #. Tag: para
-#: configuration.xml:681
+#: configuration.xml:699
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>auto</literal> (default) | "
@@ -1156,11 +1175,11 @@
 "<literal>after_statement</literal>"
 
 #. Tag: para
-#: configuration.xml:686
+#: configuration.xml:704
 #, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -1174,15 +1193,15 @@
 "\"architecture-current-session\"/> を参照してください。"
 
 #. Tag: entry
-#: configuration.xml:697
+#: configuration.xml:715
 #, no-c-format
 msgid ""
-"<literal>hibernate.connection.</literal><emphasis>&lt;propertyName&gt;</"
+"<property>hibernate.connection.</property><emphasis>&lt;propertyName&gt;</"
 "emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:700
+#: configuration.xml:718
 #, no-c-format
 msgid ""
 "Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to "
@@ -1190,14 +1209,14 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:706
+#: configuration.xml:724
 #, no-c-format
 msgid ""
-"<literal>hibernate.jndi.</literal><emphasis>&lt;propertyName&gt;</emphasis>"
+"<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;</emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:709
+#: configuration.xml:727
 #, no-c-format
 msgid ""
 "Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI "
@@ -1205,44 +1224,44 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:719
+#: configuration.xml:737
 #, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Hibernate キャッシュプロパティ"
 
 #. Tag: literal
-#: configuration.xml:732
+#: configuration.xml:750
 #, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr "hibernate.cache.provider_class"
 
 #. Tag: entry
-#: configuration.xml:734
+#: configuration.xml:752
 #, fuzzy, no-c-format
 msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr "カスタム <placeholder-1/> のクラス名です。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:736
+#: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:744
+#: configuration.xml:762
 #, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr "hibernate.cache.use_minimal_puts"
 
 #. Tag: entry
-#: configuration.xml:746
+#: configuration.xml:764
 #, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1252,31 +1271,31 @@
 "では有効になっています。 <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:759
+#: configuration.xml:777
 #, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr "hibernate.cache.use_query_cache"
 
 #. Tag: entry
-#: configuration.xml:761
+#: configuration.xml:779
 #, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 "特定のクエリがキャッシュ可能な場合に、クエリキャッシュを有効にします。 "
 "<placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:771
+#: configuration.xml:789
 #, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr "hibernate.cache.use_second_level_cache"
 
 #. Tag: entry
-#: configuration.xml:773
+#: configuration.xml:791
 #, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1284,13 +1303,13 @@
 "の <placeholder-1/> マッピング で制御します。 <placeholder-2/>"
 
 #. Tag: literal
-#: configuration.xml:785
+#: configuration.xml:803
 #, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr "hibernate.cache.query_cache_factory"
 
 #. Tag: entry
-#: configuration.xml:787
+#: configuration.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a custom <literal>QueryCache</literal> interface, defaults "
@@ -1300,43 +1319,43 @@
 "では <placeholder-2/> になります。 <placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:790
+#: configuration.xml:808
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:798
+#: configuration.xml:816
 #, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr "hibernate.cache.region_prefix"
 
 #. Tag: entry
-#: configuration.xml:800
+#: configuration.xml:818
 #, fuzzy, no-c-format
 msgid "A prefix to use for second-level cache region names."
 msgstr "二次キャッシュの領域名の接頭辞です。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:802
+#: configuration.xml:820
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:810
+#: configuration.xml:828
 #, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr "hibernate.cache.use_structured_entries"
 
 #. Tag: entry
-#: configuration.xml:812
+#: configuration.xml:830
 #, fuzzy, no-c-format
 msgid ""
 "Forces Hibernate to store data in the second-level cache in a more human-"
@@ -1346,19 +1365,19 @@
 "<placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:826
+#: configuration.xml:844
 #, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Hibernate トランザクションプロパティ"
 
 #. Tag: literal
-#: configuration.xml:839
+#: configuration.xml:857
 #, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr "hibernate.transaction.factory_class"
 
 #. Tag: entry
-#: configuration.xml:841
+#: configuration.xml:859
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a <literal>TransactionFactory</literal> to use with "
@@ -1369,23 +1388,23 @@
 "す。 (デフォルトでは <placeholder-3/> です)。 <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:845
+#: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:853
+#: configuration.xml:871
 #, no-c-format
 msgid "jta.UserTransaction"
 msgstr "jta.UserTransaction"
 
 #. Tag: entry
-#: configuration.xml:855
+#: configuration.xml:873
 #, fuzzy, no-c-format
 msgid ""
 "A JNDI name used by <literal>JTATransactionFactory</literal> to obtain the "
@@ -1395,40 +1414,40 @@
 "2/> に使われるJNDI名です。 <placeholder-3/>"
 
 #. Tag: literal
-#: configuration.xml:867
+#: configuration.xml:885
 #, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr "hibernate.transaction.manager_lookup_class"
 
 #. Tag: entry
-#: configuration.xml:869
+#: configuration.xml:887
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "<placeholder-1/> のクラス名です。 JTA環境において、JVMレベルのキャッシュを有"
 "効にするために必要です。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:873
+#: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:881
+#: configuration.xml:899
 #, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr "hibernate.transaction.flush_before_completion"
 
 #. Tag: entry
-#: configuration.xml:883
+#: configuration.xml:901
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically flushed during the before "
@@ -1442,17 +1461,17 @@
 "1/>"
 
 #. Tag: literal
-#: configuration.xml:896
+#: configuration.xml:914
 #, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr "hibernate.transaction.auto_close_session"
 
 #. Tag: entry
-#: configuration.xml:898
+#: configuration.xml:916
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -1462,22 +1481,22 @@
 "1/>"
 
 #. Tag: title
-#: configuration.xml:914
+#: configuration.xml:932
 #, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "その他のプロパティ"
 
 #. Tag: literal
-#: configuration.xml:927
+#: configuration.xml:945
 #, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr "hibernate.current_session_context_class"
 
 #. Tag: entry
-#: configuration.xml:929
+#: configuration.xml:947
 #, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -1486,10 +1505,10 @@
 "current-session\"/>を参照してください。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:934
+#: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -1498,22 +1517,22 @@
 "Class</literal>"
 
 #. Tag: literal
-#: configuration.xml:943
+#: configuration.xml:961
 #, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr "hibernate.query.factory_class"
 
 #. Tag: entry
-#: configuration.xml:945
+#: configuration.xml:963
 #, fuzzy, no-c-format
 msgid "Chooses the HQL parser implementation."
 msgstr "HQLパーサーの実装を選択します。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:947
+#: configuration.xml:965
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -1522,42 +1541,42 @@
 "ClassicQueryTranslatorFactory</literal>"
 
 #. Tag: literal
-#: configuration.xml:956
+#: configuration.xml:974
 #, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr "hibernate.query.substitutions"
 
 #. Tag: entry
-#: configuration.xml:958
+#: configuration.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "HQLとSQLのトークンをマッピングします。 (例えば、トークンは関数やリテラル名で"
 "す)。 <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:961
+#: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "<emphasis role=\"strong\">例:</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:969
+#: configuration.xml:987
 #, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr "hibernate.hbm2ddl.auto"
 
 #. Tag: entry
-#: configuration.xml:971
+#: configuration.xml:989
 #, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -1567,10 +1586,10 @@
 "ススキーマをドロップします。 <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:977
+#: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
@@ -1579,19 +1598,19 @@
 "drop</literal>"
 
 #. Tag: literal
-#: configuration.xml:986
+#: configuration.xml:1004
 #, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr "hibernate.cglib.use_reflection_optimizer"
 
 #. Tag: entry
-#: configuration.xml:988
+#: configuration.xml:1006
 #, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "実行時リフレクションの代わりのCGLIBの使用を有効にします (システムレベルのプ"
 "ロパティ) リフレクションはトラブルシューティングのときに役立つことがありま"
@@ -1600,20 +1619,20 @@
 "ん。 <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:1004
+#: configuration.xml:1022
 #, no-c-format
 msgid "SQL Dialects"
 msgstr "SQL 方言(Dialect)"
 
 #. Tag: para
-#: configuration.xml:1006
-#, no-c-format
+#: configuration.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "<literal>hibernate.dialect</literal> プロパティには、 使用するデータベースの"
 "正しい <literal>org.hibernate.dialect.Dialect</literal> のサブクラスを、 必ず"
@@ -1622,304 +1641,316 @@
 "で設定する手間が省けます。"
 
 #. Tag: title
-#: configuration.xml:1014
+#: configuration.xml:1032
 #, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 
 #. Tag: entry
-#: configuration.xml:1022
+#: configuration.xml:1040
 #, no-c-format
 msgid "RDBMS"
 msgstr "RDBMS"
 
 #. Tag: entry
-#: configuration.xml:1023
+#: configuration.xml:1041
 #, no-c-format
 msgid "Dialect"
 msgstr "Dialect"
 
 #. Tag: entry
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "<entry>DB2</entry>"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr "org.hibernate.dialect.DB2Dialect"
 
 #. Tag: entry
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "DB2 AS/400"
 msgstr "DB2 AS/400"
 
 #. Tag: literal
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr "org.hibernate.dialect.DB2400Dialect"
 
 #. Tag: entry
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "DB2 OS390"
 msgstr "DB2 OS390"
 
 #. Tag: literal
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr "org.hibernate.dialect.DB2390Dialect"
 
 #. Tag: entry
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "PostgreSQL"
 msgstr "PostgreSQL"
 
 #. Tag: literal
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr "org.hibernate.dialect.PostgreSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "MySQL"
 msgstr "MySQL"
 
 #. Tag: literal
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr "org.hibernate.dialect.MySQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "MySQL with InnoDB"
 msgstr "MySQL with InnoDB"
 
 #. Tag: literal
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr "org.hibernate.dialect.MySQLInnoDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "MySQL with MyISAM"
 msgstr "MySQL with MyISAM"
 
 #. Tag: literal
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr "org.hibernate.dialect.MySQLMyISAMDialect"
 
 #. Tag: entry
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "Oracle (any version)"
 msgstr "Oracle (any version)"
 
 #. Tag: literal
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr "org.hibernate.dialect.OracleDialect"
 
 #. Tag: entry
-#: configuration.xml:1052
-#, no-c-format
-msgid "Oracle 9i/10g"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
-#: configuration.xml:1052
-#, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
-#: configuration.xml:1055
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1055
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1100
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "外部結合フェッチ"
 
 #. Tag: para
-#: configuration.xml:1102
-#, no-c-format
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "もしDBがANSIか、OracleかSybaseスタイルの外部結合をサポートしている場合、 "
 "<emphasis>outer join fetching</emphasis> は、DBのSQL発行回数を節約し パフォー"
@@ -1928,13 +1959,13 @@
 "を1つのSQLで <literal>SELECT</literal> します。"
 
 #. Tag: para
-#: configuration.xml:1111
-#, no-c-format
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "<literal>hibernate.max_fetch_depth</literal> プロパティの値を <literal>0</"
@@ -1944,23 +1975,23 @@
 "literal> としてマッピングされます。"
 
 #. Tag: para
-#: configuration.xml:1119
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr "See <xref linkend=\"performance-fetching\"/> for more information."
 
 #. Tag: title
-#: configuration.xml:1126
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr "バイナリストリーム"
 
 #. Tag: para
-#: configuration.xml:1128
-#, no-c-format
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -1972,81 +2003,82 @@
 "はシステムレベルの設定だけです</emphasis> 。"
 
 #. Tag: title
-#: configuration.xml:1139
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "2次キャッシュとクエリーキャッシュ"
 
 #. Tag: para
-#: configuration.xml:1141
-#, no-c-format
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "<literal>hibernate.cache</literal> プロパティ接頭辞は Hibernateでプロセスやク"
 "ラスタ二次キャッシュを使うとことを許可します。 <xref linkend=\"performance-"
 "cache\"/>により多くの詳細があります。"
 
 #. Tag: title
-#: configuration.xml:1151
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "クエリー言語の置き換え"
 
 #. Tag: para
-#: configuration.xml:1153
-#, no-c-format
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "<literal>hibernate.query.substitutions</literal> を使うことで、 新しい"
 "Hibernateクエリトークンを定義できます。 例:"
 
 #. Tag: programlisting
-#: configuration.xml:1158
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions true=1, false=0"
 
 #. Tag: para
-#: configuration.xml:1160
-#, no-c-format
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "これはトークン <literal>true</literal> と <literal>false</literal> を、 生成"
 "されるSQLにおいて整数リテラルに翻訳します。"
 
 #. Tag: programlisting
-#: configuration.xml:1165
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1167
-#, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
 "これはSQLの <literal>LOWER</literal> 関数の名前の付け替えを可能にします。"
 
 #. Tag: title
-#: configuration.xml:1174
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Hibernate 統計"
 
 #. Tag: para
-#: configuration.xml:1176
-#, no-c-format
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -2057,44 +2089,34 @@
 "literal> パッケージ内の インターフェイスにはより多くの情報があります。"
 
 #. Tag: title
-#: configuration.xml:1188
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr "ロギング"
 
 #. Tag: para
-#: configuration.xml:1190
+#: configuration.xml:1211
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr ""
-"HibernateはApache commons-logginを使って、さまざまなイベントをログとして 出力"
-"します。"
-
-#. Tag: para
-#: configuration.xml:1194
-#, no-c-format
 msgid ""
-"The commons-logging service will direct output to either Apache Log4j (if "
-"you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
-"logging (if running under JDK1.4 or above). You may download Log4j from "
-"<literal>http://jakarta.apache.org</literal>. To use Log4j you will need to "
-"place a <literal>log4j.properties</literal> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
+"Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
+"can direct your logging output to several logging frameworks (NOP, Simple, "
+"log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
-"commons-loggingサービスは(クラスパスに <literal>log4j.jar</literal> を含めれ"
-"ば)Apache Log4jに、 また(JDK1.4かそれ以上で実行させれば)JDK1.4 loggingに直"
-"接出力します。 Log4jは <literal>http://jakarta.apache.org</literal> からダウ"
-"ンロードできます。 Log4jを使うためには、クラスパスに <literal>log4j."
-"properties</literal> ファイルを配置する必要があります。 例のプロパティファイ"
-"ルはHibernateと一緒に配布され、それは <literal>src/</literal> ディレクトリに"
-"あります。"
 
 #. Tag: para
-#: configuration.xml:1204
-#, no-c-format
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -2105,67 +2127,67 @@
 "シューティングデバイスです。 以下に重要なログのカテゴリを示します。"
 
 #. Tag: title
-#: configuration.xml:1213
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Hibernate ログカテゴリ"
 
 #. Tag: entry
-#: configuration.xml:1219
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr "カテゴリ"
 
 #. Tag: entry
-#: configuration.xml:1220
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr "機能"
 
 #. Tag: literal
-#: configuration.xml:1225
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1226
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr "実行したすべてのSQL(DDL)ステートメントをロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1229
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1230
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "すべてのJDBCパラメータをロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1233
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr "実行したすべてのSQL(DDL)ステートメントをロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1237
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1256
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2175,82 +2197,83 @@
 "ます。"
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "すべての2次キャッシュの動作をロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "トランザクションに関連する動作をロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "JDBCリソース取得をロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1256
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast.AST"
 
 #. Tag: entry
-#: configuration.xml:1257
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr "HQLとSQLのASTのクエリーパースをロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1262
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "すべてのJAAS分析をロギングします。"
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1267
-#, no-c-format
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr ""
 "すべてをロギングします。(情報が大量になりますが、トラブルシューティングには"
 "便利です)"
 
 #. Tag: para
-#: configuration.xml:1276
+#: configuration.xml:1294
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2264,13 +2287,13 @@
 "方法があります。"
 
 #. Tag: title
-#: configuration.xml:1286
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "<literal>NamingStrategy</literal> の実装"
 
 #. Tag: para
-#: configuration.xml:1288
+#: configuration.xml:1306
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2281,10 +2304,10 @@
 "す。"
 
 #. Tag: para
-#: configuration.xml:1293
-#, no-c-format
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -2299,17 +2322,17 @@
 "はかなり最小限に近いものです。"
 
 #. Tag: para
-#: configuration.xml:1302
-#, no-c-format
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "マッピングを追加する前に <literal>Configuration.setNamingStrategy()</"
 "literal> を呼ぶことで 以下のように異なる戦略を指定することができます:"
 
 #. Tag: programlisting
-#: configuration.xml:1307
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2320,7 +2343,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1309
+#: configuration.xml:1327
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2331,13 +2354,13 @@
 "ん。"
 
 #. Tag: title
-#: configuration.xml:1317
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr "XML設定ファイル"
 
 #. Tag: para
-#: configuration.xml:1319
+#: configuration.xml:1337
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -2351,17 +2374,17 @@
 "が置き換えられます。"
 
 #. Tag: para
-#: configuration.xml:1326
-#, no-c-format
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "XML設定ファイルは初期設定で <literal>CLASSPATH</literal> に配置してくださ"
 "い。 これが例です:"
 
 #. Tag: programlisting
-#: configuration.xml:1331
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -2405,15 +2428,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1333
-#, no-c-format
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "見てのとおり、この方法の優位性は設定のためのマッピングファイル名を外出しにで"
 "きることです。 Hibernateキャッシュをチューニングしなければならないのであれ"
@@ -2423,13 +2446,13 @@
 "うところといえばXML構文を使うことの利点だけです。"
 
 #. Tag: para
-#: configuration.xml:1342
-#, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr "XML設定を使うことで、Hibernateは以下のようにシンプルになります。"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1364
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -2437,13 +2460,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
-#, no-c-format
-msgid "You can pick a different XML configuration file using"
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "違うXML設定ファイルを使うこともできます。"
 
 #. Tag: programlisting
-#: configuration.xml:1352
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2452,28 +2475,28 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1357
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "J2EEアプリケーションサーバとの統合"
 
 #. Tag: para
-#: configuration.xml:1359
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr "HibernateはJ2EE構造と統合するポイントをサポートしています。"
 
 #. Tag: para
-#: configuration.xml:1365
-#, no-c-format
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>コンテナ管理データソース</emphasis>:Hibernateは JNDIが提供し、コン"
@@ -2485,7 +2508,7 @@
 "の <literal>Transaction</literal> APIを使いたくなるかもしれません。"
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1398
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -2495,15 +2518,15 @@
 "に <literal>SessionFactory</literal> を生成します。"
 
 #. Tag: para
-#: configuration.xml:1389
-#, no-c-format
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>JTAセッションバインディング</emphasis> : Hibernate "
@@ -2515,16 +2538,16 @@
 "す。"
 
 #. Tag: para
-#: configuration.xml:1402
-#, no-c-format
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>JMXデプロイ:</emphasis> もしJMXが使用可能なアプリケーションサーバ"
 "(例えばJBOSS) がある場合、HibernateをMBeanとしてデプロイすることを選べま"
@@ -2535,7 +2558,7 @@
 "ばなりません)。"
 
 #. Tag: para
-#: configuration.xml:1413
+#: configuration.xml:1431
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -2547,18 +2570,18 @@
 "aggressive_release</literal> をtrueにしてください。"
 
 #. Tag: title
-#: configuration.xml:1420
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "トランザクション戦略設定"
 
 #. Tag: para
-#: configuration.xml:1422
-#, no-c-format
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -2571,7 +2594,7 @@
 "なるでしょう。"
 
 #. Tag: para
-#: configuration.xml:1430
+#: configuration.xml:1448
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -2588,36 +2611,36 @@
 "literal> クラスのインスタンスを持つことができます。"
 
 #. Tag: para
-#: configuration.xml:1437
-#, no-c-format
-msgid "There are three standard (built-in) choices:"
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "3つの基本的な(既にある)選択を挙げます:"
 
 #. Tag: literal
-#: configuration.xml:1443
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "org.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr "データベース(JDBC)トランザクションに委譲します(デフォルト)"
 
 #. Tag: literal
-#: configuration.xml:1449
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1451
-#, no-c-format
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "もし、このコンテキスト(例えば、EJBセッションBeanメソッド)で進行中のトランザ"
 "クションが存在する、もしくは 新しいトランザクションが開始されており、Bean管理"
@@ -2625,37 +2648,37 @@
 "す。"
 
 #. Tag: literal
-#: configuration.xml:1459
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1461
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "コンテナ管理JTAトランザクションに委譲します"
 
 #. Tag: para
-#: configuration.xml:1466
-#, no-c-format
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr ""
 "自分自身のトランザクション戦略(例えば、CORBAトランザクションサービス)を定義"
 "することもできます。"
 
 #. Tag: para
-#: configuration.xml:1471
-#, no-c-format
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Hibernateのいくつかの機能(例えば、二次キャッシュ、JTAによるコンテキストセッ"
 "ション 等)は 管理された環境の中のJTA <literal>TransactionManager</literal> "
@@ -2665,157 +2688,157 @@
 "る必要があります。"
 
 #. Tag: title
-#: configuration.xml:1479
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "JTA トランザクションマネージャ"
 
 #. Tag: entry
-#: configuration.xml:1485
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "Transaction Factory"
 
 #. Tag: entry
-#: configuration.xml:1486
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr "Application Server"
 
 #. Tag: literal
-#: configuration.xml:1491
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1492
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1495
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1496
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1499
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1503
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1507
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1508
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1511
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1512
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1515
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1516
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1519
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1520
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1523
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1524
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1527
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1528
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1537
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "<literal>SessionFactory</literal> のJNDIへの登録"
 
 #. Tag: para
-#: configuration.xml:1539
-#, no-c-format
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "JNDIに登録したHibernate <literal>SessionFactory</literal> は単純に ファクトリ"
 "をルックアップし、新しい <literal>Session</literal> を作ります。 これはJNDIに"
@@ -2823,15 +2846,15 @@
 "れらの登録を使うことに注意してください。"
 
 #. Tag: para
-#: configuration.xml:1546
-#, no-c-format
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "もし <literal>SessionFactory</literal> をJNDIネームスペースに登録したい場"
 "合、 特別な名前(例えば、 <literal>java:hibernate/SessionFactory</literal> )"
@@ -2841,7 +2864,7 @@
 "用の環境の場合特に便利です。)"
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1572
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -2855,14 +2878,15 @@
 "い場合は、デフォルトの <literal>InitialContext</literal> を使用します。"
 
 #. Tag: para
-#: configuration.xml:1561
-#, no-c-format
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "<literal>cfg.buildSessionFactory()</literal> をコール後 Hibernateは自動的に "
 "<literal>SessionFactory</literal> をJNDIに配置します。 "
@@ -2872,21 +2896,22 @@
 "議論します)"
 
 #. Tag: para
-#: configuration.xml:1568
-#, no-c-format
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "もしJNDI <literal>SessionFactory</literal> を使う場合、EJBや他のクラスは JNDI"
 "ルックアップを使って <literal>SessionFactory</literal> を取得します。"
 
 #. Tag: para
-#: configuration.xml:1573
-#, no-c-format
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -2902,33 +2927,34 @@
 "ます。 &mdash;1章を参照してください。"
 
 #. Tag: title
-#: configuration.xml:1585
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "JTAによる現在のセッションコンテキストマネージメント"
 
 #. Tag: para
-#: configuration.xml:1587
-#, no-c-format
+#: configuration.xml:1605
+#, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <link linkend=\"architecture-current-session\">current "
-"sessions</link>. Using the <literal>\"jta\"</literal> session context, if "
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
 "there is no Hibernate <literal>Session</literal> associated with the current "
 "JTA transaction, one will be started and associated with that JTA "
 "transaction the first time you call <literal>sessionFactory.getCurrentSession"
 "()</literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "もっとも簡単に <literal>Session</literal> とトランザクションを扱う方法は、 "
 "Hibernateが自動的に「現在の」 <literal>Session</literal> を管理することで"
@@ -2950,20 +2976,20 @@
 "トランザクション境界が好ましいです。"
 
 #. Tag: title
-#: configuration.xml:1610
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr "JMXデプロイメント"
 
 #. Tag: para
-#: configuration.xml:1612
-#, no-c-format
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "<literal>SessionFactory</literal> をJNDIから取得するためには <literal>cfg."
 "buildSessionFactory()</literal> 行をどこかで実行していなければなりません。 あ"
@@ -2972,12 +2998,12 @@
 "emphasis> としてHibernateをデプロイするか、どちらかで実行できます。"
 
 #. Tag: para
-#: configuration.xml:1620
-#, no-c-format
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "JBOSSのようなJMXの機能でアプリケーションサーバにデプロイするために "
@@ -2986,7 +3012,7 @@
 "<literal>jboss-service.xml</literal> を示します。"
 
 #. Tag: programlisting
-#: configuration.xml:1627
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3037,15 +3063,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1629
-#, no-c-format
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
@@ -3060,6 +3086,35 @@
 "ドする ことができます。JBossアプリケーションサーバのドキュメントにJXMサービス"
 "と EJBデプロイメントのより多くの情報があります。"
 
+#~ msgid ""
+#~ "<literal>hibernate.properties</literal> is the easiest approach if you "
+#~ "want to get started quickly."
+#~ msgstr ""
+#~ "今すぐ始めたいのなら、<literal>hibernate.properties</literal> を使うのが一"
+#~ "番の近道です。"
+
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr ""
+#~ "HibernateはApache commons-logginを使って、さまざまなイベントをログとして "
+#~ "出力します。"
+
+#~ msgid ""
+#~ "The commons-logging service will direct output to either Apache Log4j (if "
+#~ "you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
+#~ "logging (if running under JDK1.4 or above). You may download Log4j from "
+#~ "<literal>http://jakarta.apache.org</literal>. To use Log4j you will need "
+#~ "to place a <literal>log4j.properties</literal> file in your classpath, an "
+#~ "example properties file is distributed with Hibernate in the <literal>src/"
+#~ "</literal> directory."
+#~ msgstr ""
+#~ "commons-loggingサービスは(クラスパスに <literal>log4j.jar</literal> を含"
+#~ "めれば)Apache Log4jに、 また(JDK1.4かそれ以上で実行させれば)JDK1.4 "
+#~ "loggingに直接出力します。 Log4jは <literal>http://jakarta.apache.org</"
+#~ "literal> からダウンロードできます。 Log4jを使うためには、クラスパスに "
+#~ "<literal>log4j.properties</literal> ファイルを配置する必要があります。 例"
+#~ "のプロパティファイルはHibernateと一緒に配布され、それは <literal>src/</"
+#~ "literal> ディレクトリにあります。"
+
 #~ msgid "<placeholder-1/> (optional)"
 #~ msgstr "<placeholder-1/> (オプション)"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:5
+#: events.xml:29
 #, no-c-format
 msgid "Interceptors and events"
 msgstr "インターセプタとイベント"
 
 #. Tag: para
-#: events.xml:7
-#, no-c-format
+#: events.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "アプリケーションがHibernateの内部で発生するイベントに対応できると役に立つこと"
 "があります。 ある種の一般的な機能を実装できるようになり、 またHibernateの機能"
 "を拡張することもできるようになります。"
 
 #. Tag: title
-#: events.xml:14
+#: events.xml:38
 #, no-c-format
 msgid "Interceptors"
 msgstr "インターセプタ"
 
 #. Tag: para
-#: events.xml:16
-#, no-c-format
+#: events.xml:40
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -58,17 +58,17 @@
 "ティを更新します。"
 
 #. Tag: para
-#: events.xml:27
-#, no-c-format
+#: events.xml:51
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "<literal>Interceptor</literal> を直接実装したり、 (さらによいのは)"
 "<literal>EmptyInterceptor</literal> を拡張したりできます。"
 
 #. Tag: programlisting
-#: events.xml:32
+#: events.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
@@ -157,17 +157,17 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:34
-#, no-c-format
+#: events.xml:58
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "インターセプタには二種類あります: <literal>Session</literal> スコープのもの"
 "と <literal>SessionFactory</literal> スコープのものです。"
 
 #. Tag: para
-#: events.xml:39
+#: events.xml:63
 #, no-c-format
 msgid ""
 "A <literal>Session</literal>-scoped interceptor is specified when a session "
@@ -179,23 +179,23 @@
 "SessionFactory.openSession() のオーバーロードメソッドの一つを使います。"
 
 #. Tag: programlisting
-#: events.xml:45
+#: events.xml:69
 #, no-c-format
 msgid "<![CDATA[Session session = sf.openSession( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: para
-#: events.xml:47
-#, no-c-format
+#: events.xml:71
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "<literal>SessionFactory</literal> スコープのインターセプタは "
 "<literal>Configuration</literal> オブジェクトを使って登録します。 これは "
@@ -208,25 +208,25 @@
 "め、 セッション固有の状態を格納しないように気をつけてください。"
 
 #. Tag: programlisting
-#: events.xml:56
+#: events.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: title
-#: events.xml:61
+#: events.xml:85
 #, no-c-format
 msgid "Event system"
 msgstr "イベントシステム"
 
 #. Tag: para
-#: events.xml:63
-#, no-c-format
+#: events.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "永続化層で特定のイベントに対応しなければならない場合、 Hibernate3の "
 "<emphasis>イベント</emphasis> アーキテクチャを使うこともできます。 イベントシ"
@@ -234,20 +234,20 @@
 "ことができます。"
 
 #. Tag: para
-#: events.xml:69
-#, no-c-format
+#: events.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -266,28 +266,27 @@
 "のような <literal>load()</literal> リクエストをも処理する責任があります。"
 
 #. Tag: para
-#: events.xml:84
-#, no-c-format
+#: events.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "リスナは事実上シングルトンであると見なせます。 つまりリスナはリクエスト間で共"
 "有されるため、 インスタンス変数として状態を保持するべきではないということで"
 "す。"
 
 #. Tag: para
-#: events.xml:89
-#, no-c-format
+#: events.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "カスタムリスナは処理したいイベントについて適切なインターフェイスを実装するべ"
@@ -300,7 +299,7 @@
 "します。"
 
 #. Tag: programlisting
-#: events.xml:99
+#: events.xml:123
 #, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
@@ -317,7 +316,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:101
+#: events.xml:125
 #, no-c-format
 msgid ""
 "You also need a configuration entry telling Hibernate to use the listener in "
@@ -325,7 +324,7 @@
 msgstr "デフォルトリスナ以外のリスナを使うには、Hibernateへの設定も必要です:"
 
 #. Tag: programlisting
-#: events.xml:106
+#: events.xml:130
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
@@ -341,13 +340,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:108
-#, no-c-format
-msgid "Instead, you may register it programmatically:"
+#: events.xml:132
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "またその他に、プログラムで登録する方法もあります:"
 
 #. Tag: programlisting
-#: events.xml:112
+#: events.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
@@ -357,14 +356,14 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:114
-#, no-c-format
+#: events.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "リスナを宣言的に登録すると、そのリスナのインスタンスを共有できません。 複数"
 "の <literal>&lt;listener/&gt;</literal> 要素で同じクラス名が使われると、 それ"
@@ -373,12 +372,12 @@
 "ければなりません。"
 
 #. Tag: para
-#: events.xml:122
-#, no-c-format
+#: events.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -388,19 +387,19 @@
 "切り替えられます。"
 
 #. Tag: title
-#: events.xml:132
+#: events.xml:156
 #, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Hibernateの宣言的なセキュリティ"
 
 #. Tag: para
-#: events.xml:133
-#, no-c-format
+#: events.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "一般的にHibernateアプリケーションの宣言的なセキュリティは、セッションファサー"
 "ド層で管理します。 現在、Hiberenate3はJACCで許可しかつ、JAASで認証したアク"
@@ -408,7 +407,7 @@
 "オプションの機能です。"
 
 #. Tag: para
-#: events.xml:139
+#: events.xml:163
 #, no-c-format
 msgid ""
 "First, you must configure the appropriate event listeners, to enable the use "
@@ -418,7 +417,7 @@
 "りません。"
 
 #. Tag: programlisting
-#: events.xml:144
+#: events.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
@@ -432,13 +431,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:146
-#, no-c-format
+#: events.xml:170
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "特定のイベント型に対してちょうど一つのリスナがあるとき、 <literal>&lt;"
 "listener type=\"...\" class=\"...\"/&gt;</literal> は <literal>&lt;event "
@@ -446,17 +445,17 @@
 "略形に過ぎないことに注意してください。"
 
 #. Tag: para
-#: events.xml:152
-#, no-c-format
+#: events.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "次に、同じく <literal>hibernate.cfg.xml</literal> でロールにパーミッションを"
 "与えてください:"
 
 #. Tag: programlisting
-#: events.xml:156
+#: events.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[<grant role=\"admin\" entity-name=\"User\" actions=\"insert,update,"
@@ -465,7 +464,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:158
+#: events.xml:182
 #, no-c-format
 msgid "The role names are the roles understood by your JACC provider."
 msgstr "このロール名は使用するJACCプロバイダに理解されるロールです。"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,32 +11,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_mappings.xml:20
+#: example_mappings.xml:29
 #, no-c-format
 msgid "Example: Various Mappings"
 msgstr "例:いろいろなマッピング"
 
 #. Tag: para
-#: example_mappings.xml:22
-#, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr "この章では、より複雑な関連のマッピングをいくつか紹介します。"
 
 #. Tag: title
-#: example_mappings.xml:27
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "雇用者/従業員"
 
 #. Tag: para
-#: example_mappings.xml:29
-#, no-c-format
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "<literal>Employer</literal> と <literal>Employee</literal> の関係を表す以下の"
 "モデルは、 関連の表現に実際のエンティティクラス( <literal>Employment</"
@@ -45,13 +45,13 @@
 "ポーネントを使っています。"
 
 #. Tag: para
-#: example_mappings.xml:46
-#, no-c-format
-msgid "Heres a possible mapping document:"
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "マッピングドキュメントの一例です:"
 
 #. Tag: programlisting
-#: example_mappings.xml:50
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -107,14 +107,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:52
-#, no-c-format
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr "<literal>SchemaExport</literal> で生成したテーブルスキーマです。"
 
 #. Tag: programlisting
-#: example_mappings.xml:56
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -155,22 +154,22 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:61
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr "作者/作品"
 
 #. Tag: para
-#: example_mappings.xml:63
-#, no-c-format
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "<literal>Work</literal> , <literal>Author</literal> そして <literal>Person</"
 "literal> の関係を表す以下のモデルを考えてみてください。 <literal>Work</"
@@ -180,14 +179,14 @@
 "literal> を拡張するという方法もあります。"
 
 #. Tag: para
-#: example_mappings.xml:81
+#: example_mappings.xml:91
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr "以下のマッピングドキュメントはこのような関係を正確に表現しています。"
 
 #. Tag: programlisting
-#: example_mappings.xml:85
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -244,14 +243,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:87
-#, no-c-format
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "このマッピングには4つのテーブルがあります。 <literal>works</literal> , "
 "<literal>authors</literal> , <literal>persons</literal> はそれぞれ、仕事、作"
@@ -260,7 +259,7 @@
 "テーブルスキーマです。"
 
 #. Tag: programlisting
-#: example_mappings.xml:95
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -301,24 +300,24 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:100
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "顧客/注文/製品"
 
 #. Tag: para
-#: example_mappings.xml:102
-#, no-c-format
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "さて、 <literal>Customer</literal> , <literal>Order</literal> , "
 "<literal>LineItem</literal><literal>Product</literal> の関係を表すモデルを考"
@@ -330,13 +329,13 @@
 "ました。 Hibernateではこれをコンポジット要素と呼びます。"
 
 #. Tag: para
-#: example_mappings.xml:122
-#, no-c-format
-msgid "The mapping document:"
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "マッピングドキュメント:"
 
 #. Tag: programlisting
-#: example_mappings.xml:126
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -379,7 +378,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:128
+#: example_mappings.xml:138
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -393,7 +392,7 @@
 "は注文と製品をリンクする関連テーブルとしても働きます。"
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -433,37 +432,31 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:140
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "種々雑多なマッピング例"
 
 #. Tag: para
-#: example_mappings.xml:142
-#, no-c-format
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "ここにある例はすべてHibernateのテストスイートから取りました。 そこには、他に"
 "もたくさんのマッピングの例があります。 Hibernateディストリビューションの "
 "<literal>test</literal> フォルダを見てください。"
 
-#. Tag: para
-#: example_mappings.xml:148
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr "TODO: ここに文章を埋める"
-
 #. Tag: title
-#: example_mappings.xml:151
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "「型付けされた」一対一関連"
 
 #. Tag: programlisting
-#: example_mappings.xml:152
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -495,13 +488,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:156
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr "複合キーの例"
 
 #. Tag: programlisting
-#: example_mappings.xml:157
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -620,13 +613,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:161
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr "複合キー属性を共有する多対多"
 
 #. Tag: programlisting
-#: example_mappings.xml:162
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -667,13 +660,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:166
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "discriminationに基づく内容"
 
 #. Tag: programlisting
-#: example_mappings.xml:167
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -729,13 +722,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:171
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "代替キーの関連"
 
 #. Tag: programlisting
-#: example_mappings.xml:172
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -788,3 +781,6 @@
 "    \n"
 "</class>]]>"
 msgstr ""
+
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "TODO: ここに文章を埋める"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_parentchild.xml:5
+#: example_parentchild.xml:29
 #, no-c-format
 msgid "Example: Parent/Child"
 msgstr "例:親/子供"
 
 #. Tag: para
-#: example_parentchild.xml:7
-#, no-c-format
+#: example_parentchild.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "新規ユーザがHibernateを使ってまず最初に扱うモデルの一つに、親子型のモデル化が"
 "あります。 このモデル化には二つのアプローチが存在します。とりわけ新規ユーザに"
@@ -49,39 +48,39 @@
 "明します。これはまったく難しいものではありません。"
 
 #. Tag: title
-#: example_parentchild.xml:21
+#: example_parentchild.xml:45
 #, no-c-format
 msgid "A note about collections"
 msgstr "コレクションに関する注意"
 
 #. Tag: para
-#: example_parentchild.xml:23
-#, no-c-format
+#: example_parentchild.xml:47
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Hibernateのコレクションは自身のエンティティの論理的な部分と考えられ、 決して"
 "包含するエンティティのものではありません。これは致命的な違いです! これは以下"
 "のような結果になります:"
 
 #. Tag: para
-#: example_parentchild.xml:30
-#, no-c-format
+#: example_parentchild.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr ""
 "オブジェクトをコレクションから削除、またはコレクションに追加するとき、 コレク"
 "ションのオーナーのバージョン番号はインクリメントされます。"
 
 #. Tag: para
-#: example_parentchild.xml:36
-#, no-c-format
+#: example_parentchild.xml:60
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -92,15 +91,14 @@
 "クションに追加すると、その状態はすぐに永続的になります。"
 
 #. Tag: para
-#: example_parentchild.xml:44
-#, no-c-format
+#: example_parentchild.xml:68
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "一方、もしエンティティがコレクション(一対多または多対多関連)から削除されて"
 "も、 デフォルトではそれは削除されません。この動作は完全に一貫しています。 す"
@@ -109,14 +107,14 @@
 "も、デフォルトではそのエンティティは永続的にはなりません。"
 
 #. Tag: para
-#: example_parentchild.xml:54
-#, no-c-format
+#: example_parentchild.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "その代わりに、デフォルトの動作では、エンティティをコレクションに追加すると単"
 "に二つのエンティティ間のリンクを作成し、 一方エンティティを削除するとリンクも"
@@ -125,13 +123,13 @@
 "す。"
 
 #. Tag: title
-#: example_parentchild.xml:64
+#: example_parentchild.xml:88
 #, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr "双方向一対多"
 
 #. Tag: para
-#: example_parentchild.xml:66
+#: example_parentchild.xml:90
 #, no-c-format
 msgid ""
 "Suppose we start with a simple <literal>&lt;one-to-many&gt;</literal> "
@@ -141,7 +139,7 @@
 "<literal>&lt;one-to-many&gt;</literal> 関連から始めるとします。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:71
+#: example_parentchild.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -151,13 +149,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:73
-#, no-c-format
-msgid "If we were to execute the following code"
+#: example_parentchild.xml:97
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "以下のコードを実行すると、"
 
 #. Tag: programlisting
-#: example_parentchild.xml:77
+#: example_parentchild.xml:101
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = .....;\n"
@@ -168,13 +166,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:79
+#: example_parentchild.xml:103
 #, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr "Hibernateは二つのSQL文を発行します:"
 
 #. Tag: para
-#: example_parentchild.xml:85
+#: example_parentchild.xml:109
 #, no-c-format
 msgid ""
 "an <literal>INSERT</literal> to create the record for <literal>c</literal>"
@@ -182,7 +180,7 @@
 "<literal>c</literal>に対するレコードを生成する<literal>INSERT</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:88
+#: example_parentchild.xml:112
 #, no-c-format
 msgid ""
 "an <literal>UPDATE</literal> to create the link from <literal>p</literal> to "
@@ -192,11 +190,11 @@
 "<literal>UPDATE</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:95
-#, no-c-format
+#: example_parentchild.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -206,7 +204,7 @@
 "ことができます:"
 
 #. Tag: programlisting
-#: example_parentchild.xml:101
+#: example_parentchild.xml:125
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -216,19 +214,19 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:103
+#: example_parentchild.xml:127
 #, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr "しかしこの解決策は推奨できません。"
 
 #. Tag: para
-#: example_parentchild.xml:106
-#, no-c-format
+#: example_parentchild.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "この動作の根本的な原因は、<literal>p</literal> から <literal>c</literal> への"
@@ -238,7 +236,7 @@
 "グの一部にすることです。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:113
+#: example_parentchild.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"parent\" column=\"parent_id\" not-null=\"true\"/"
@@ -246,29 +244,29 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:115
-#, no-c-format
+#: example_parentchild.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(また <literal>Child</literal> クラスに <literal>parent</literal> プロパティ"
 "を追加する必要があります。)"
 
 #. Tag: para
-#: example_parentchild.xml:119
-#, no-c-format
+#: example_parentchild.xml:143
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "それでは <literal>Child</literal> エンティティがリンクの状態を制御するように"
 "なったので、 コレクションがリンクを更新しないようにしましょう。それには "
 "<literal>inverse</literal> 属性を使います。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:124
+#: example_parentchild.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
@@ -278,15 +276,15 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:126
-#, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#: example_parentchild.xml:150
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr ""
 "以下のコードを使えば、新しい <literal>Child</literal> を追加することができま"
 "す。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:130
+#: example_parentchild.xml:154
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -298,25 +296,25 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:132
-#, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#: example_parentchild.xml:156
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr ""
 "これにより、SQLの <literal>INSERT</literal> 文が一つだけが発行されるようにな"
 "りました!"
 
 #. Tag: para
-#: example_parentchild.xml:136
-#, no-c-format
+#: example_parentchild.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "もう少し強化するには、<literal>Parent</literal> の <literal>addChild()</"
 "literal> メソッドを作成します。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:141
+#: example_parentchild.xml:165
 #, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
@@ -326,13 +324,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:143
-#, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#: example_parentchild.xml:167
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr "<literal>Child</literal> を追加するコードはこのようになります。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:147
+#: example_parentchild.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -343,23 +341,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_parentchild.xml:152
+#: example_parentchild.xml:176
 #, no-c-format
 msgid "Cascading life cycle"
 msgstr "ライフサイクルのカスケード"
 
 #. Tag: para
-#: example_parentchild.xml:154
-#, no-c-format
+#: example_parentchild.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "明示的に <literal>save()</literal> をコールするのはまだ煩わしいものです。これ"
 "をカスケードを使って対処します。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:159
+#: example_parentchild.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
@@ -369,13 +367,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:161
-#, no-c-format
-msgid "This simplifies the code above to"
+#: example_parentchild.xml:185
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "これにより先ほどのコードをこのように単純化します"
 
 #. Tag: programlisting
-#: example_parentchild.xml:165
+#: example_parentchild.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -385,10 +383,10 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:167
-#, no-c-format
+#: example_parentchild.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -397,7 +395,7 @@
 "そしてデータベースからその子供をすべて削除します。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:172
+#: example_parentchild.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -406,13 +404,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:174
-#, no-c-format
-msgid "However, this code"
+#: example_parentchild.xml:198
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "しかしこのコードは"
 
 #. Tag: programlisting
-#: example_parentchild.xml:178
+#: example_parentchild.xml:202
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -423,12 +421,12 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:180
-#, no-c-format
+#: example_parentchild.xml:204
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "データベースから <literal>c</literal> を削除しません。<literal>p</literal> へ"
@@ -437,7 +435,7 @@
 "literal> を明示する必要があります。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:186
+#: example_parentchild.xml:210
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -448,13 +446,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:188
-#, no-c-format
+#: example_parentchild.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "今このケースでは実際に <literal>Child</literal> が親なしでは存在できないよう"
 "になりました。 そのため、もしコレクションから <literal>Child</literal> を取り"
@@ -462,7 +460,7 @@
 "orphan\"</literal> を使わなければなりません。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:194
+#: example_parentchild.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all-delete-orphan"
@@ -473,14 +471,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:196
-#, no-c-format
+#: example_parentchild.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "注意:コレクションのマッピングで <literal>inverse=\"true\"</literal> と指定し"
 "ても、 コレクションの要素のイテレーションによって、依然カスケードが実行されま"
@@ -489,27 +487,28 @@
 "</literal> を呼ぶだけでは不十分です。"
 
 #. Tag: title
-#: example_parentchild.xml:206
+#: example_parentchild.xml:230
 #, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr "カスケードと <literal>unsaved-value</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:208
-#, no-c-format
+#: example_parentchild.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "<literal>Parent</literal> が、ある <literal>Session</literal> でロードされ、"
 "UIのアクションで変更が加えられ、 <literal>update()</literal> を呼んでこの変更"
@@ -524,17 +523,17 @@
 "に <literal>unsaved-value</literal> を指定する必要はなくなりました。"
 
 #. Tag: para
-#: example_parentchild.xml:220
-#, no-c-format
+#: example_parentchild.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "以下のコードは <literal>parent</literal> と <literal>child</literal> を更新"
 "し、<literal>newChild</literal> を挿入します。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:225
+#: example_parentchild.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[//parent and child were both loaded in a previous session\n"
@@ -546,17 +545,16 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:227
-#, no-c-format
+#: example_parentchild.xml:251
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "これらは生成された識別子の場合には非常に良いのですが、割り当てられた識別子と"
 "複合識別子の場合はどうでしょうか? これはHibernateが、(ユーザにより割り当て"
@@ -567,32 +565,32 @@
 "ます。"
 
 #. Tag: title
-#: example_parentchild.xml:260
+#: example_parentchild.xml:284
 #, no-c-format
 msgid "Conclusion"
 msgstr "結論"
 
 #. Tag: para
-#: example_parentchild.xml:262
-#, no-c-format
+#: example_parentchild.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "ここではかなりの量を要約したので、最初の頃は混乱しているように思われるかもし"
 "れません。 しかし実際は、すべて非常に良く動作します。ほとんどのHibernateアプ"
 "リケーションでは、多くの場面で親子パターンを使用します。"
 
 #. Tag: para
-#: example_parentchild.xml:267
-#, no-c-format
+#: example_parentchild.xml:291
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "最初の段落で代替方法について触れました。上記のような問題は <literal>&lt;"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,31 +11,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_weblog.xml:5
+#: example_weblog.xml:29
 #, no-c-format
 msgid "Example: Weblog Application"
 msgstr "例: Weblogアプリケーション"
 
 #. Tag: title
-#: example_weblog.xml:8
+#: example_weblog.xml:32
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "永続クラス"
 
 #. Tag: para
-#: example_weblog.xml:10
-#, no-c-format
+#: example_weblog.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "永続クラスがウェブログと、ウェブログに掲示された項目を表しています。 それらは"
 "通常の親子関係としてモデリングされますが、 setではなく順序を持ったbagを使用す"
 "ることにします。"
 
 #. Tag: programlisting
-#: example_weblog.xml:16
+#: example_weblog.xml:40
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -69,7 +69,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:18
+#: example_weblog.xml:42
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -118,19 +118,19 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:23
+#: example_weblog.xml:47
 #, no-c-format
 msgid "Hibernate Mappings"
 msgstr "Hibernateのマッピング"
 
 #. Tag: para
-#: example_weblog.xml:25
-#, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+#: example_weblog.xml:49
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "XMLマッピングは、今ではとても簡単なはずです。"
 
 #. Tag: programlisting
-#: example_weblog.xml:29
+#: example_weblog.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:31
+#: example_weblog.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -224,23 +224,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:36
+#: example_weblog.xml:60
 #, no-c-format
 msgid "Hibernate Code"
 msgstr "Hibernateのコード"
 
 #. Tag: para
-#: example_weblog.xml:38
-#, no-c-format
+#: example_weblog.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr ""
 "以下のクラスは、 Hibernateでこれらのクラスを使ってできることをいくつか示して"
 "います。"
 
 #. Tag: programlisting
-#: example_weblog.xml:43
+#: example_weblog.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,18 +11,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: filters.xml:5
+#: filters.xml:29
 #, no-c-format
 msgid "Filtering data"
 msgstr "データのフィルタリング"
 
 #. Tag: para
-#: filters.xml:7
-#, no-c-format
+#: filters.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "Hibernate3では「可視性」ルールに基づいてデータを扱うための画期的な方法を用意"
@@ -31,23 +31,23 @@
 "を切り替えられます。"
 
 #. Tag: title
-#: filters.xml:14
+#: filters.xml:38
 #, no-c-format
 msgid "Hibernate filters"
 msgstr "Hibernateのフィルタ"
 
 #. Tag: para
-#: filters.xml:16
-#, no-c-format
+#: filters.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "Hibernate3はフィルタクライテリアをあらかじめ定義し、 これらのフィルタをクラス"
 "やコレクションレベルに加える機能を加えました。 フィルタクライテリアは制約節を"
@@ -59,7 +59,7 @@
 "す。"
 
 #. Tag: para
-#: filters.xml:26
+#: filters.xml:50
 #, no-c-format
 msgid ""
 "In order to use filters, they must first be defined and then attached to the "
@@ -72,7 +72,7 @@
 "literal> 要素内で <literal>&lt;filter-def/&gt;</literal> 要素を使用します。:"
 
 #. Tag: programlisting
-#: filters.xml:32
+#: filters.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\">\n"
@@ -81,13 +81,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:34
-#, no-c-format
-msgid "Then, this filter can be attached to a class:"
+#: filters.xml:58
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "そうしてフィルタはクラスへと結び付けられます。:"
 
 #. Tag: programlisting
-#: filters.xml:38
+#: filters.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"myClass\" ...>\n"
@@ -98,13 +98,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:40
-#, no-c-format
-msgid "or, to a collection:"
+#: filters.xml:64
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "また、コレクションに対しては次のようになります。:"
 
 #. Tag: programlisting
-#: filters.xml:44
+#: filters.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
@@ -114,35 +114,35 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:46
-#, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+#: filters.xml:70
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr "どちらに対しても(また、それぞれを複数)同時に設定することもできます。"
 
 #. Tag: para
-#: filters.xml:50
-#, no-c-format
+#: filters.xml:74
+#, fuzzy, no-c-format
 msgid ""
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enabledFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "<literal>Session</literal> 上のメソッドは <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, <literal>disableFilter(String filterName)</literal> です。 デフォル"
 "トでは、フィルタは与えられたセッションに対して使用 <emphasis>できません</"
 "emphasis> 。 <literal>Filter</literal> インスタンスを返り値とする "
-"<literal>Session.enableFilter()</literal> メソッドを使うことで、 フィルタは"
-"明示的に使用可能となります。 上で定義した単純なフィルタの使用は、このようにな"
-"ります。:"
+"<literal>Session.enableFilter()</literal> メソッドを使うことで、 フィルタは明"
+"示的に使用可能となります。 上で定義した単純なフィルタの使用は、このようになり"
+"ます。:"
 
 #. Tag: programlisting
-#: filters.xml:59
+#: filters.xml:83
 #, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
@@ -150,24 +150,25 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:61
-#, no-c-format
+#: filters.xml:85
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "org.hibernate.Filterインターフェイスのメソッドは、 Hibernateの多くに共通して"
 "いるメソッド連鎖を許していることに注意してください。"
 
 #. Tag: para
-#: filters.xml:65
-#, no-c-format
+#: filters.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr "有効なレコードデータパターンを持つ一時データを使った完全な例です:"
 
 #. Tag: programlisting
-#: filters.xml:69
+#: filters.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"effectiveDate\">\n"
@@ -205,18 +206,17 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:71
-#, no-c-format
+#: filters.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "常に現在の有効レコードを返却することを保証するために、 単純に、社員データの検"
 "索より前にセッション上のフィルタを有効にします。"
 
 #. Tag: programlisting
-#: filters.xml:76
+#: filters.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
@@ -230,44 +230,44 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:78
-#, no-c-format
+#: filters.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "上記のHQLでは、結果の給料の制約について明示的に触れただけですが、 有効になっ"
 "ているフィルタのおかげで、このクエリは給料が100万ドル以上の現役の社員だけを返"
 "します。"
 
 #. Tag: para
-#: filters.xml:84
-#, no-c-format
+#: filters.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "(HQLかロードフェッチで)外部結合を持つフィルタを使うつもりなら、 条件式の方向"
 "に注意してください。 これは左外部結合のために設定するのが最も安全です。 一般"
 "的に、演算子の後カラム名に続けて最初のパラメータを配置してください。"
 
 #. Tag: para
-#: filters.xml:91
-#, no-c-format
+#: filters.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr "translator-credits"
 
 #. Tag: programlisting
-#: filters.xml:98
+#: filters.xml:122
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
@@ -276,11 +276,11 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:100
+#: filters.xml:124
 #, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,31 +11,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: inheritance_mapping.xml:5
-#, no-c-format
-msgid "Inheritance Mapping"
+#: inheritance_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "継承マッピング"
 
 #. Tag: title
-#: inheritance_mapping.xml:8
-#, no-c-format
-msgid "The Three Strategies"
+#: inheritance_mapping.xml:32
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "3つの戦略"
 
 #. Tag: para
-#: inheritance_mapping.xml:10
+#: inheritance_mapping.xml:34
 #, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr "Hibernateは3つの基本的な継承のマッピング戦略をサポートします。"
 
 #. Tag: para
-#: inheritance_mapping.xml:16
+#: inheritance_mapping.xml:40
 #, no-c-format
 msgid "table per class hierarchy"
 msgstr "クラス階層ごとのテーブル(table-per-class-hierarchy)"
 
 #. Tag: para
-#: inheritance_mapping.xml:21
+#: inheritance_mapping.xml:45
 #, fuzzy, no-c-format
 msgid "<para>table per subclass</para>"
 msgstr ""
@@ -45,13 +45,13 @@
 "table per subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:26
+#: inheritance_mapping.xml:50
 #, no-c-format
 msgid "table per concrete class"
 msgstr "具象クラスごとのテーブル(table-per-concrete-class)"
 
 #. Tag: para
-#: inheritance_mapping.xml:32
+#: inheritance_mapping.xml:56
 #, no-c-format
 msgid ""
 "In addition, Hibernate supports a fourth, slightly different kind of "
@@ -61,25 +61,25 @@
 "トします。"
 
 #. Tag: para
-#: inheritance_mapping.xml:39
+#: inheritance_mapping.xml:63
 #, no-c-format
 msgid "implicit polymorphism"
 msgstr "暗黙的ポリモーフィズム"
 
 #. Tag: para
-#: inheritance_mapping.xml:45
-#, no-c-format
+#: inheritance_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "同一の継承階層の異なるブランチに対して異なるマッピング戦略を使うことができま"
 "す。 その場合には全体の階層に渡るポリモーフィズムを実現するために暗黙的ポリ"
@@ -93,19 +93,19 @@
 "例を見てください。"
 
 #. Tag: para
-#: inheritance_mapping.xml:59
-#, no-c-format
+#: inheritance_mapping.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "<literal>subclass</literal>, <literal>union-subclass</literal> と "
 "<literal>joined-subclass</literal> マッピングを複数のマッピングドキュメントに"
@@ -119,7 +119,7 @@
 "スを定義する前にスーパークラスを定義する必要があります。)"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:70
+#: inheritance_mapping.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -132,19 +132,19 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:74
+#: inheritance_mapping.xml:98
 #, no-c-format
 msgid "Table per class hierarchy"
 msgstr "クラス階層ごとのテーブル(table-per-class-hierarchy)"
 
 #. Tag: para
-#: inheritance_mapping.xml:76
-#, no-c-format
+#: inheritance_mapping.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "例えば、インターフェイス <literal>Payment</literal> と、それを実装した "
 "<literal>CreditCardPayment</literal>、<literal>CashPayment</literal>、 "
@@ -152,7 +152,7 @@
 "は 以下のようになります。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:83
+#: inheritance_mapping.xml:107
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -176,31 +176,31 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:85
-#, no-c-format
+#: inheritance_mapping.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "ちょうど一つのテーブルが必要です。 このマッピング戦略には一つ大きな制限があり"
 "ます。 <literal>CCTYPE</literal> のような、サブクラスで宣言されたカラムは "
 "<literal>NOT NULL</literal> 制約を持てません。"
 
 #. Tag: title
-#: inheritance_mapping.xml:94
+#: inheritance_mapping.xml:118
 #, no-c-format
 msgid "Table per subclass"
 msgstr "サブクラスごとのテーブル(table-per-subclass)"
 
 #. Tag: para
-#: inheritance_mapping.xml:96
-#, no-c-format
-msgid "A table per subclass mapping would look like:"
+#: inheritance_mapping.xml:120
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "table-per-subclass マッピングは以下のようになります。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:100
+#: inheritance_mapping.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -226,35 +226,35 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:102
-#, no-c-format
+#: inheritance_mapping.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "このマッピングには4つのテーブルが必要です。3つのサブクラステーブルは スーパー"
 "クラステーブルとの関連を示す主キーを持っています (実際、関係モデル上は一対一"
 "関連です)。"
 
 #. Tag: title
-#: inheritance_mapping.xml:111
-#, no-c-format
-msgid "Table per subclass, using a discriminator"
+#: inheritance_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "弁別子を用いた table-per-subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:113
-#, no-c-format
+#: inheritance_mapping.xml:137
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "Hibernateの table-per-subclass 実装は、discriminatorカラムを必要としないこと"
 "を覚えておいてください。 Hibernate以外のO/Rマッパーは、table-per-subclass に"
@@ -265,7 +265,7 @@
 "literal> を以下のように組み合わせて使ってください。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:125
+#: inheritance_mapping.xml:149
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -298,7 +298,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:127
+#: inheritance_mapping.xml:151
 #, no-c-format
 msgid ""
 "The optional <literal>fetch=\"select\"</literal> declaration tells Hibernate "
@@ -310,23 +310,23 @@
 "データを取得しないように指定するためのものです。"
 
 #. Tag: title
-#: inheritance_mapping.xml:136
+#: inheritance_mapping.xml:160
 #, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr "table-per-subclass と table-per-class-hierarchy の混合"
 
 #. Tag: para
-#: inheritance_mapping.xml:138
-#, no-c-format
+#: inheritance_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "このアプローチを使用すると、table-per-hierarchy と table-per-subclass 戦略を "
 "組み合わせる事も可能です。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:143
+#: inheritance_mapping.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -352,7 +352,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:145
+#: inheritance_mapping.xml:169
 #, no-c-format
 msgid ""
 "For any of these mapping strategies, a polymorphic association to the root "
@@ -364,7 +364,7 @@
 "使ってマッピングします。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:151
+#: inheritance_mapping.xml:175
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"payment\" column=\"PAYMENT_ID\" class=\"Payment"
@@ -372,23 +372,23 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:156
+#: inheritance_mapping.xml:180
 #, no-c-format
 msgid "Table per concrete class"
 msgstr "具象クラスごとのテーブル(table-per-concrete-class)"
 
 #. Tag: para
-#: inheritance_mapping.xml:158
-#, no-c-format
+#: inheritance_mapping.xml:182
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "table-per-concrete-class 戦略のマッピングに対するアプローチは、2つあります。 "
 "1つ目は <literal>&lt;union-subclass&gt;</literal> を利用する方法です。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:163
+#: inheritance_mapping.xml:187
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\">\n"
@@ -411,7 +411,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:165
+#: inheritance_mapping.xml:189
 #, no-c-format
 msgid ""
 "Three tables are involved for the subclasses. Each table defines columns for "
@@ -421,14 +421,14 @@
 "を含んだ、 クラスの全てのプロパティに対するカラムを定義します。"
 
 #. Tag: para
-#: inheritance_mapping.xml:170
-#, no-c-format
+#: inheritance_mapping.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "このアプローチには制限があります。 それは、プロパティがスーパークラスにマッピ"
 "ングされていた場合、 全てのサブクラスにおいてカラム名が同じでなければならない"
@@ -438,13 +438,13 @@
 "階層内で共有する必要があるからです。"
 
 #. Tag: para
-#: inheritance_mapping.xml:179
-#, no-c-format
+#: inheritance_mapping.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "もしスーパークラスが抽象クラスなら、<literal>abstract=\"true\"</literal>と"
 "マッピングします。 もちろん、スーパークラスが抽象クラスでないなら、スーパーク"
@@ -452,19 +452,19 @@
 "デフォルトは <literal>PAYMENT</literal> )。"
 
 #. Tag: title
-#: inheritance_mapping.xml:189
-#, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+#: inheritance_mapping.xml:213
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "暗黙的ポリモーフィズムを用いた table-per-concrete-class"
 
 #. Tag: para
-#: inheritance_mapping.xml:191
+#: inheritance_mapping.xml:215
 #, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr "もう一つのアプローチは暗黙的ポリモーフィズムの使用です。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:195
+#: inheritance_mapping.xml:219
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -493,15 +493,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:197
-#, no-c-format
+#: inheritance_mapping.xml:221
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "<literal>Payment</literal> インターフェイスがどこにも明示的に示されていないこ"
 "とに注意してください。 そして、<literal>Payment</literal> プロパティがそれぞ"
@@ -512,7 +512,7 @@
 "<literal>&amp;allproperties;</literal>)"
 
 #. Tag: para
-#: inheritance_mapping.xml:207
+#: inheritance_mapping.xml:231
 #, no-c-format
 msgid ""
 "The disadvantage of this approach is that Hibernate does not generate SQL "
@@ -522,7 +522,7 @@
 "<literal>UNION</literal> を生成しない点です。"
 
 #. Tag: para
-#: inheritance_mapping.xml:212
+#: inheritance_mapping.xml:236
 #, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
@@ -532,7 +532,7 @@
 "な関連は 通常、<literal>&lt;any&gt;</literal> を使ってマッピングされます。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:217
+#: inheritance_mapping.xml:241
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"payment\" meta-type=\"string\" id-type=\"long\">\n"
@@ -545,21 +545,20 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:222
+#: inheritance_mapping.xml:246
 #, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr "他の継承マッピングと暗黙的ポリモーフィズムの組み合わせ"
 
 #. Tag: para
-#: inheritance_mapping.xml:224
-#, no-c-format
+#: inheritance_mapping.xml:248
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "このマッピングについての更なる注意点があります。 サブクラスが自身を "
 "<literal>&lt;class&gt;</literal> 要素としてマッピングしているので、 (かつ "
@@ -569,7 +568,7 @@
 "を使用することができます)"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:232
+#: inheritance_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -602,15 +601,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:234
-#, no-c-format
+#: inheritance_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "もう一度述べますが、<literal>Payment</literal> は明示的に定義されません。 も"
@@ -623,26 +622,25 @@
 "しません。"
 
 #. Tag: title
-#: inheritance_mapping.xml:249
+#: inheritance_mapping.xml:273
 #, no-c-format
 msgid "Limitations"
 msgstr "制限"
 
 #. Tag: para
-#: inheritance_mapping.xml:251
-#, no-c-format
+#: inheritance_mapping.xml:275
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "table-per-concrete-class マッピング戦略への「暗黙的ポリモーフィズム」アプロー"
 "チには いくつかの制限があります。<literal>&lt;union-subclass&gt;</literal> "
 "マッピングに対しても 少し弱めの制限があります。"
 
 #. Tag: para
-#: inheritance_mapping.xml:258
+#: inheritance_mapping.xml:282
 #, no-c-format
 msgid ""
 "The following table shows the limitations of table per concrete-class "
@@ -652,128 +650,128 @@
 "暗黙的ポリモーフィズムの制限を示します。"
 
 #. Tag: title
-#: inheritance_mapping.xml:264
+#: inheritance_mapping.xml:288
 #, no-c-format
 msgid "Features of inheritance mappings"
 msgstr "継承マッピングの機能"
 
 #. Tag: entry
-#: inheritance_mapping.xml:276
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "継承戦略"
 
 #. Tag: entry
-#: inheritance_mapping.xml:277
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "多対一のポリモーフィズム"
 
 #. Tag: entry
-#: inheritance_mapping.xml:278
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "一対一のポリモーフィズム"
 
 #. Tag: entry
-#: inheritance_mapping.xml:279
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "一対多のポリモーフィズム"
 
 #. Tag: entry
-#: inheritance_mapping.xml:280
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "多対多のポリモーフィズム"
 
 #. Tag: entry
-#: inheritance_mapping.xml:281
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:282
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "ポリモーフィズムを使ったクエリ"
 
 #. Tag: entry
-#: inheritance_mapping.xml:283
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "ポリモーフィズムを使った結合"
 
 #. Tag: entry
-#: inheritance_mapping.xml:284
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "外部結合によるフェッチ"
 
 #. Tag: entry
-#: inheritance_mapping.xml:289
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "table per class-hierarchy"
 
 #. Tag: literal
-#: inheritance_mapping.xml:290 inheritance_mapping.xml:301
-#: inheritance_mapping.xml:312
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:291 inheritance_mapping.xml:302
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:292 inheritance_mapping.xml:303
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:293 inheritance_mapping.xml:304
-#: inheritance_mapping.xml:315
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:294 inheritance_mapping.xml:305
-#: inheritance_mapping.xml:316
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:295 inheritance_mapping.xml:306
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
 #. Tag: literal
-#: inheritance_mapping.xml:296 inheritance_mapping.xml:307
-#: inheritance_mapping.xml:318
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:297 inheritance_mapping.xml:308
-#: inheritance_mapping.xml:319
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr "サポート"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:325
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -783,13 +781,13 @@
 "table per subclass"
 
 #. Tag: entry
-#: inheritance_mapping.xml:311
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "table per concrete-class (union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:314
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -797,32 +795,32 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:322
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "table per concrete class (implicit polymorphism)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:323
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:324 inheritance_mapping.xml:325
-#: inheritance_mapping.xml:329 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, no-c-format
 msgid "not supported"
 msgstr "サポートしていません"
 
 #. Tag: literal
-#: inheritance_mapping.xml:326
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:327
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: performance.xml:5
+#: performance.xml:29
 #, no-c-format
 msgid "Improving performance"
 msgstr "パフォーマンスの改善"
 
 #. Tag: title
-#: performance.xml:8
+#: performance.xml:32
 #, no-c-format
 msgid "Fetching strategies"
 msgstr "フェッチ戦略"
 
 #. Tag: para
-#: performance.xml:10
-#, no-c-format
+#: performance.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "<emphasis>フェッチ戦略</emphasis> は、アプリケーションが関連をナビゲートする"
 "必要がある ときに、Hibernateが関連オブジェクトを復元するために使用する戦略で"
@@ -37,16 +37,16 @@
 "<literal>Criteria</literal> クエリでオーバーライドします。"
 
 #. Tag: para
-#: performance.xml:17
+#: performance.xml:41
 #, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr "Hibernate3は次に示すフェッチ戦略を定義しています。"
 
 #. Tag: para
-#: performance.xml:23
-#, no-c-format
+#: performance.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -55,13 +55,13 @@
 "<literal>SELECT</literal> で復元します。"
 
 #. Tag: para
-#: performance.xml:30
-#, no-c-format
+#: performance.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>セレクトフェッチ</emphasis> - 2回目の <literal>SELECT</literal> で"
 "関連するエンティティやコレクションを復元します。 <literal>lazy=\"false\"</"
@@ -69,14 +69,14 @@
 "関連にアクセスしたときのみ実行されるでしょう。"
 
 #. Tag: para
-#: performance.xml:39
-#, no-c-format
+#: performance.xml:63
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>サブセレクトフェッチ</emphasis> - 2回目の <literal>SELECT</"
 "literal> で、直前のクエリやフェッチで復元したすべての要素に関連するコレクショ"
@@ -85,12 +85,12 @@
 "れるでしょう。"
 
 #. Tag: para
-#: performance.xml:48
-#, no-c-format
+#: performance.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>バッチフェッチ</emphasis> - セレクトフェッチのための最適化された戦"
@@ -99,41 +99,41 @@
 "することに により行います。"
 
 #. Tag: para
-#: performance.xml:57
+#: performance.xml:81
 #, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "Hibernateは次に示す戦略とも区別をします。"
 
 #. Tag: para
-#: performance.xml:63
-#, no-c-format
+#: performance.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>即時フェッチ</emphasis> - 所有者のオブジェクトがロードされたとき"
 "に、 関連、コレクションは即時にフェッチされます。"
 
 #. Tag: para
-#: performance.xml:69
-#, no-c-format
+#: performance.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>遅延コレクションフェッチ</emphasis> - アプリケーションがコレクショ"
 "ンに 対して操作を行ったときにコレクションをフェッチします。 (これはコレクショ"
 "ンに対するデフォルトの動作です)"
 
 #. Tag: para
-#: performance.xml:76
-#, no-c-format
+#: performance.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>\"特別な遅延\"コレクションフェッチ</emphasis> - コレクションの要素 "
 "1つ1つが独立して、必要なときにデータベースから取得されます。 Hibernateは必"
@@ -141,10 +141,10 @@
 "きなコレクションに適しています)。"
 
 #. Tag: para
-#: performance.xml:84
-#, no-c-format
+#: performance.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -152,15 +152,15 @@
 "ソッドが関連オブジェクトで呼び出されるときにフェッチされます。"
 
 #. Tag: para
-#: performance.xml:91
-#, no-c-format
+#: performance.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>\"プロキシなし\"フェッチ</emphasis> - 単一値関連は、インスタンス変"
 "数に アクセスされたときにフェッチされます。プロキシフェッチと比較すると、この"
@@ -170,10 +170,10 @@
 "す。"
 
 #. Tag: para
-#: performance.xml:101
-#, no-c-format
+#: performance.xml:125
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -182,14 +182,15 @@
 "みが必要になり、 使う場面はまれです。"
 
 #. Tag: para
-#: performance.xml:110
-#, no-c-format
+#: performance.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "二つの直行する概念があります: <emphasis>いつ</emphasis> 関連をフェッチする"
 "か、 そして、 <emphasis>どうやって</emphasis> フェッチするか(どんなSQLを使っ"
@@ -198,31 +199,30 @@
 "ンスタンスのうち、どのデータを常に 使用可能にするかの取り決めを定義します。"
 
 #. Tag: title
-#: performance.xml:119
+#: performance.xml:143
 #, no-c-format
 msgid "Working with lazy associations"
 msgstr "遅延関連の働き"
 
 #. Tag: para
-#: performance.xml:121
-#, no-c-format
+#: performance.xml:145
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "デフォルトでは、Hibernate3はコレクションに対しては遅延セレクトフェッチを使"
 "い、 単一値関連には遅延プロキシフェッチを使います。これらのデフォルト動作はほ"
 "ぼすべての アプリケーションのほぼすべての関連で意味があります。"
 
 #. Tag: para
-#: performance.xml:127
-#, no-c-format
+#: performance.xml:151
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>注:</emphasis><literal>hibernate.default_batch_fetch_size</"
 "literal> をセットしたときは、Hibernateは 遅延フェッチのためのバッチフェッチ最"
@@ -230,19 +230,18 @@
 "す)。"
 
 #. Tag: para
-#: performance.xml:134
-#, no-c-format
+#: performance.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "しかし、遅延フェッチは知っておかなければならない一つの問題があります。 "
 "Hibernateのsessionをオープンしているコンテキストの外から遅延関連にアクセスす"
 "ると、 例外が発生します。例:"
 
 #. Tag: programlisting
-#: performance.xml:140
+#: performance.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
@@ -259,14 +258,14 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:142
-#, no-c-format
+#: performance.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "<literal>Session</literal> がクローズされたとき、permissionsコレクションは 初"
 "期化されていないため、このコレクションは自身の状態をロードできません。 "
@@ -275,15 +274,15 @@
 "ンザクションをコミットする直前に移動させます。"
 
 #. Tag: para
-#: performance.xml:150
-#, no-c-format
+#: performance.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "一方で、 <literal>lazy=\"false\"</literal> を関連マッピングに指定すること"
 "で、 遅延処理をしないコレクションや関連を使うことが出来ます。 しかしながら、"
@@ -293,14 +292,14 @@
 "の中にフェッチすることになるでしょう!"
 
 #. Tag: para
-#: performance.xml:159
-#, no-c-format
+#: performance.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "他方では、特定のトランザクションにおいてセレクトフェッチの代わりに 結合フェッ"
 "チ(当然これは遅延処理ではなくなります)を選択したいことが 時々あります。これ"
@@ -308,13 +307,13 @@
 "チ戦略を選択する仕組みは単一値関連とコレクションで 変わりはありません。"
 
 #. Tag: title
-#: performance.xml:170
+#: performance.xml:194
 #, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "フェッチ戦略のチューニング"
 
 #. Tag: para
-#: performance.xml:172
+#: performance.xml:196
 #, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
@@ -324,7 +323,7 @@
 "マッピング定義で結合フェッチを有効にすることができます。"
 
 #. Tag: programlisting
-#: performance.xml:177
+#: performance.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
@@ -335,13 +334,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:179
+#: performance.xml:203
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"mother\" class=\"Cat\" fetch=\"join\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:181
+#: performance.xml:205
 #, no-c-format
 msgid ""
 "The <literal>fetch</literal> strategy defined in the mapping document "
@@ -351,35 +350,35 @@
 "す。"
 
 #. Tag: para
-#: performance.xml:187
+#: performance.xml:211
 #, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr "<literal>get()</literal> や <literal>load()</literal> による復元"
 
 #. Tag: para
-#: performance.xml:192
+#: performance.xml:216
 #, no-c-format
 msgid "retrieval that happens implicitly when an association is navigated"
 msgstr "関連にナビゲートしたときに発生する暗黙的な復元"
 
 #. Tag: para
-#: performance.xml:197
+#: performance.xml:221
 #, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr "<literal>Criteria</literal> クエリ"
 
 #. Tag: para
-#: performance.xml:202
+#: performance.xml:226
 #, no-c-format
 msgid "HQL queries if <literal>subselect</literal> fetching is used"
 msgstr "<literal>サブセレクト</literal> フェッチを使うHQLクエリ"
 
 #. Tag: para
-#: performance.xml:208
-#, no-c-format
+#: performance.xml:232
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "たとえどんなフェッチ戦略を使ったとしても、遅延ではないグラフはメモリに読み込"
@@ -387,11 +386,11 @@
 "SELECT文が即時実行される ことがあるので注意してください。"
 
 #. Tag: para
-#: performance.xml:214
-#, no-c-format
+#: performance.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -405,19 +404,19 @@
 "<literal>setFetchMode(FetchMode.JOIN)</literal> を使うことが出来ます。"
 
 #. Tag: para
-#: performance.xml:223
-#, no-c-format
+#: performance.xml:247
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "もし <literal>get()</literal> や <literal>load()</literal> で使われる フェッ"
 "チ戦略を変えたいと感じたときには、単純に <literal>Criteria</literal> クエリを"
 "使ってください。例:"
 
 #. Tag: programlisting
-#: performance.xml:229
+#: performance.xml:253
 #, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
@@ -427,41 +426,41 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:231
-#, no-c-format
+#: performance.xml:255
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(これはいくつかのORMソリューションが\"fetch plan\"と呼んでいるものと同じで"
 "す。)"
 
 #. Tag: para
-#: performance.xml:235
-#, no-c-format
+#: performance.xml:259
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr ""
 "N+1セレクト問題を避けるためのまったく違う方法は、第2レベルキャッシュを使うこ"
 "とです。"
 
 #. Tag: title
-#: performance.xml:243
+#: performance.xml:267
 #, no-c-format
 msgid "Single-ended association proxies"
 msgstr "単一端関連プロキシ"
 
 #. Tag: para
-#: performance.xml:245
-#, no-c-format
+#: performance.xml:269
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "コレクションの遅延フェッチは、Hibernate自身の実装による永続コレクションを使っ"
 "て 実現しています。しかし、単一端関連における遅延処理では、違う仕組みが 必要"
@@ -470,10 +469,10 @@
 "クトの遅延初期化プロキシを実現しています。"
 
 #. Tag: para
-#: performance.xml:253
-#, no-c-format
+#: performance.xml:277
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -482,14 +481,14 @@
 "literal> 関連の 遅延フェッチを可能にしています。"
 
 #. Tag: para
-#: performance.xml:259
-#, no-c-format
+#: performance.xml:283
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "マッピングファイルで <literal>proxy</literal> 属性によって、クラスのプロキシ"
 "インターフェイスとして 使うインターフェイスを宣言できます。デフォルトでは、"
@@ -499,17 +498,17 @@
 "emphasis>"
 
 #. Tag: para
-#: performance.xml:266
-#, no-c-format
+#: performance.xml:290
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr ""
 "ポリモーフィズムのクラスに対してこの方法を適用するときにいくつか考慮すること"
 "があります。 例:"
 
 #. Tag: programlisting
-#: performance.xml:271
+#: performance.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -521,7 +520,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:273
+#: performance.xml:296
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -533,7 +532,7 @@
 "<literal>DomesticCat</literal> であったとしてもです。"
 
 #. Tag: programlisting
-#: performance.xml:279
+#: performance.xml:302
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -546,13 +545,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:281
-#, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr "第二に、プロキシの <literal>==</literal> は成立しないことがあります。"
 
 #. Tag: programlisting
-#: performance.xml:285
+#: performance.xml:308
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -564,7 +563,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:287
+#: performance.xml:310
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -576,7 +575,7 @@
 "ブジェクトです。"
 
 #. Tag: programlisting
-#: performance.xml:292
+#: performance.xml:315
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -584,22 +583,22 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:294
-#, no-c-format
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr ""
 "第三に、 <literal>final</literal> クラスや <literal>final</literal> メソッド"
 "を持つクラスに CGLIBプロキシを使えません。"
 
 #. Tag: para
-#: performance.xml:299
-#, no-c-format
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "最後に、もし永続オブジェクトのインスタンス化時(例えば、初期化処理やデフォルト"
@@ -608,13 +607,16 @@
 "ラスです。"
 
 #. Tag: para
-#: performance.xml:305
-#, no-c-format
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "これらの問題はJavaの単一継承モデルの原理上の制限のためです。もしこれらの問題"
 "を避けたいのなら、 ビジネスメソッドを宣言したインターフェイスをそれぞれ永続ク"
@@ -622,7 +624,7 @@
 "を指定する必要があります。例:"
 
 #. Tag: programlisting
-#: performance.xml:311
+#: performance.xml:336
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -634,26 +636,19 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:313
-#, no-c-format
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"<literal>CatImpl</literal> は <literal>Cat</literal> インターフェイスを実装す"
-"るのに対し、 <literal>DomesticCatImpl</literal> は <literal>DomesticCat</"
-"literal> を実装します。 すると、 <literal>load()</literal> や "
-"<literal>iterate()</literal> は、 <literal>Cat</literal> や "
-"<literal>DomesticCat</literal> のインスタンスのプロキシを 返します。"
-"( <literal>list()</literal> は通常はプロキシを返さないことに注意してくださ"
-"い。)"
+"第一に、 <literal>Cat</literal> のインスタンスは <literal>DomesticCat</"
+"literal> にキャストできません。たとえ基となるインスタンスが "
+"<literal>DomesticCat</literal> であったとしてもです。"
 
 #. Tag: programlisting
-#: performance.xml:321
+#: performance.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -662,8 +657,20 @@
 "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "<literal>Criteria</literal> クエリ"
+
+#. Tag: para
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -675,41 +682,41 @@
 "ん。"
 
 #. Tag: para
-#: performance.xml:328
-#, no-c-format
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr ""
 "プロキシの初期化を <emphasis>必要としない</emphasis> 操作も存在します。"
 
 #. Tag: para
-#: performance.xml:334
-#, no-c-format
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal> (永続クラスが <literal>equals()</literal> を "
 "オーバーライドしないとき)"
 
 #. Tag: para
-#: performance.xml:340
-#, no-c-format
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal> (永続クラスが <literal>hashCode()</literal> "
 "を オーバーライドしないとき)"
 
 #. Tag: para
-#: performance.xml:346
+#: performance.xml:375
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "識別子のgetterメソッド"
 
 #. Tag: para
-#: performance.xml:352
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -719,13 +726,13 @@
 "オーバーライドした 永続クラスを検出します。"
 
 #. Tag: para
-#: performance.xml:357
-#, no-c-format
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "デフォルトの <literal>lazy=\"proxy\"</literal> の代わりに、 <literal>lazy="
 "\"no-proxy\"</literal> を 選んだことで、型変換に関連する問題を回避することが"
@@ -733,19 +740,19 @@
 "であっても、 ただちにプロキシの初期化を行うことになるでしょう。"
 
 #. Tag: title
-#: performance.xml:367
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "コレクションとプロキシの初期化"
 
 #. Tag: para
-#: performance.xml:369
-#, no-c-format
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "<literal>LazyInitializationException</literal> は、 <literal>Session</"
 "literal> のスコープ外から 初期化していないコレクションやプロキシにアクセスさ"
@@ -753,14 +760,14 @@
 "シへの参照を持つエンティティが分離された状態の時です。"
 
 #. Tag: para
-#: performance.xml:375
-#, no-c-format
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "<literal>Session</literal> をクローズする前にプロキシやコレクションの初期化を"
 "確実に 行いたいときがあります。もちろん、 <literal>cat.getSex()</literal> や "
@@ -769,11 +776,11 @@
 "いう点からも不便です。"
 
 #. Tag: para
-#: performance.xml:382
-#, no-c-format
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -789,11 +796,11 @@
 "レクションに対して同様の 効果があります。"
 
 #. Tag: para
-#: performance.xml:391
-#, no-c-format
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -809,11 +816,11 @@
 "つの基本的な方法があります。"
 
 #. Tag: para
-#: performance.xml:402
-#, no-c-format
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -832,21 +839,20 @@
 "ターンの例を参照してください。"
 
 #. Tag: para
-#: performance.xml:415
-#, no-c-format
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "ビジネス層が分離しているアプリケーションでは、ビジネスロジックは Web層で必要"
 "になるすべてのコレクションを事前に\"準備\"する必要があります。 これは特定の"
@@ -861,14 +867,14 @@
 "emphasis> パターンを採用するほうがより簡単です。"
 
 #. Tag: para
-#: performance.xml:430
-#, no-c-format
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "初期化されていないコレクション(もしくは他のプロキシ)にアクセスする前に、 "
 "<literal>merge()</literal> や <literal>lock()</literal> を使って新しい "
@@ -878,17 +884,18 @@
 "emphasis> !"
 
 #. Tag: para
-#: performance.xml:440
-#, no-c-format
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "大きなコレクションを初期化したくはないが、コレクションについてのなんらかの情"
 "報(サイズのような) やデータのサブセットを必要とすることがあります。"
 
 #. Tag: para
-#: performance.xml:445
+#: performance.xml:474
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -898,7 +905,7 @@
 "ことが出来ます。"
 
 #. Tag: programlisting
-#: performance.xml:449
+#: performance.xml:478
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -906,7 +913,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:451
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -917,7 +924,7 @@
 "要なしに、コレクションの サブセットを復元するために効果的に使えます。"
 
 #. Tag: programlisting
-#: performance.xml:456
+#: performance.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -925,20 +932,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:461
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "バッチフェッチの使用"
 
 #. Tag: para
-#: performance.xml:463
-#, no-c-format
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "Hibernateはバッチフェッチを効率的に使用できます。一つのプロキシ(もしくはコレ"
 "クション)がアクセス されると、Hibernateはいくつかの初期化していないプロキシ"
@@ -947,19 +953,19 @@
 "クションレベルです。"
 
 #. Tag: para
-#: performance.xml:469
-#, no-c-format
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "クラス、要素のバッチフェッチは理解が簡単です。実行時の次の場面を想像してくだ"
 "さい。 <literal>Session</literal> にロードされた25個の <literal>Cat</"
@@ -973,27 +979,27 @@
 "の指定で調整できます。"
 
 #. Tag: programlisting
-#: performance.xml:479
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:481
-#, no-c-format
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 "Hibernateはクエリを3回だけを実行するようになります。パターンは10, 10, 5で"
 "す。"
 
 #. Tag: para
-#: performance.xml:485
-#, no-c-format
+#: performance.xml:514
+#, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
-"and 10 persons are currently loaded in the <literal>Sesssion</literal>, "
+"and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
 "one for every call to <literal>getCats()</literal>. If you enable batch "
 "fetching for the <literal>cats</literal> collection in the mapping of "
@@ -1008,7 +1014,7 @@
 "を有効にすれば、Hibernateはコレクションの事前フェッチが出来ます。"
 
 #. Tag: programlisting
-#: performance.xml:494
+#: performance.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1019,7 +1025,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:496
+#: performance.xml:525
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -1033,13 +1039,13 @@
 "します。"
 
 #. Tag: para
-#: performance.xml:502
-#, no-c-format
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "コレクションのバッチフェッチはアイテムのネストしたツリー、 すなわち、代表的な"
 "部品表のパターンが ある場合に特に有用です。(しかし、読み込みが多いツリーで"
@@ -1047,18 +1053,18 @@
 "がよりよい選択になります。)"
 
 #. Tag: title
-#: performance.xml:511
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "サブセレクトフェッチの使用"
 
 #. Tag: para
-#: performance.xml:513
-#, no-c-format
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "一つの遅延コレクションや単一値プロキシがフェッチされなければいけないとき、"
 "Hibernateは それらすべてをロードし、サブセレクトのオリジナルクエリが再度実行"
@@ -1066,22 +1072,22 @@
 "ん。"
 
 #. Tag: title
-#: performance.xml:524
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "遅延プロパティフェッチの使用"
 
 #. Tag: para
-#: performance.xml:526
-#, no-c-format
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "Hibernate3はプロパティごとの遅延フェッチをサポートしています。この最適化手法"
 "は <emphasis>グループのフェッチ</emphasis> としても知られています。これはほと"
@@ -1091,7 +1097,7 @@
 "改善できないなどの極端な場合には有用です。"
 
 #. Tag: para
-#: performance.xml:535
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1101,7 +1107,7 @@
 "<literal>lazy</literal> 属性をセットしてください。"
 
 #. Tag: programlisting
-#: performance.xml:540
+#: performance.xml:569
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1117,25 +1123,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:542
-#, no-c-format
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "遅延プロパティ読み込みはビルド時のバイトコード組み込みを必要とします!もし 永"
 "続クラスに組み込みがされていないなら、Hibernateは黙って遅延プロパティの設定を"
 "無視して、 即時フェッチに戻します。"
 
 #. Tag: para
-#: performance.xml:548
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr "バイトコード組み込みは以下のAntタスクを使ってください。"
 
 #. Tag: programlisting
-#: performance.xml:552
+#: performance.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1155,13 +1161,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:554
-#, no-c-format
+#: performance.xml:583
+#, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a prefered solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "不要な列を読み込まないための、別の(よりよい?)方法は、少なくとも 読み込みの"
 "みのトランザクションにおいては、HQLやCriteriaクエリの射影 機能を使うことで"
@@ -1169,32 +1175,32 @@
 "す。"
 
 #. Tag: para
-#: performance.xml:561
-#, no-c-format
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "HQLで <literal>fetch all properties</literal> を使うことで、普通どおりの プロ"
 "パティの即時フェッチングを強制することが出来ます。"
 
 #. Tag: title
-#: performance.xml:571
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "第2レベルキャッシュ"
 
 #. Tag: para
-#: performance.xml:573
-#, no-c-format
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "Hibernateの <literal>Session</literal> は永続データのトランザクションレベルの"
 "キャッシュです。 class-by-classとcollection-by-collectionごとの、クラスタレベ"
@@ -1204,17 +1210,16 @@
 "慮しません(キャッシュデータを定期的に期限切れにする設定は出来ます)。"
 
 #. Tag: para
-#: performance.xml:581
-#, no-c-format
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "Hibernateが使用するキャッシュ実装は、<literal>hibernate.cache."
 "provider_class</literal> プロパティに <literal>org.hibernate.cache."
@@ -1226,162 +1231,180 @@
 "ではこれは当てはまりません。"
 
 #. Tag: title
-#: performance.xml:592
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr "キャッシュプロバイダ"
 
 #. Tag: entry
-#: performance.xml:601 performance.xml:774
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr "キャッシュ"
 
 #. Tag: entry
-#: performance.xml:602
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr "プロバイダクラス"
 
 #. Tag: entry
-#: performance.xml:603
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr "タイプ"
 
 #. Tag: entry
-#: performance.xml:604
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "クラスタセーフ"
 
 #. Tag: entry
-#: performance.xml:605
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "クエリキャッシュのサポート"
 
 #. Tag: entry
-#: performance.xml:610 performance.xml:783
+#: performance.xml:639 performance.xml:827
 #, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr "Hashtable(製品用として意図していません)"
 
 #. Tag: literal
-#: performance.xml:611
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:612
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr "メモリ"
 
 #. Tag: entry
-#: performance.xml:614 performance.xml:621 performance.xml:628
-#: performance.xml:784 performance.xml:785 performance.xml:786
-#: performance.xml:791 performance.xml:792 performance.xml:793
-#: performance.xml:798 performance.xml:799 performance.xml:800
-#: performance.xml:805 performance.xml:806 performance.xml:812
-#: performance.xml:815
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:617 performance.xml:790
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:618
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:619 performance.xml:626
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr "メモリ、ディスク"
 
 #. Tag: entry
-#: performance.xml:624 performance.xml:797
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:625
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:631 performance.xml:804
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:632
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:633
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "クラスタ(ipマルチキャスト)"
 
 #. Tag: entry
-#: performance.xml:634
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "yes(クラスタ無効化)"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:811
-#, no-c-format
-msgid "JBoss TreeCache"
+#: performance.xml:667 performance.xml:855
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:639
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:640
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "クラスタ(ipマルチキャスト)、トランザクショナル"
 
 #. Tag: entry
-#: performance.xml:641
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr "yes(複製)"
 
 #. Tag: entry
-#: performance.xml:642
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "yes(時刻同期が必要)"
 
+#. Tag: entry
+#: performance.xml:674 performance.xml:862
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "JBoss TreeCache"
+
+#. Tag: literal
+#: performance.xml:675
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:677
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "yes(クラスタ無効化)"
+
 #. Tag: title
-#: performance.xml:649
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr "キャッシュのマッピング"
 
 #. Tag: para
-#: performance.xml:651
+#: performance.xml:687
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1391,7 +1414,7 @@
 "下の形式です。"
 
 #. Tag: programlisting
-#: performance.xml:662
+#: performance.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1402,7 +1425,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:665
+#: performance.xml:701
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1414,22 +1437,22 @@
 "<literal>nonstrict-read-write</literal> or <literal>read-only</literal>"
 
 #. Tag: para
-#: performance.xml:674
-#, no-c-format
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (optional, defaults to the class or collection "
 "role name) specifies the name of the second level cache region"
 
 #. Tag: para
-#: performance.xml:681
-#, no-c-format
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (optional, defaults to <literal>all</literal>) "
@@ -1438,19 +1461,19 @@
 "lazy fetching is enabled"
 
 #. Tag: para
-#: performance.xml:691
-#, no-c-format
+#: performance.xml:727
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "または(よりよい方法として?)、 <literal>hibernate.cfg.xml</literal> に "
 "<literal>&lt;class-cache&gt;</literal> と <literal>&lt;collection-cache&gt;</"
 "literal> 要素を指定することも出来ます。"
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:732
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1460,18 +1483,18 @@
 "を指定します。"
 
 #. Tag: title
-#: performance.xml:703
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "read only戦略"
 
 #. Tag: para
-#: performance.xml:705
-#, no-c-format
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "もしアプリケーションが読み込みのみ必要で、永続クラスのインスタンスを変更しな"
@@ -1480,7 +1503,7 @@
 "安全です。"
 
 #. Tag: programlisting
-#: performance.xml:711
+#: performance.xml:747
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1490,26 +1513,26 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:717
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "read/write戦略"
 
 #. Tag: para
-#: performance.xml:719
-#, no-c-format
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "アプリケーションがデータを更新する必要があるなら、 <literal>read-write</"
 "literal> キャッシュが適当かも しれません。このキャッシュ戦略は、シリアライザ"
@@ -1524,7 +1547,7 @@
 "バイダは <emphasis>サポートしていません</emphasis> 。"
 
 #. Tag: programlisting
-#: performance.xml:730
+#: performance.xml:766
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1538,18 +1561,18 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:735
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "厳密ではないread/write戦略"
 
 #. Tag: para
-#: performance.xml:737
-#, no-c-format
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1566,18 +1589,18 @@
 "ションが完了 していなければなりません。"
 
 #. Tag: title
-#: performance.xml:749
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "transactional戦略"
 
 #. Tag: para
-#: performance.xml:751
-#, no-c-format
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "<literal>transactional</literal> キャッシュ戦略はJBoss TreeCacheのような完全"
@@ -1585,11 +1608,26 @@
 "キャッシュはJTA環境でのみ使用可能で、 <literal>hibernate.transaction."
 "manager_lookup_class</literal> を指定しなければなりません。"
 
+#. Tag: title
+#: performance.xml:796
+#, fuzzy, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
+msgstr "同時並行性キャッシュ戦略のサポート"
+
 #. Tag: para
-#: performance.xml:759
-#, no-c-format
+#: performance.xml:799
+#, fuzzy, no-c-format
 msgid ""
-"None of the cache providers support all of the cache concurrency strategies. "
+"None of the cache providers support all of the cache concurrency strategies."
+msgstr ""
+"すべての同時並行性キャッシュ戦略をサポートしているキャッシュプロバイダはあり"
+"ません。 以下の表はどのプロバイダがどの同時並列性戦略に対応するかを表していま"
+"す。"
+
+#. Tag: para
+#: performance.xml:804
+#, fuzzy, no-c-format
+msgid ""
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 msgstr ""
@@ -1598,47 +1636,47 @@
 "す。"
 
 #. Tag: title
-#: performance.xml:765
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "同時並行性キャッシュ戦略のサポート"
 
 #. Tag: entry
-#: performance.xml:775
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr "read-only"
 
 #. Tag: entry
-#: performance.xml:776
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "厳密ではないread-write"
 
 #. Tag: entry
-#: performance.xml:777
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr "read-write"
 
 #. Tag: entry
-#: performance.xml:778
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
 #. Tag: title
-#: performance.xml:824
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr "キャッシュの管理"
 
 #. Tag: para
-#: performance.xml:826
-#, no-c-format
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1652,14 +1690,14 @@
 "内部キャッシュに追加されます。"
 
 #. Tag: para
-#: performance.xml:833
-#, no-c-format
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "次に <literal>flush()</literal> が呼ばれると、オブジェクトの状態はデータベー"
@@ -1669,7 +1707,7 @@
 "削除することが出来ます。"
 
 #. Tag: programlisting
-#: performance.xml:841
+#: performance.xml:894
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1682,7 +1720,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:843
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1692,17 +1730,17 @@
 "うかを判断するための <literal>contains()</literal> メソッドも提供します。"
 
 #. Tag: para
-#: performance.xml:848
-#, no-c-format
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "すべてのオブジェクトをセッションキャッシュから完全に取り除くには、"
 "<literal>Session.clear()</literal> を呼び出してください。"
 
 #. Tag: para
-#: performance.xml:852
+#: performance.xml:905
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1714,7 +1752,7 @@
 "削除するためのメソッドがそれぞれ定義されています。"
 
 #. Tag: programlisting
-#: performance.xml:858
+#: performance.xml:911
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1726,53 +1764,53 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:860
-#, no-c-format
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "<literal>CacheMode</literal> は特定のセッションが二次キャッシュとどのように相"
 "互作用するかを 指定します。"
 
 #. Tag: para
-#: performance.xml:867
-#, no-c-format
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr ""
 "<literal>CacheMode.NORMAL</literal> - アイテムの読み込みと書き込みで二次"
 "キャッシュを使います"
 
 #. Tag: para
-#: performance.xml:872
-#, no-c-format
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - 読み込みは二次キャッシュから行いますが、"
 "データを 更新した場合を除いて二次キャッシュに書き込みをしません。"
 
 #. Tag: para
-#: performance.xml:878
-#, no-c-format
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - 二次キャッシュにアイテムを書き込みますが、"
 "読み込みには 二次キャッシュを使いません。"
 
 #. Tag: para
-#: performance.xml:884
-#, no-c-format
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - 二次キャッシュにアイテムを書き込みます"
 "が、読み込みには 二次キャッシュを使わず、 <literal>hibernate.cache."
@@ -1780,7 +1818,7 @@
 "アイテムの二次キャッシュを強制的にリフレッシュします。"
 
 #. Tag: para
-#: performance.xml:892
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1790,7 +1828,7 @@
 "<literal>Statistics</literal> APIを 使ってください。"
 
 #. Tag: programlisting
-#: performance.xml:897
+#: performance.xml:950
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1799,17 +1837,17 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:899
-#, no-c-format
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "統計情報を有効にして、さらにオプションとして、キャッシュエントリを 人がより理"
 "解可能な形式で保持することをHibernateに強制します。"
 
 #. Tag: programlisting
-#: performance.xml:904
+#: performance.xml:957
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1817,41 +1855,40 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:909
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr "クエリキャッシュ"
 
 #. Tag: para
-#: performance.xml:911
-#, no-c-format
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "クエリのリザルトセットもキャッシュ出来ます。これは同じパラメータで何度も実行"
 "される クエリに対してのみ有用です。クエリキャッシュを使うには、まず設定で有効"
 "にしなくてはなりません。"
 
 #. Tag: programlisting
-#: performance.xml:916
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:918
-#, no-c-format
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "この設定は新たに二つのキャッシュ領域の作成を行います。一つはクエリのリザルト"
 "セットの キャッシュ( <literal>org.hibernate.cache.StandardQueryCache</"
@@ -1862,10 +1899,10 @@
 "そのため、クエリキャッシュは常に二次キャッシュと一緒に使うべきです。"
 
 #. Tag: para
-#: performance.xml:928
-#, no-c-format
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1877,11 +1914,11 @@
 "ます。"
 
 #. Tag: para
-#: performance.xml:935
-#, no-c-format
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "クエリキャッシュの破棄ポリシーを細かく制御したいときは、 <literal>Query."
@@ -1889,7 +1926,7 @@
 "定することが出来ます。"
 
 #. Tag: programlisting
-#: performance.xml:941
+#: performance.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1902,7 +1939,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:943
+#: performance.xml:996
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1922,54 +1959,52 @@
 "シュ領域を消去することです。"
 
 #. Tag: title
-#: performance.xml:955
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "コレクションのパフォーマンスの理解"
 
 #. Tag: para
-#: performance.xml:957
+#: performance.xml:1010
 #, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"コレクションの話題にはすでに多くの時間を使いました。この節では コレクションが"
-"実行時にどのように振舞うかについての話題を2、3取り上げます。"
 
 #. Tag: title
-#: performance.xml:964
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr "分類"
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernateは3つの基本的なコレクションの種類を定義しています。"
 
 #. Tag: para
-#: performance.xml:970
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr "値のコレクション"
 
 #. Tag: para
-#: performance.xml:973
-#, no-c-format
-msgid "one to many associations"
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "一対多関連"
 
 #. Tag: para
-#: performance.xml:976
-#, no-c-format
-msgid "many to many associations"
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "多対多関連"
 
 #. Tag: para
-#: performance.xml:980
+#: performance.xml:1033
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -1986,31 +2021,31 @@
 "す。"
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr "インデックス付きコレクション"
 
 #. Tag: para
-#: performance.xml:994
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr "set"
 
 #. Tag: para
-#: performance.xml:997
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr "bag"
 
 #. Tag: para
-#: performance.xml:1001
-#, no-c-format
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "すべてのインデックス付きコレクション(map、list、配列)は <literal>&lt;"
@@ -2020,18 +2055,18 @@
 "効率的に見つけることができます。"
 
 #. Tag: para
-#: performance.xml:1009
-#, no-c-format
+#: performance.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "setは <literal>&lt;key&gt;</literal> からなる主キーと要素のカラムを持っていま"
 "す。 これはコレクション要素のいくつかの型については効率的ではないかもしれませ"
@@ -2043,24 +2078,24 @@
 "\"</literal> を宣言しなければなりません。)"
 
 #. Tag: para
-#: performance.xml:1020
-#, no-c-format
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> マッピングは代理キーを定義します。そのため "
 "更新は常に非常に効率的です。事実上、これは最善のケースです。"
 
 #. Tag: para
-#: performance.xml:1025
-#, no-c-format
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "bagは最悪のケースです。bagは要素の値の重複が可能で、インデックスカラムを持た"
 "ないため、 主キーは定義されないかもしれません。Hibernateには重複した行を区別"
@@ -2069,13 +2104,13 @@
 "ションの再作成を行います。 これは非常に非効率的かもしれません。"
 
 #. Tag: para
-#: performance.xml:1033
-#, no-c-format
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "1対多関連では、「主キー」はデータベースのテーブルの物理的な 主キーではないか"
 "もしれないことに注意してください。しかしこの場合でさえ、上記の分類はまだ有用"
@@ -2083,34 +2118,34 @@
 "います。)"
 
 #. Tag: title
-#: performance.xml:1043
+#: performance.xml:1096
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr "更新にもっとも効率的なコレクション list、map、idbag、set"
 
 #. Tag: para
-#: performance.xml:1045
-#, no-c-format
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "上での議論から、インデックス付きコレクションと(普通の)setは要素の追加、削"
 "除、 更新でもっとも効率的な操作が出来ることは明らかです。"
 
 #. Tag: para
-#: performance.xml:1051
-#, no-c-format
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "ほぼ間違いなく、多対多関連や値のコレクションにおいて、インデックス付きコレク"
 "ションが setよりも優れている点が一つ以上あります。 <literal>Set</literal> は"
@@ -2120,12 +2155,12 @@
 "行います。繰り返しますが、これは一対多関連には 当てはまりません。"
 
 #. Tag: para
-#: performance.xml:1060
-#, no-c-format
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -2136,14 +2171,14 @@
 "もっとも自然だからです。"
 
 #. Tag: para
-#: performance.xml:1068
-#, no-c-format
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "しかし、よくデザインされたHibernateのドメインモデルでは、通常もっとも多いコレ"
 "クションは 事実上 <literal>inverse=\"true\"</literal> を指定した1対多関連で"
@@ -2151,24 +2186,23 @@
 "フォーマンスの問題は当てはまりません。"
 
 #. Tag: title
-#: performance.xml:1078
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr "inverseコレクションにもっとも最適なbagとlist"
 
 #. Tag: para
-#: performance.xml:1080
-#, no-c-format
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "bagを見放してしまう前に、bag(そしてlistも)がsetよりもずっとパフォーマンスが"
 "良い特別なケースを 紹介します。 <literal>inverse=\"true\"</literal> のコレク"
@@ -2180,7 +2214,7 @@
 "す。"
 
 #. Tag: programlisting
-#: performance.xml:1090
+#: performance.xml:1143
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2191,20 +2225,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1095
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr "一括削除"
 
 #. Tag: para
-#: performance.xml:1097
-#, no-c-format
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "時々、コレクションの要素を一つ一つ削除することは極めて非効率的になることがあ"
 "ります。 Hibernateは愚かではないので、新しい空のコレクションの場合"
@@ -2213,13 +2246,13 @@
 "回発行して、それですべて終わります!"
 
 #. Tag: para
-#: performance.xml:1104
-#, no-c-format
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "サイズ20のコレクションに一つの要素を追加し、それから二つの要素を削除するとし"
 "ます。 Hibernateは一つの <literal>INSERT</literal> 文と二つの "
@@ -2227,7 +2260,7 @@
 "れは確かに望ましい動作です。"
 
 #. Tag: para
-#: performance.xml:1110
+#: performance.xml:1163
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2237,64 +2270,63 @@
 "す。 このとき二つの方法があります。"
 
 #. Tag: para
-#: performance.xml:1117
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "18行を一つ一つ削除して、3行を追加する"
 
 #. Tag: para
-#: performance.xml:1120
-#, no-c-format
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr ""
 "コレクション全体を削除( <literal>DELETE</literal> のSQLを一回)し、そして5つ"
 "の要素すべてを (一つずつ)追加する"
 
 #. Tag: para
-#: performance.xml:1125
-#, no-c-format
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernateはこの場合に2番目の方法がより速いだろうとわかるほど賢くはありませ"
 "ん。 (そしてHibernateがこのように賢いことも望ましくないでしょう。このような"
 "振る舞いは データベースのトリガなどを混乱させるかもしれません。)"
 
 #. Tag: para
-#: performance.xml:1131
-#, no-c-format
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "幸いにも、元のコレクションを捨て(つまり参照をやめて)、現在の要素をすべて持"
 "つ新しいコレクションの インスタンスを返すことで、いつでもこの振る舞い(2番目"
 "の戦略)を強制することが出来ます。 時にこれはとても便利で強力です。"
 
 #. Tag: para
-#: performance.xml:1137
-#, no-c-format
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "もちろん、一括削除は <literal>inverse=\"true\"</literal> を指定したコレクショ"
 "ンには行いません。"
 
 #. Tag: title
-#: performance.xml:1146
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "パフォーマンスのモニタリング"
 
 #. Tag: para
-#: performance.xml:1148
+#: performance.xml:1201
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2307,13 +2339,13 @@
 "<literal>SessionFactory</literal> 単位で取得可能です。"
 
 #. Tag: title
-#: performance.xml:1155
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "SessionFactoryのモニタリング"
 
 #. Tag: para
-#: performance.xml:1157
+#: performance.xml:1210
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2325,11 +2357,11 @@
 "呼び出し、 自分で <literal>Statistics</literal> の読み込みや表示を行います。"
 
 #. Tag: para
-#: performance.xml:1163
-#, no-c-format
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2340,7 +2372,7 @@
 "てください。"
 
 #. Tag: programlisting
-#: performance.xml:1170
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2356,7 +2388,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1173
+#: performance.xml:1226
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2370,30 +2402,17 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1175
-#, no-c-format
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"TODO: これは意味がありません。最初のケースは、MBeanを直接復元して使用します。"
-"2番目のケースは、 使う前にsession factoryが持っているJNDI名を渡さなければなり"
-"ません。 <literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name"
-"\")</literal> を使ってください。"
-
-#. Tag: para
-#: performance.xml:1180
-#, no-c-format
-msgid ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
 "<literal>SessionFactory</literal> に対してモニタリングの開始(終了)を行うこ"
 "とが出来ます。"
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1238
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2403,7 +2422,7 @@
 "<literal>false</literal> にします"
 
 #. Tag: para
-#: performance.xml:1192
+#: performance.xml:1245
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2414,11 +2433,11 @@
 "び出します"
 
 #. Tag: para
-#: performance.xml:1199
-#, no-c-format
+#: performance.xml:1252
+#, fuzzy, no-c-format
 msgid ""
-"Statistics can be reset programatically using the <literal>clear()</literal> "
-"method. A summary can be sent to a logger (info level) using the "
+"Statistics can be reset programmatically using the <literal>clear()</"
+"literal> method. A summary can be sent to a logger (info level) using the "
 "<literal>logSummary()</literal> method."
 msgstr ""
 "統計は <literal>clear()</literal> メソッドを使って手動でリセットすることが出"
@@ -2426,25 +2445,25 @@
 "ることが出来ます (infoレベルです)。"
 
 #. Tag: title
-#: performance.xml:1208
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr "メトリクス"
 
 #. Tag: para
-#: performance.xml:1210
-#, no-c-format
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "多くのものがあります。すべての使用可能なカウンタは <literal>Statistics</"
 "literal> インターフェイスのAPIに書かれており、3つの分類があります。"
 
 #. Tag: para
-#: performance.xml:1217
+#: performance.xml:1270
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2454,17 +2473,17 @@
 "オープンしたセッションの数がJDBCコネクションと関連しているのと同じです。"
 
 #. Tag: para
-#: performance.xml:1223
-#, no-c-format
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr ""
 "メトリクスは要素、コレクション、クエリやキャッシュなど全体に 関係しています"
 "(別名はグローバルメトリクスです)。"
 
 #. Tag: para
-#: performance.xml:1229
+#: performance.xml:1282
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2474,14 +2493,14 @@
 "関係しています。"
 
 #. Tag: para
-#: performance.xml:1236
-#, no-c-format
+#: performance.xml:1289
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"For example, you can check the cache hit, miss, and put ratio of entities, "
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "例として、キャッシュのヒット、ヒットミスや、要素、コレクション、クエリの割"
 "合、クエリの実行に 必要な平均時間を確認できます。ミリ秒の数値はJavaの近似を受"
@@ -2489,8 +2508,8 @@
 "によっては10秒単位でしか正確でないかもしれません。"
 
 #. Tag: para
-#: performance.xml:1243
-#, no-c-format
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2499,7 +2518,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "単純なgetterはグローバルメトリクス(すなわち特定のエンティティ、コレクショ"
@@ -2512,7 +2531,7 @@
 "literal> APIのjavadocを 参照してください。以下のコードは簡単な例です。"
 
 #. Tag: programlisting
-#: performance.xml:1253
+#: performance.xml:1306
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2534,12 +2553,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1255
-#, no-c-format
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2549,5 +2568,41 @@
 "<literal>getSecondLevelCacheRegionNames()</literal> メソッドで それぞれの名前"
 "のリストを取得することが出来ます。"
 
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "<literal>CatImpl</literal> は <literal>Cat</literal> インターフェイスを実"
+#~ "装するのに対し、 <literal>DomesticCatImpl</literal> は "
+#~ "<literal>DomesticCat</literal> を実装します。 すると、 <literal>load()</"
+#~ "literal> や <literal>iterate()</literal> は、 <literal>Cat</literal> や "
+#~ "<literal>DomesticCat</literal> のインスタンスのプロキシを 返します。"
+#~ "( <literal>list()</literal> は通常はプロキシを返さないことに注意してくだ"
+#~ "さい。)"
+
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "コレクションの話題にはすでに多くの時間を使いました。この節では コレクショ"
+#~ "ンが実行時にどのように振舞うかについての話題を2、3取り上げます。"
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "TODO: これは意味がありません。最初のケースは、MBeanを直接復元して使用しま"
+#~ "す。2番目のケースは、 使う前にsession factoryが持っているJNDI名を渡さなけ"
+#~ "ればなりません。 <literal>hibernateStatsBean.setSessionFactoryJNDIName"
+#~ "(\"my/JNDI/Name\")</literal> を使ってください。"
+
 #~ msgid "yes"
 #~ msgstr "yes"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,20 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: persistent_classes.xml:5
+#: persistent_classes.xml:29
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "永続クラス"
 
 #. Tag: para
-#: persistent_classes.xml:7
-#, no-c-format
+#: persistent_classes.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "永続クラスはビジネス上の問題のエンティティ(例えば、Eコマースアプリケーション"
 "の顧客や注文) を実装するアプリケーションのクラスです。 永続クラスのすべての"
@@ -32,14 +33,14 @@
 "せん。"
 
 #. Tag: para
-#: persistent_classes.xml:14
-#, no-c-format
+#: persistent_classes.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "Plain Old Java Object (POJO)プログラミングモデルとしても知られる いくつかの単"
 "純なルールに従うなら、Hibernateは最もよく働きます。 しかしこれらのルールは難"
@@ -48,21 +49,23 @@
 "えば <literal>Map</literal> インスタンスのツリーを使う方法があります。"
 
 #. Tag: title
-#: persistent_classes.xml:23
+#: persistent_classes.xml:47
 #, no-c-format
 msgid "A simple POJO example"
 msgstr "単純なPOJOの例"
 
 #. Tag: para
-#: persistent_classes.xml:25
-#, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+#: persistent_classes.xml:49
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr ""
 "ほとんどのJavaアプリケーションにはネコ科の動物を表現する永続クラスが必要で"
 "す。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:29
+#: persistent_classes.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -146,25 +149,27 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:31
+#: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
-msgstr "従うべき4つのルールがあります:"
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:37
+#: persistent_classes.xml:61
 #, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "引数のないコンストラクタを実装する"
 
 #. Tag: para
-#: persistent_classes.xml:39
-#, no-c-format
+#: persistent_classes.xml:63
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -176,22 +181,22 @@
 "トラクタを強くお勧めします。"
 
 #. Tag: title
-#: persistent_classes.xml:49
+#: persistent_classes.xml:73
 #, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "識別子プロパティを用意する(オプション)"
 
 #. Tag: para
-#: persistent_classes.xml:51
-#, no-c-format
+#: persistent_classes.xml:75
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal> には <literal>id</literal> というプロパティがありま"
 "す。 このプロパティはデータベーステーブルの主キーカラムへマッピングされま"
@@ -202,7 +207,7 @@
 "ザ定義のクラスを使うことさえ可能です。 後で複合識別子の節を見てください。)"
 
 #. Tag: para
-#: persistent_classes.xml:60
+#: persistent_classes.xml:84
 #, no-c-format
 msgid ""
 "The identifier property is strictly optional. You can leave them off and let "
@@ -213,17 +218,17 @@
 "にオブジェクトの識別子を追跡させることは可能です。 しかしおすすめはしません。"
 
 #. Tag: para
-#: persistent_classes.xml:65
-#, no-c-format
+#: persistent_classes.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr ""
 "実際に、識別子プロパティを宣言するクラスだけが利用可能な機能がいくつかありま"
 "す:"
 
 #. Tag: para
-#: persistent_classes.xml:72
+#: persistent_classes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "Transitive reattachment for detached objects (cascade update or cascade "
@@ -233,36 +238,35 @@
 "linkend=\"objectstate-transitive\"/> を参照してください。"
 
 #. Tag: literal
-#: persistent_classes.xml:79
+#: persistent_classes.xml:103
 #, no-c-format
 msgid "Session.saveOrUpdate()"
 msgstr "Session.saveOrUpdate()"
 
 #. Tag: literal
-#: persistent_classes.xml:84
+#: persistent_classes.xml:108
 #, no-c-format
 msgid "Session.merge()"
 msgstr "Session.merge()"
 
 #. Tag: para
-#: persistent_classes.xml:89
-#, no-c-format
+#: persistent_classes.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "永続クラスには、一貫した名前の識別子プロパティを定義することをお勧めします。 "
 "さらにnull値を取れる(つまりプリミティブではない)型を使った方がよいでしょう。"
 
 #. Tag: title
-#: persistent_classes.xml:96
+#: persistent_classes.xml:120
 #, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr "finalクラスにしない(オプション)"
 
 #. Tag: para
-#: persistent_classes.xml:97
+#: persistent_classes.xml:121
 #, no-c-format
 msgid ""
 "A central feature of Hibernate, <emphasis>proxies</emphasis>, depends upon "
@@ -274,12 +278,13 @@
 "実装されているかに依存しています。"
 
 #. Tag: para
-#: persistent_classes.xml:102
-#, no-c-format
+#: persistent_classes.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "Hibernateでインターフェイスを実装していない <literal>final</literal> クラスを"
 "永続化することはできますが、 遅延関連フェッチに対してプロキシを使うことはでき"
@@ -287,7 +292,7 @@
 "す。"
 
 #. Tag: para
-#: persistent_classes.xml:107
+#: persistent_classes.xml:131
 #, no-c-format
 msgid ""
 "You should also avoid declaring <literal>public final</literal> methods on "
@@ -301,23 +306,22 @@
 "にしなければなりません。"
 
 #. Tag: title
-#: persistent_classes.xml:115
+#: persistent_classes.xml:139
 #, no-c-format
 msgid "Declare accessors and mutators for persistent fields (optional)"
 msgstr "永続フィールドに対するアクセサとミューテータを定義する(オプション)"
 
 #. Tag: para
-#: persistent_classes.xml:117
-#, no-c-format
+#: persistent_classes.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal> ではすべての永続フィールドに対してアクセサメソッドを定"
 "義しています。 他の多くのORMツールは、永続インスタンス変数を直接永続化しま"
@@ -328,7 +332,7 @@
 "して、直接のフィールドアクセスに切り替えることは可能です。"
 
 #. Tag: para
-#: persistent_classes.xml:127
+#: persistent_classes.xml:151
 #, no-c-format
 msgid ""
 "Properties need <emphasis>not</emphasis> be declared public - Hibernate can "
@@ -341,23 +345,23 @@
 "ができます。"
 
 #. Tag: title
-#: persistent_classes.xml:138
+#: persistent_classes.xml:162
 #, no-c-format
 msgid "Implementing inheritance"
 msgstr "継承の実装"
 
 #. Tag: para
-#: persistent_classes.xml:140
-#, no-c-format
+#: persistent_classes.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "サブクラスも1番目と2番目のルールを守らなければなりません。 サブクラスはスー"
 "パークラス <literal>Cat</literal> から識別子プロパティを継承します。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:145
+#: persistent_classes.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -375,47 +379,47 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:149
+#: persistent_classes.xml:173
 #, no-c-format
 msgid ""
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
 msgstr "<literal>equals()</literal> と <literal>hashCode()</literal> の実装"
 
 #. Tag: para
-#: persistent_classes.xml:151
-#, no-c-format
+#: persistent_classes.xml:175
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "以下の条件の場合、 <literal>equals()</literal> と <literal>hashCode()</"
 "literal> メソッドをオーバーライドしなければなりません、"
 
 #. Tag: para
-#: persistent_classes.xml:157
-#, no-c-format
+#: persistent_classes.xml:181
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "永続クラスのインスタンスを <literal>Set</literal> に置く場合。 (これは多値の"
 "関連を表現するおすすめの方法です) <emphasis>そして同時に</emphasis>"
 
 #. Tag: para
-#: persistent_classes.xml:164
+#: persistent_classes.xml:188
 #, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr "分離インスタンスをセッションへ再追加する場合。"
 
 #. Tag: para
-#: persistent_classes.xml:170
-#, no-c-format
+#: persistent_classes.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernateは、永続ID(データベースの行)と、特定のセッションスコープ内に 限定"
@@ -425,24 +429,23 @@
 "<literal>hashCode()</literal> を実装しなければなりません。"
 
 #. Tag: para
-#: persistent_classes.xml:178
-#, no-c-format
+#: persistent_classes.xml:202
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "最も明白な方法は、両方のオブジェクトの識別子の値の比較によって "
 "<literal>equals()</literal>と <literal>hashCode()</literal> を実装する方法で"
@@ -461,14 +464,15 @@
 "あることに注意してください。"
 
 #. Tag: para
-#: persistent_classes.xml:192
-#, no-c-format
+#: persistent_classes.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "<emphasis>ビジネスキーの等価性</emphasis> を使って、 <literal>equals()</"
 "literal> と <literal>hashCode()</literal> を実装することをお勧めします。 ビジ"
@@ -477,7 +481,7 @@
 "emphasis> 候補キー) を形成するプロパティだけを比較することを意味します。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:200
+#: persistent_classes.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
@@ -506,13 +510,12 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:202
-#, no-c-format
+#: persistent_classes.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "ビジネスキーはデータベースの主キー候補ほど安定である必要はないことに注意して"
 "ください (<xref linkend=\"transactions-basics-identity\"/> を見てくださ"
@@ -520,30 +523,36 @@
 "補です。"
 
 #. Tag: title
-#: persistent_classes.xml:212
+#: persistent_classes.xml:236
 #, no-c-format
 msgid "Dynamic models"
 msgstr "動的モデル"
 
+#. Tag: title
+#: persistent_classes.xml:239
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: emphasis
-#: persistent_classes.xml:215
-#, no-c-format
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr ""
 "以下の機能は現在実験段階にあると見なされており、 近い将来変更される可能性があ"
 "ることに注意してください。"
 
 #. Tag: para
-#: persistent_classes.xml:219
-#, no-c-format
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "永続エンティティは、必ずしも実行時にPOJOクラスやJavaBeanオブジェクトで表現す"
 "る必要はありません。 Hibernateは(実行時に <literal>Map</literal> の "
@@ -552,13 +561,13 @@
 "ファイルだけを書くことになります。"
 
 #. Tag: para
-#: persistent_classes.xml:227
-#, no-c-format
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "デフォルトでは、Hibernateは通常のPOJOモードで動作します。 "
 "<literal>default_entity_mode</literal> 設定オプションを使って、 特定の "
@@ -567,19 +576,19 @@
 "\"/> を見てください)。"
 
 #. Tag: para
-#: persistent_classes.xml:234
-#, no-c-format
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "以下の例では <literal>Map</literal> を使った表現を紹介します。 まずマッピング"
 "ファイルで、クラス名の代わりに(またはそれに加えて) <literal>entity-name</"
 "literal> を定義しなければなりません:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:240
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -618,22 +627,21 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:242
-#, no-c-format
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "関連がターゲットのクラス名を使って定義していたとしても、 関連のターゲット型も"
 "POJOではなく動的なエンティティでも構わないことに注意してください。"
 
 #. Tag: para
-#: persistent_classes.xml:249
-#, no-c-format
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "<literal>SessionFactory</literal> に対してデフォルトのエンティティモードを "
@@ -641,7 +649,7 @@
 "literal> の <literal>Map</literal> を使うことができます:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:255
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -668,14 +676,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:257
-#, no-c-format
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "動的なマッピングの利点は、エンティティクラスの実装を必要としないため、 プロト"
@@ -686,7 +694,7 @@
 "ます。"
 
 #. Tag: para
-#: persistent_classes.xml:265
+#: persistent_classes.xml:292
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -696,7 +704,7 @@
 "です。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:270
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -714,14 +722,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
-#, no-c-format
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -736,7 +744,7 @@
 "of Work)に任せることができるということです。"
 
 #. Tag: para
-#: persistent_classes.xml:283
+#: persistent_classes.xml:310
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -746,29 +754,24 @@
 "す。"
 
 #. Tag: title
-#: persistent_classes.xml:291
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr "Tuplizer"
 
 #. Tag: para
-#: persistent_classes.xml:293
-#, no-c-format
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal> とそのサブインターフェイス"
 "は、 表現の <literal>org.hibernate.EntityMode</literal> を利用して、 データ断"
@@ -785,17 +788,29 @@
 "literal> はコンポーネントに関する契約の管理に責任を持ちます。"
 
 #. Tag: para
-#: persistent_classes.xml:308
+#: persistent_classes.xml:330
 #, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "ユーザは独自のTuplizerに差し替えることも可能です。 おそらくdynamic-map "
 "entity-modeの際に <literal>java.util.HashMap</literal> を使うのではなく、 "
@@ -806,7 +821,7 @@
 "ンティティの例に戻ると:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:317
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -846,11 +861,195 @@
 "}]]>"
 msgstr ""
 
+#. Tag: title
+#: persistent_classes.xml:354
+#, no-c-format
+msgid "EntityNameResolvers"
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:322
+#: persistent_classes.xml:356
 #, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
 msgstr ""
-"TODO: プロパティとプロキシパッケージのユーザ拡張フレームワークを文書化するこ"
-"と"
+
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "従うべき4つのルールがあります:"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr ""
+#~ "TODO: プロパティとプロキシパッケージのユーザ拡張フレームワークを文書化する"
+#~ "こと"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: preface.xml:21
+#: preface.xml:29
 #, no-c-format
 msgid "Preface"
 msgstr "前書き"
 
 #. Tag: para
-#: preface.xml:23
-#, no-c-format
+#: preface.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -34,13 +34,13 @@
 "ルデータモデルへと、 データ表現をマッピングする(対応付ける)技術のことです。"
 
 #. Tag: para
-#: preface.xml:31
-#, no-c-format
+#: preface.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "HibernateはJavaクラスからデータベーステーブルへ(そしてJavaデータ型からSQL"
 "データ型へ) のマッピングを処理するだけではなく、データのクエリと復元の仕組み"
@@ -48,10 +48,10 @@
 "いた開発時間を大幅に削減できます。"
 
 #. Tag: para
-#: preface.xml:38
-#, no-c-format
+#: preface.xml:46
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -69,7 +69,7 @@
 "トを変換するなどの、 一般的なタスクにも役立つでしょう。"
 
 #. Tag: para
-#: preface.xml:48
+#: preface.xml:56
 #, no-c-format
 msgid ""
 "If you are new to Hibernate and Object/Relational Mapping or even Java, "
@@ -79,7 +79,7 @@
 "は、以下のステップに従ってください:"
 
 #. Tag: para
-#: preface.xml:55
+#: preface.xml:63
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"tutorial\"/> for a tutorial with step-by-step "
@@ -91,7 +91,7 @@
 "reference/tutorial</literal> ディレクトリに含まれています。"
 
 #. Tag: para
-#: preface.xml:63
+#: preface.xml:71
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
@@ -101,15 +101,15 @@
 "てください。"
 
 #. Tag: para
-#: preface.xml:69
-#, no-c-format
+#: preface.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "Hibernateディストリビューションの <literal>eg/</literal> ディレクトリを見てく"
 "ださい。 簡単なスタンドアローンのアプリケーションがあります。 JDBCドライバを "
@@ -120,15 +120,15 @@
 "環境では <literal>build eg</literal> とタイプしてください。"
 
 #. Tag: para
-#: preface.xml:80
-#, no-c-format
+#: preface.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr ""
 "このリファレンスドキュメントを第一の情報源として利用してください。 アプリケー"
 "ション設計についてのさらなる情報や段階的なチュートリアルを探しているなら、 "
@@ -137,23 +137,23 @@
 "Persistence with Hibernateの例題のアプリケーションをダウンロードできます。"
 
 #. Tag: para
-#: preface.xml:90
+#: preface.xml:98
 #, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr "FAQはHibernateウェブサイトにあります。"
 
 #. Tag: para
-#: preface.xml:95
-#, no-c-format
+#: preface.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr ""
 "サードパーティのデモ、例、チュートリアルはHibernateウェブサイトにリンクがあり"
 "ます。"
 
 #. Tag: para
-#: preface.xml:101
+#: preface.xml:109
 #, no-c-format
 msgid ""
 "The Community Area on the Hibernate website is a good resource for design "
@@ -165,11 +165,11 @@
 "す。"
 
 #. Tag: para
-#: preface.xml:109
-#, no-c-format
+#: preface.xml:117
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."
@@ -181,7 +181,7 @@
 "リストで私たちにコンタクトを取ってください。"
 
 #. Tag: para
-#: preface.xml:117
+#: preface.xml:125
 #, no-c-format
 msgid ""
 "Commercial development support, production support, and training for "

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_criteria.xml:5
+#: query_criteria.xml:29
 #, no-c-format
 msgid "Criteria Queries"
 msgstr "Criteriaクエリ"
 
 #. Tag: para
-#: query_criteria.xml:7
+#: query_criteria.xml:31
 #, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr "Hibernateには、直感的で拡張可能なcriteriaクエリAPIが用意されています。"
 
 #. Tag: title
-#: query_criteria.xml:12
+#: query_criteria.xml:36
 #, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr "<literal>Criteria</literal> インスタンスの作成"
 
 #. Tag: para
-#: query_criteria.xml:14
+#: query_criteria.xml:38
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.Criteria</literal> represents a query "
@@ -41,7 +41,7 @@
 "<literal>Criteria</literal> インスタンスのファクトリです。"
 
 #. Tag: programlisting
-#: query_criteria.xml:20
+#: query_criteria.xml:44
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = sess.createCriteria(Cat.class);\n"
@@ -50,13 +50,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:25
+#: query_criteria.xml:49
 #, no-c-format
 msgid "Narrowing the result set"
 msgstr "リザルトセットの絞込み"
 
 #. Tag: para
-#: query_criteria.xml:27
+#: query_criteria.xml:51
 #, no-c-format
 msgid ""
 "An individual query criterion is an instance of the interface <literal>org."
@@ -71,7 +71,7 @@
 "ています。"
 
 #. Tag: programlisting
-#: query_criteria.xml:35
+#: query_criteria.xml:59
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -81,13 +81,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:37
-#, no-c-format
-msgid "Restrictions may be grouped logically."
+#: query_criteria.xml:61
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "Restriction(限定)は、論理的にグループ化できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:41
+#: query_criteria.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -100,7 +100,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:43
+#: query_criteria.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -116,18 +116,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:45
-#, no-c-format
+#: query_criteria.xml:69
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "元々あるCriterion型(<literal>Restrictions</literal> のサブクラス) はかなり"
 "の範囲に及びますが、特に有用なのはSQLを直接指定できるものです。"
 
 #. Tag: programlisting
-#: query_criteria.xml:50
+#: query_criteria.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -137,7 +137,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:52
+#: query_criteria.xml:76
 #, no-c-format
 msgid ""
 "The <literal>{alias}</literal> placeholder with be replaced by the row alias "
@@ -147,19 +147,19 @@
 "ティティの行の別名によって置き換えられます。"
 
 #. Tag: para
-#: query_criteria.xml:57
-#, no-c-format
+#: query_criteria.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "criterionを得る別の手段は、 <literal>Property</literal> インスタンスから取得"
 "することです。 <literal>Property.forName()</literal> を呼び出して、 "
 "<literal>Property</literal> インスタンスを作成できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:63
+#: query_criteria.xml:87
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -177,23 +177,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:68
+#: query_criteria.xml:92
 #, no-c-format
 msgid "Ordering the results"
 msgstr "結果の整列"
 
 #. Tag: para
-#: query_criteria.xml:70
-#, no-c-format
+#: query_criteria.xml:94
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "<literal>org.hibernate.criterion.Order</literal> を使って結果を並び替えること"
 "ができます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:74
+#: query_criteria.xml:98
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -205,7 +205,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:76
+#: query_criteria.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -217,23 +217,21 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:81
+#: query_criteria.xml:105
 #, no-c-format
 msgid "Associations"
 msgstr "関連"
 
 #. Tag: para
-#: query_criteria.xml:83
+#: query_criteria.xml:107
 #, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"<literal>createCriteria()</literal> を使い、関連をナビゲートすることで、 容易"
-"に関係するエンティティに制約を指定できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:88
+#: query_criteria.xml:112
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -244,11 +242,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:90
-#, no-c-format
+#: query_criteria.xml:114
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "2番目の <literal>createCriteria()</literal> は、<literal>kittens</literal> コ"
@@ -256,13 +254,14 @@
 "すことに注意してください。"
 
 #. Tag: para
-#: query_criteria.xml:96
-#, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+#: query_criteria.xml:120
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "以下のような方法も、状況により有用です。"
 
 #. Tag: programlisting
-#: query_criteria.xml:100
+#: query_criteria.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -273,7 +272,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:102
+#: query_criteria.xml:126
 #, no-c-format
 msgid ""
 "(<literal>createAlias()</literal> does not create a new instance of "
@@ -283,12 +282,12 @@
 "スタンスを作成しません。)"
 
 #. Tag: para
-#: query_criteria.xml:107
-#, no-c-format
+#: query_criteria.xml:131
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "前の2つのクエリによって返される <literal>Cat</literal> インスタンスによって保"
@@ -298,7 +297,7 @@
 "なりません。"
 
 #. Tag: programlisting
-#: query_criteria.xml:114
+#: query_criteria.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -315,23 +314,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:119
+#: query_criteria.xml:143
 #, no-c-format
 msgid "Dynamic association fetching"
 msgstr "関連の動的フェッチ"
 
 #. Tag: para
-#: query_criteria.xml:121
-#, no-c-format
+#: query_criteria.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "<literal>setFetchMode()</literal> を使い、 実行時に関連の復元方法を指定しても"
 "よいです。"
 
 #. Tag: programlisting
-#: query_criteria.xml:126
+#: query_criteria.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -342,7 +341,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:128
+#: query_criteria.xml:152
 #, no-c-format
 msgid ""
 "This query will fetch both <literal>mate</literal> and <literal>kittens</"
@@ -354,13 +353,13 @@
 "\"performance-fetching\"/> を参照してください。"
 
 #. Tag: title
-#: query_criteria.xml:136
+#: query_criteria.xml:160
 #, no-c-format
 msgid "Example queries"
 msgstr "クエリの例"
 
 #. Tag: para
-#: query_criteria.xml:138
+#: query_criteria.xml:162
 #, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Example</literal> allows you to "
@@ -370,7 +369,7 @@
 "スタンスからクエリクライテリオンを構築できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:143
+#: query_criteria.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
@@ -382,7 +381,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:145
+#: query_criteria.xml:169
 #, no-c-format
 msgid ""
 "Version properties, identifiers and associations are ignored. By default, "
@@ -392,14 +391,14 @@
 "パティは除外されます。"
 
 #. Tag: para
-#: query_criteria.xml:150
+#: query_criteria.xml:174
 #, no-c-format
 msgid "You can adjust how the <literal>Example</literal> is applied."
 msgstr ""
 "どのように <literal>Example</literal> を適用するか 調整することができます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:154
+#: query_criteria.xml:178
 #, no-c-format
 msgid ""
 "<![CDATA[Example example = Example.create(cat)\n"
@@ -414,14 +413,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:156
+#: query_criteria.xml:180
 #, no-c-format
 msgid "You can even use examples to place criteria upon associated objects."
 msgstr ""
 "関連オブジェクトにcriteriaを指定するために、Exampleを使うことも可能です。"
 
 #. Tag: programlisting
-#: query_criteria.xml:160
+#: query_criteria.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -432,18 +431,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:165
+#: query_criteria.xml:189
 #, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr "射影、集約、グループ化"
 
 #. Tag: para
-#: query_criteria.xml:166
-#, no-c-format
+#: query_criteria.xml:190
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "<literal>org.hibernate.criterion.Projections</literal> クラスは "
 "<literal>Projection</literal> インスタンスのファクトリです。 "
@@ -451,7 +450,7 @@
 "す。"
 
 #. Tag: programlisting
-#: query_criteria.xml:172
+#: query_criteria.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -461,7 +460,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:174
+#: query_criteria.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -475,7 +474,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:176
+#: query_criteria.xml:200
 #, no-c-format
 msgid ""
 "There is no explicit \"group by\" necessary in a criteria query. Certain "
@@ -487,18 +486,18 @@
 "の <literal>group by</literal> 節にも現れます。"
 
 #. Tag: para
-#: query_criteria.xml:182
-#, no-c-format
+#: query_criteria.xml:206
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "任意で射影に別名を付けられるため、射影される値はrestrictionやordering内から参"
 "照できます。 別名をつける2つの異なる方法を示します。"
 
 #. Tag: programlisting
-#: query_criteria.xml:188
+#: query_criteria.xml:212
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -509,7 +508,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:190
+#: query_criteria.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -519,7 +518,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:192
+#: query_criteria.xml:216
 #, no-c-format
 msgid ""
 "The <literal>alias()</literal> and <literal>as()</literal> methods simply "
@@ -533,7 +532,7 @@
 "けられます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:199
+#: query_criteria.xml:223
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -549,7 +548,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:201
+#: query_criteria.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Domestic.class, \"cat\")\n"
@@ -564,7 +563,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:203
+#: query_criteria.xml:227
 #, no-c-format
 msgid ""
 "You can also use <literal>Property.forName()</literal> to express "
@@ -572,7 +571,7 @@
 msgstr "射影の式に <literal>Property.forName()</literal> も使用できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:207
+#: query_criteria.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -582,7 +581,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:209
+#: query_criteria.xml:233
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -598,25 +597,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:214
+#: query_criteria.xml:238
 #, no-c-format
 msgid "Detached queries and subqueries"
 msgstr "クエリおよびサブクエリの分離"
 
 #. Tag: para
-#: query_criteria.xml:215
-#, no-c-format
+#: query_criteria.xml:239
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal> クラスにより、 セッションスコープ外にクエ"
 "リを作成できます。 後で、任意の <literal>Session</literal> を使って、実行でき"
 "ます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:220
+#: query_criteria.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria query = DetachedCriteria.forClass(Cat.class)\n"
@@ -631,11 +630,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:222
-#, no-c-format
+#: query_criteria.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal> は、サブクエリを表現するためにも使えま"
@@ -643,7 +642,7 @@
 "もしくは <literal>Property</literal> から得られます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:228
+#: query_criteria.xml:252
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)\n"
@@ -654,7 +653,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:230
+#: query_criteria.xml:254
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
@@ -665,13 +664,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:232
-#, no-c-format
-msgid "Even correlated subqueries are possible:"
+#: query_criteria.xml:256
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "相互関係があるサブクエリでさえも可能です。"
 
 #. Tag: programlisting
-#: query_criteria.xml:236
+#: query_criteria.xml:260
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
@@ -684,18 +683,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:245
+#: query_criteria.xml:269
 #, no-c-format
 msgid "Queries by natural identifier"
 msgstr "自然識別子によるクエリ"
 
 #. Tag: para
-#: query_criteria.xml:247
-#, no-c-format
+#: query_criteria.xml:271
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -708,17 +707,17 @@
 "criteria APIは特別な対策を提供します。"
 
 #. Tag: para
-#: query_criteria.xml:255
-#, no-c-format
+#: query_criteria.xml:279
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "最初に、<literal>&lt;natural-id&gt;</literal> を使って、 エンティティの自然"
 "キーをマップしてください。 そして、二次キャッシュを有効にします。"
 
 #. Tag: programlisting
-#: query_criteria.xml:260
+#: query_criteria.xml:284
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
@@ -735,33 +734,28 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:262
-#, no-c-format
+#: query_criteria.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr ""
 "注意: <emphasis>変更される</emphasis> 自然キーを持つエンティティに この機能"
 "を使うのは、意図されていない使い方です。"
 
 #. Tag: para
-#: query_criteria.xml:267
-#, no-c-format
-msgid "Next, enable the Hibernate query cache."
-msgstr "次に、Hibernateクエリキャッシュを有効にします。"
-
-#. Tag: para
-#: query_criteria.xml:271
-#, no-c-format
+#: query_criteria.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "これで、<literal>Restrictions.naturalId()</literal> により、 より効率的な"
 "キャッシュアルゴリズムを使用できます。"
 
 #. Tag: programlisting
-#: query_criteria.xml:276
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
@@ -771,3 +765,13 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 msgstr ""
+
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "<literal>createCriteria()</literal> を使い、関連をナビゲートすることで、 "
+#~ "容易に関係するエンティティに制約を指定できます。"
+
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "次に、Hibernateクエリキャッシュを有効にします。"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,39 +11,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_hql.xml:5
+#: query_hql.xml:29
 #, no-c-format
 msgid "HQL: The Hibernate Query Language"
 msgstr "HQL: The Hibernate Query Language"
 
 #. Tag: para
-#: query_hql.xml:7
-#, no-c-format
+#: query_hql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "HibernateはSQLに非常によく似た(意図的に似せた)強力な問い合わせ言語を備えてい"
 "ます。 しかしSQLに似た構文に惑わされないでください。HQLは完全にオブジェクト指"
 "向であり、 継承、ポリモーフィズム、関連といった概念を理解します。"
 
 #. Tag: title
-#: query_hql.xml:14
+#: query_hql.xml:38
 #, no-c-format
 msgid "Case Sensitivity"
 msgstr "大文字と小文字の区別"
 
 #. Tag: para
-#: query_hql.xml:16
-#, no-c-format
+#: query_hql.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "クエリはJavaのクラス名とプロパティ名を除いて大文字、小文字を区別しません。 "
 "従って <literal>SeLeCT</literal> は <literal>sELEct</literal> と同じで、かつ "
@@ -52,42 +51,42 @@
 "<literal>foo.barSet</literal> は <literal>foo.BARSET</literal> とも違います。"
 
 #. Tag: para
-#: query_hql.xml:27
-#, no-c-format
+#: query_hql.xml:51
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "このマニュアルでは小文字のHQLキーワードを使用します。 大文字のキーワードのク"
 "エリの方が読みやすいと感じるユーザーもいると思います。 ですが、Javaコード内に"
 "埋め込まれたときには見づらいと思います。"
 
 #. Tag: title
-#: query_hql.xml:35
+#: query_hql.xml:59
 #, no-c-format
 msgid "The from clause"
 msgstr "from節"
 
 #. Tag: para
-#: query_hql.xml:37
+#: query_hql.xml:61
 #, no-c-format
 msgid "The simplest possible Hibernate query is of the form:"
 msgstr "もっとも単純なHibernateクエリは次の形式です。"
 
 #. Tag: programlisting
-#: query_hql.xml:41
+#: query_hql.xml:65
 #, no-c-format
 msgid "<![CDATA[from eg.Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:43
-#, no-c-format
+#: query_hql.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "これは単純に <literal>eg.Cat</literal> クラスのインスタンスをすべて返しま"
 "す。 必ずしもクラス名を修飾する(クラスにパッケージ名を付ける)必要はありませ"
@@ -95,35 +94,32 @@
 "です。 そのためほとんどの場合、このように書くだけで十分です。"
 
 #. Tag: programlisting
-#: query_hql.xml:49
+#: query_hql.xml:73
 #, no-c-format
 msgid "<![CDATA[from Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:51
+#: query_hql.xml:75
 #, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"ほとんどの場合クエリのほかの部分で <literal>Cat</literal> を参照するので、"
-"別名を割り当てる必要があるでしょう。"
 
 #. Tag: programlisting
-#: query_hql.xml:57 query_hql.xml:372
+#: query_hql.xml:81 query_hql.xml:396
 #, no-c-format
 msgid "<![CDATA[from Cat as cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:59
-#, no-c-format
+#: query_hql.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "このクエリでは <literal>Cat</literal> インスタンスに <literal>cat</literal> "
 "という別名を付けています。 そのため、後でこのクエリ内で、この別名を使うことが"
@@ -131,60 +127,60 @@
 "書くこともできます:"
 
 #. Tag: programlisting
-#: query_hql.xml:65
+#: query_hql.xml:89
 #, no-c-format
 msgid "<![CDATA[from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:67
-#, no-c-format
+#: query_hql.xml:91
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr "直積、あるいはクロス結合によって多数のクラスが出現することもあります。"
 
 #. Tag: programlisting
-#: query_hql.xml:71
+#: query_hql.xml:95
 #, no-c-format
 msgid "<![CDATA[from Formula, Parameter]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:72
+#: query_hql.xml:96
 #, no-c-format
 msgid "<![CDATA[from Formula as form, Parameter as param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:74
-#, no-c-format
+#: query_hql.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "ローカル変数のJavaのネーミング基準と一致した、 頭文字に小文字を使ったクエリの"
 "別名を付けることはいい習慣です(例えば <literal>domesticCat</literal> )。"
 
 #. Tag: title
-#: query_hql.xml:83
+#: query_hql.xml:107
 #, no-c-format
 msgid "Associations and joins"
 msgstr "関連と結合"
 
 #. Tag: para
-#: query_hql.xml:85
-#, no-c-format
+#: query_hql.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "関連するエンティティあるいは値コレクションの要素にも、<literal>結合</"
 "literal> を使って別名を割り当てることが出来ます。"
 
 #. Tag: programlisting
-#: query_hql.xml:90
+#: query_hql.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -193,49 +189,49 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:92
+#: query_hql.xml:116
 #, no-c-format
 msgid "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:94
+#: query_hql.xml:118
 #, no-c-format
 msgid "<![CDATA[from Formula form full join form.parameter param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:96
-#, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+#: query_hql.xml:120
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "サポートしている結合のタイプはANSI SQLと同じです。"
 
 #. Tag: literal
-#: query_hql.xml:103
+#: query_hql.xml:127
 #, no-c-format
 msgid "inner join"
 msgstr "inner join"
 
 #. Tag: literal
-#: query_hql.xml:108
+#: query_hql.xml:132
 #, no-c-format
 msgid "left outer join"
 msgstr "left outer join"
 
 #. Tag: literal
-#: query_hql.xml:113
+#: query_hql.xml:137
 #, no-c-format
 msgid "right outer join"
 msgstr "right outer join"
 
 #. Tag: para
-#: query_hql.xml:117
+#: query_hql.xml:141
 #, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr "<literal>full join</literal> (たいていの場合使いづらい)"
 
 #. Tag: para
-#: query_hql.xml:123
+#: query_hql.xml:147
 #, no-c-format
 msgid ""
 "The <literal>inner join</literal>, <literal>left outer join</literal> and "
@@ -245,7 +241,7 @@
 "<literal>right outer join</literal>には省略形を使うこともできます。"
 
 #. Tag: programlisting
-#: query_hql.xml:128
+#: query_hql.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -254,7 +250,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:130
+#: query_hql.xml:154
 #, no-c-format
 msgid ""
 "You may supply extra join conditions using the HQL <literal>with</literal> "
@@ -264,7 +260,7 @@
 "できます。"
 
 #. Tag: programlisting
-#: query_hql.xml:135
+#: query_hql.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -273,15 +269,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:137
-#, no-c-format
+#: query_hql.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "加えて、「フェッチ」結合は関連や値のコレクションを親オブジェクトと一緒に1度の"
 "select句で初期化します。 これは特にコレクションの場合に有用です。これは実質"
@@ -290,7 +286,7 @@
 "より多くの情報があります。"
 
 #. Tag: programlisting
-#: query_hql.xml:145
+#: query_hql.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -299,14 +295,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:147
-#, no-c-format
+#: query_hql.xml:171
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "結合によるフェッチは関連するオブジェクトが <literal>where</literal> 節(または"
@@ -316,7 +312,7 @@
 "場合のみ、別名が必要になります。"
 
 #. Tag: programlisting
-#: query_hql.xml:155
+#: query_hql.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -326,23 +322,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:157
-#, no-c-format
+#: query_hql.xml:181
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "<literal>fetch</literal> 構文は <literal>iterate()</literal> を使ったクエリ呼"
 "び出しで使用できないことに注意してください (一方で <literal>scroll()</"
@@ -360,12 +356,12 @@
 "さい。"
 
 #. Tag: para
-#: query_hql.xml:172
-#, no-c-format
+#: query_hql.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "もしプロパティレベルの遅延フェッチを使う場合(内部的にバイトコード処理をする"
@@ -373,13 +369,13 @@
 "プロパティを速やかに(最初のクエリで)フェッチさせることができます。"
 
 #. Tag: programlisting
-#: query_hql.xml:178
+#: query_hql.xml:202
 #, no-c-format
 msgid "<![CDATA[from Document fetch all properties order by name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:179
+#: query_hql.xml:203
 #, no-c-format
 msgid ""
 "<![CDATA[from Document doc fetch all properties where lower(doc.name) like '%"
@@ -387,13 +383,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:184
+#: query_hql.xml:208
 #, no-c-format
 msgid "Forms of join syntax"
 msgstr "結合構文の形式"
 
 #. Tag: para
-#: query_hql.xml:186
+#: query_hql.xml:210
 #, no-c-format
 msgid ""
 "HQL supports two forms of association joining: <literal>implicit</literal> "
@@ -403,19 +399,19 @@
 "<literal>明示的</literal>。"
 
 #. Tag: para
-#: query_hql.xml:190
-#, no-c-format
+#: query_hql.xml:214
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "これまでのセクションでお見せした使い方はすべて <literal>明示的な</literal> 形"
 "式で、 from節で明示的にjoinキーワードを使っています。 この形式をおすすめしま"
 "す。"
 
 #. Tag: para
-#: query_hql.xml:195
+#: query_hql.xml:219
 #, no-c-format
 msgid ""
 "The <literal>implicit</literal> form does not use the join keyword. Instead, "
@@ -429,33 +425,31 @@
 "トの内部結合結果です。"
 
 #. Tag: programlisting
-#: query_hql.xml:202
+#: query_hql.xml:226
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:206
-#, no-c-format
-msgid "Refering to identifier property"
+#: query_hql.xml:230
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
-#: query_hql.xml:208
-#, no-c-format
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#: query_hql.xml:232
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
 "property:"
 
 #. Tag: para
-#: query_hql.xml:213
-#, no-c-format
+#: query_hql.xml:237
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -463,23 +457,23 @@
 "entity does not define a non-identifier property named id</emphasis>."
 
 #. Tag: para
-#: query_hql.xml:220
-#, no-c-format
+#: query_hql.xml:244
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "If the entity defines a named identifier property, you may use that property "
 "name."
 
 #. Tag: para
-#: query_hql.xml:226
-#, no-c-format
+#: query_hql.xml:250
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "References to composite identifier properties follow the same naming rules. "
@@ -489,14 +483,14 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:233
+#: query_hql.xml:258
 #, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
 "versions, <literal>id</literal><emphasis>always</emphasis> referred to the "
@@ -505,23 +499,23 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:242
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr "Select節"
 
 #. Tag: para
-#: query_hql.xml:244
-#, no-c-format
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "<literal>select</literal> 節は以下のようにどのオブジェクトと属性をクエリリザ"
 "ルトセットに返すかを選択します。:"
 
 #. Tag: programlisting
-#: query_hql.xml:249
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -530,33 +524,33 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:251
-#, no-c-format
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "上記のクエリは他の <literal>Cat</literal> の <literal>mate</literal> を選択し"
 "ます。 実際には次のように、より簡潔に表現できます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:256
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:258
-#, no-c-format
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "クエリはコンポーネント型のプロパティを含む、あらゆる値型のプロパティも返せま"
 "す。:"
 
 #. Tag: programlisting
-#: query_hql.xml:262
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -564,23 +558,23 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:264
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:266
-#, no-c-format
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "クエリは複数のオブジェクトと(または)プロパティを <literal>Object[]</literal> "
 "型の配列として返せます。"
 
 #. Tag: programlisting
-#: query_hql.xml:271
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -590,13 +584,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:273
-#, no-c-format
-msgid "or as a <literal>List</literal>,"
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "もしくは <literal>List</literal> として、"
 
 #. Tag: programlisting
-#: query_hql.xml:277
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -606,13 +600,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:279
-#, no-c-format
-msgid "or as an actual typesafe Java object,"
-msgstr "または、タイプセーフなJavaオブジェクトを返せます。"
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr ""
+"あるいは <literal>Family</literal> クラスが適切なコンストラクタを持っていると"
+"するならば、"
 
 #. Tag: programlisting
-#: query_hql.xml:283
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -622,24 +620,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:285
-#, no-c-format
+#: query_hql.xml:313
+#, fuzzy, no-c-format
 msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
-msgstr ""
-"あるいは <literal>Family</literal> クラスが適切なコンストラクタを持っていると"
-"するならば、"
-
-#. Tag: para
-#: query_hql.xml:289
-#, no-c-format
-msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr "select節に <literal>as</literal> を使って別名をつけることもできます。"
 
 #. Tag: programlisting
-#: query_hql.xml:293
+#: query_hql.xml:317
 #, no-c-format
 msgid ""
 "<![CDATA[select max(bodyWeight) as max, min(bodyWeight) as min, count(*) as "
@@ -648,7 +636,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:295
+#: query_hql.xml:319
 #, no-c-format
 msgid ""
 "This is most useful when used together with <literal>select new map</"
@@ -656,7 +644,7 @@
 msgstr "<literal>select new map</literal> と一緒に使うときに最も役立ちます:"
 
 #. Tag: programlisting
-#: query_hql.xml:299
+#: query_hql.xml:323
 #, no-c-format
 msgid ""
 "<![CDATA[select new map( max(bodyWeight) as max, min(bodyWeight) as min, "
@@ -665,27 +653,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:301
+#: query_hql.xml:325
 #, no-c-format
 msgid ""
 "This query returns a <literal>Map</literal> from aliases to selected values."
 msgstr "このクエリは別名からselectした値へ <literal>Map</literal> を返します。"
 
 #. Tag: title
-#: query_hql.xml:308
+#: query_hql.xml:332
 #, no-c-format
 msgid "Aggregate functions"
 msgstr "集約関数"
 
 #. Tag: para
-#: query_hql.xml:310
-#, no-c-format
+#: query_hql.xml:334
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr "HQLのクエリはプロパティの集約関数の結果も返せます:"
 
 #. Tag: programlisting
-#: query_hql.xml:314
+#: query_hql.xml:338
 #, no-c-format
 msgid ""
 "<![CDATA[select avg(cat.weight), sum(cat.weight), max(cat.weight), count"
@@ -694,40 +682,40 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:325
-#, no-c-format
-msgid "The supported aggregate functions are"
+#: query_hql.xml:349
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "サポートしている集約関数は以下のものです。"
 
 #. Tag: literal
-#: query_hql.xml:332
+#: query_hql.xml:356
 #, no-c-format
 msgid "avg(...), sum(...), min(...), max(...)"
 msgstr "avg(...), sum(...), min(...), max(...)"
 
 #. Tag: literal
-#: query_hql.xml:337
+#: query_hql.xml:361
 #, no-c-format
 msgid "count(*)"
 msgstr "count(*)"
 
 #. Tag: literal
-#: query_hql.xml:342
+#: query_hql.xml:366
 #, no-c-format
 msgid "count(...), count(distinct ...), count(all...)"
 msgstr "count(...), count(distinct ...), count(all...)"
 
 #. Tag: para
-#: query_hql.xml:347
-#, no-c-format
+#: query_hql.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr ""
 "select節において算術操作、連結と承認されたSQL関数を使うことができます。"
 
 #. Tag: programlisting
-#: query_hql.xml:352
+#: query_hql.xml:376
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
@@ -737,24 +725,24 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:354
+#: query_hql.xml:378
 #, no-c-format
 msgid ""
 "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from Person]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:356
-#, no-c-format
+#: query_hql.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "SQLと同じ意味を持つ <literal>distinct</literal> と <literal>all</literal> "
 "キーワードを使うことができます。"
 
 #. Tag: programlisting
-#: query_hql.xml:361
+#: query_hql.xml:385
 #, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
@@ -763,23 +751,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:366
+#: query_hql.xml:390
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "ポリモーフィックなクエリ"
 
 #. Tag: para
-#: query_hql.xml:368
+#: query_hql.xml:392
 #, no-c-format
 msgid "A query like:"
 msgstr "次のようなクエリ:"
 
 #. Tag: para
-#: query_hql.xml:374
-#, no-c-format
+#: query_hql.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -792,13 +780,13 @@
 "た全ての永続クラスを返します。 次のクエリは永続オブジェクトをすべて返します:"
 
 #. Tag: programlisting
-#: query_hql.xml:382
+#: query_hql.xml:406
 #, no-c-format
 msgid "<![CDATA[from java.lang.Object o]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:384
+#: query_hql.xml:408
 #, no-c-format
 msgid ""
 "The interface <literal>Named</literal> might be implemented by various "
@@ -808,19 +796,19 @@
 "す。:"
 
 #. Tag: programlisting
-#: query_hql.xml:389
+#: query_hql.xml:413
 #, no-c-format
 msgid "<![CDATA[from Named n, Named m where n.name = m.name]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:391
-#, no-c-format
+#: query_hql.xml:415
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "最後の二つのクエリは、二つ以上のSQL <literal>SELECT</literal> を要求している"
 "ことに注意してください。 このことは <literal>order by</literal> 節がリザルト"
@@ -829,47 +817,53 @@
 "す。)。"
 
 #. Tag: title
-#: query_hql.xml:400
+#: query_hql.xml:424
 #, no-c-format
 msgid "The where clause"
 msgstr "where節"
 
 #. Tag: para
-#: query_hql.xml:402
-#, no-c-format
+#: query_hql.xml:426
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "<literal>where</literal> 節は返されるインスタンスのリストを絞ることができま"
 "す。 もし別名がない場合、名前でプロパティを参照します。"
 
 #. Tag: programlisting
-#: query_hql.xml:407
+#: query_hql.xml:431
 #, no-c-format
 msgid "<![CDATA[from Cat where name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:409
+#: query_hql.xml:433
 #, no-c-format
 msgid "If there is an alias, use a qualified property name:"
 msgstr "もし別名がある場合、修飾名を使ってください。"
 
 #. Tag: programlisting
-#: query_hql.xml:413
+#: query_hql.xml:437
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:415
-#, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#: query_hql.xml:439
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "名前が'Fritz'という <literal>Cat</literal> のインスタンスを返します。"
 
+#. Tag: para
+#: query_hql.xml:443
+#, no-c-format
+msgid "The following query:"
+msgstr ""
+
 #. Tag: programlisting
-#: query_hql.xml:419
+#: query_hql.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
@@ -878,14 +872,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:421
-#, no-c-format
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "上のHQLは、<literal>Foo</literal> の <literal>startDate</literal> プロパティ"
 "と等しい <literal>date</literal> プロパティを持った <literal>bar</literal> イ"
@@ -894,23 +888,22 @@
 "literal> 節を非常に強力にします。注目:"
 
 #. Tag: programlisting
-#: query_hql.xml:430
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:432
-#, no-c-format
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "このクエリはテーブル結合(内部結合)を持つSQLクエリに変換されます。 その代わ"
 "りに以下のように書くと、"
 
 #. Tag: programlisting
-#: query_hql.xml:437
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -918,32 +911,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:439
-#, no-c-format
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 "もし上のクエリを記述したらクエリ内に4つのテーブル結合を必要とするSQLクエリに"
 "変換されます。"
 
 #. Tag: para
-#: query_hql.xml:443
-#, no-c-format
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "<literal>=</literal> 演算子は以下のように、プロパティだけでなくインスタンスを"
 "比較するためにも使われます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:448
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:450
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -952,10 +944,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:452
-#, no-c-format
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -964,7 +956,7 @@
 "す。)"
 
 #. Tag: programlisting
-#: query_hql.xml:458
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -973,27 +965,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:460
-#, no-c-format
-msgid "The second query is efficient. No table join is required!"
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr "2番目のクエリは効率的です。テーブル結合が必要ありません!"
 
 #. Tag: para
-#: query_hql.xml:464
-#, no-c-format
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "また複合識別子のプロパティも使用できます。ここで <literal>Person</literal> "
 "が <literal>country</literal> と <literal>medicareNumber</literal> からなる複"
 "合識別子を持つと仮定します。"
 
 #. Tag: programlisting
-#: query_hql.xml:471
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -1002,7 +992,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:473
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -1011,37 +1001,45 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:475
-#, no-c-format
-msgid "Once again, the second query requires no table join."
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr "もう一度言いますが、2番目のクエリにはテーブル結合が必要ありません。"
 
 #. Tag: para
-#: query_hql.xml:479
+#: query_hql.xml:505
 #, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "同様に <literal>class</literal> は特別なプロパティであり、 ポリモーフィックな"
 "永続化におけるインスタンスのdiscriminator値にアクセスします。 where節に埋め込"
 "まれたJavaのクラス名はそのdiscriminator値に変換されます。"
 
 #. Tag: programlisting
-#: query_hql.xml:485
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:487
-#, no-c-format
+#: query_hql.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "またコンポーネントや複合ユーザ型(またそのコンポーネントのコンポーネントなど)"
 "のプロパティも指定できます。 しかし決して(コンポーネントのプロパティではな"
@@ -1050,13 +1048,13 @@
 "ントを持つエンティティならば以下のような結果となります。"
 
 #. Tag: para
-#: query_hql.xml:492
-#, no-c-format
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "\"any\"型は特別なプロパティである <literal>id</literal> と <literal>class</"
 "literal> を持ち、 以下の方法で結合を表現することを可能にします"
@@ -1064,7 +1062,7 @@
 "ングされたプロパティです)。"
 
 #. Tag: programlisting
-#: query_hql.xml:498
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1072,61 +1070,61 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:500
-#, no-c-format
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "<literal>log.item.class</literal> と <literal>payment.class</literal> が 上記"
 "のクエリ中で全く異なるデータベースカラムの値を参照するということに注意してく"
 "ださい。"
 
 #. Tag: title
-#: query_hql.xml:508
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr "Expressions 式"
 
 #. Tag: para
-#: query_hql.xml:510
-#, no-c-format
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "SQLの <literal>where</literal> 節で記述することが出来る式のほとんどをHQLでも"
 "記述できます。:"
 
 #. Tag: para
-#: query_hql.xml:517
-#, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "算術演算子:<literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:522
-#, no-c-format
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr "2項比較演算子:<literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
 
 #. Tag: para
-#: query_hql.xml:527
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "論理演算子:<literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:532
-#, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "グループ分けを表す括弧:<literal>( )</literal>"
 
 #. Tag: para
-#: query_hql.xml:537
+#: query_hql.xml:568
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1140,7 +1138,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:550
+#: query_hql.xml:581
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1151,7 +1149,7 @@
 "literal>"
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:587
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1161,29 +1159,29 @@
 "</literal>"
 
 #. Tag: para
-#: query_hql.xml:561
-#, no-c-format
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:567
-#, no-c-format
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:605
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1194,13 +1192,13 @@
 "(), upper(), length(), locate(), abs(), sqrt(), bit_length()</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> と <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
+#: query_hql.xml:616
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1208,7 +1206,7 @@
 msgstr "数字や時間の値をStringにコンバートする <literal>str()</literal>)"
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:622
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1222,7 +1220,7 @@
 "に限ります。"
 
 #. Tag: para
-#: query_hql.xml:599
+#: query_hql.xml:630
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1232,13 +1230,13 @@
 "()</literal> 関数。"
 
 #. Tag: para
-#: query_hql.xml:605
-#, no-c-format
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "コレクション値のパス式を取るHQL関数: <literal>size(), minelement(), "
@@ -1248,11 +1246,11 @@
 "ます。"
 
 #. Tag: para
-#: query_hql.xml:613
-#, no-c-format
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "<literal>sign()</literal>, <literal>trunc()</literal>, <literal>rtrim()</"
@@ -1260,23 +1258,23 @@
 "ラ関数。"
 
 #. Tag: para
-#: query_hql.xml:619
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "JDBCスタイルの位置パラメータ <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:624
-#, no-c-format
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "名前付きパラメータ: <literal>:name</literal>, <literal>:start_date</"
 "literal>, <literal>:x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:660
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1286,7 +1284,7 @@
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:635
+#: query_hql.xml:666
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1296,41 +1294,41 @@
 "literal>"
 
 #. Tag: para
-#: query_hql.xml:641
-#, no-c-format
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "<literal>in</literal> と <literal>between</literal> は以下のように使用できま"
 "す。:"
 
 #. Tag: programlisting
-#: query_hql.xml:645
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:647
+#: query_hql.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:649
-#, no-c-format
-msgid "and the negated forms may be written"
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "また、否定形で記述することもできます。"
 
 #. Tag: programlisting
-#: query_hql.xml:653
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:655
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1338,27 +1336,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:657
-#, no-c-format
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "同様に <literal>is null</literal> や <literal>is not null</literal> はnull値"
 "をテストするために使用できます。"
 
 #. Tag: para
-#: query_hql.xml:662
-#, no-c-format
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "Hibernate設定ファイルでHQL query substitutionsを定義すれば、boolean値を式の中"
 "で簡単に使用できま。:"
 
 #. Tag: programlisting
-#: query_hql.xml:667
+#: query_hql.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1366,7 +1364,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:669
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1378,42 +1376,42 @@
 "literal> に置き換えられます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:674
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:676
-#, no-c-format
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "特別なプロパティ <literal>size</literal>、または特別な関数 <literal>size()</"
 "literal> を使ってコレクションのサイズをテストできます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:681
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:683
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:685
-#, no-c-format
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "インデックス付きのコレクションでは、<literal>minindex</literal> と "
 "<literal>maxindex</literal> 関数を使って、インデックスの最小値と最大値を参照"
@@ -1421,32 +1419,32 @@
 "literal> を使って、 基本型のコレクション要素の最小値と最大値を参照できます。"
 
 #. Tag: programlisting
-#: query_hql.xml:693
+#: query_hql.xml:724
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:695
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:697
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:699
-#, no-c-format
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "コレクションの要素やインデックスのセット(<literal>elements</literal> と "
 "<literal>indices</literal> 関数)、または副問い合わせ(後述)の結果が受け取れ"
@@ -1454,7 +1452,7 @@
 "れます。"
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1462,7 +1460,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1470,31 +1468,31 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:709
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:711
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:713
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:715
-#, no-c-format
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "<literal>size</literal>, <literal>elements</literal>, <literal>indices</"
@@ -1503,23 +1501,23 @@
 "where節だけで利用可能であることに注意してください。"
 
 #. Tag: para
-#: query_hql.xml:722
-#, no-c-format
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "インデックス付きのコレクション(arrays, lists, maps)の要素は、 インデックス"
 "で参照できます(where節内でのみ)。"
 
 #. Tag: programlisting
-#: query_hql.xml:727
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1528,7 +1526,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1537,7 +1535,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1545,15 +1543,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:735
-#, no-c-format
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr "<literal>[]</literal> 内部の式は、算術式でも構いません。"
 
 #. Tag: programlisting
-#: query_hql.xml:739
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1561,17 +1559,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:741
-#, no-c-format
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "一対多関連や値のコレクションの要素に対しては、HQLは組み込みの <literal>index"
 "()</literal> 関数も用意しています。"
 
 #. Tag: programlisting
-#: query_hql.xml:746
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1580,30 +1578,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:748
-#, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr ""
 "ベースとなるデータベースがサポートしているスカラーSQL関数が使用できます"
 
 #. Tag: programlisting
-#: query_hql.xml:752
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:754
-#, no-c-format
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "もしまだ全てを理解していないなら、下のクエリをSQLでどれだけ長く、読みづらく出"
 "来るか考えてください。:"
 
 #. Tag: programlisting
-#: query_hql.xml:759
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1616,13 +1614,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:761
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>ヒント:</emphasis> 例えばこのように出来ます。"
 
 #. Tag: programlisting
-#: query_hql.xml:765
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1646,23 +1644,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:770
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr "order by節"
 
 #. Tag: para
-#: query_hql.xml:772
-#, no-c-format
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "クエリが返すlistは、返されるクラスやコンポーネントの任意の属性によって並べ替"
 "えられます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1670,7 +1668,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:809
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1680,23 +1678,23 @@
 "か降順の整列を示します。"
 
 #. Tag: title
-#: query_hql.xml:785
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr "group by節"
 
 #. Tag: para
-#: query_hql.xml:787
-#, no-c-format
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "集約値を返すクエリは、返されるクラスやコンポーネントの任意のプロパティによっ"
 "てグループ化できます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:791
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1705,7 +1703,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:793
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1714,13 +1712,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:795
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr "<literal>having</literal> 節も使えます。"
 
 #. Tag: programlisting
-#: query_hql.xml:799
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1730,19 +1728,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:801
-#, no-c-format
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "もし使用するデータベースがサポートしているなら、 <literal>having</literal> "
 "と <literal>order by</literal> 節でSQL関数と集約関数が使えます (例えばMySQL"
 "にはありません)。"
 
 #. Tag: programlisting
-#: query_hql.xml:807
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1754,15 +1752,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:809
-#, no-c-format
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "Note that neither the <literal>group by</literal> clause nor the "
 "<literal>order by</literal> clause may contain arithmetic expressions. Also "
@@ -1772,13 +1769,13 @@
 "explicitly."
 
 #. Tag: title
-#: query_hql.xml:821
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr "副問い合わせ"
 
 #. Tag: para
-#: query_hql.xml:823
+#: query_hql.xml:854
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1792,7 +1789,7 @@
 "い合わせのこと)さえ許可されます。"
 
 #. Tag: programlisting
-#: query_hql.xml:829
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1802,7 +1799,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1812,7 +1809,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:833
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1822,7 +1819,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:835
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1832,7 +1829,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:837
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1840,36 +1837,37 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:839
-#, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 "HQL副問い合わせは、selectまたはwhere節だけで使われることに注意してください。"
 
 #. Tag: para
-#: query_hql.xml:843
-#, no-c-format
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "Note that subqueries can also utilize <literal>row value constructor</"
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:851
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr "HQLの例"
 
 #. Tag: para
-#: query_hql.xml:853
-#, no-c-format
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "Hibernateクエリは非常に強力で複雑にできます。実際、クエリ言語の威力は"
 "Hibernateの主要なセールスポイントの一つです。 ここに最近のプロジェクトで使用"
@@ -1877,16 +1875,16 @@
 "に記述できることに注意してください!"
 
 #. Tag: para
-#: query_hql.xml:859
-#, no-c-format
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "以下のクエリは特定の顧客と与えられた最小の合計値に対する未払い注文の注文ID、 "
 "商品の数、注文の合計を合計値で整列して返します。 価格を決定する際、現在のカタ"
@@ -1896,7 +1894,7 @@
 "しない)副問い合わせを持ちます。"
 
 #. Tag: programlisting
-#: query_hql.xml:868
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1920,7 +1918,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:870
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1930,7 +1928,7 @@
 "がって私のクエリは実際には以下のようになります。:"
 
 #. Tag: programlisting
-#: query_hql.xml:875
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1949,7 +1947,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:908
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -1966,7 +1964,7 @@
 "literal> テーブルに対する関連副問い合わせを備えたSQLクエリに変換されます。"
 
 #. Tag: programlisting
-#: query_hql.xml:885
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1987,17 +1985,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:887
-#, no-c-format
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "もし私がsetの代わりにlistとして <literal>statusChanges</literal> コレクション"
 "を マッピングしたならば、はるかに簡単にクエリを記述できるでしょう。"
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2011,7 +2009,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:925
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -2031,7 +2029,7 @@
 "す。"
 
 #. Tag: programlisting
-#: query_hql.xml:903
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2044,7 +2042,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:905
+#: query_hql.xml:936
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
@@ -2053,7 +2051,7 @@
 "必要があるでしょう。"
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2067,38 +2065,37 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:914
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "大量のUPDATEとDELETE"
 
 #. Tag: para
-#: query_hql.xml:916
-#, no-c-format
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "HQLは今は <literal>update</literal> と <literal>delete</literal>、"
 "<literal>insert ... select ...</literal> ステートメントをHQLに入れることをサ"
 "ポートしています。 <xref linkend=\"batch-direct\"/> に詳細があります。"
 
 #. Tag: title
-#: query_hql.xml:924
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "Tips &amp; Tricks"
 
 #. Tag: para
-#: query_hql.xml:926
-#, no-c-format
-msgid ""
-"You can count the number of query results without actually returning them:"
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr "実際に結果を返さなくてもクエリの結果数を数えることができます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:930
+#: query_hql.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2106,14 +2103,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:932
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
 "コレクションのサイズにより結果を並べ替えるためには以下のクエリを使用します。:"
 
 #. Tag: programlisting
-#: query_hql.xml:936
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2124,7 +2121,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:938
+#: query_hql.xml:969
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2134,21 +2131,21 @@
 "イズによる選択条件を設定できます:"
 
 #. Tag: programlisting
-#: query_hql.xml:943
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:945
-#, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr ""
 "使用しているデータベースがサブセレクトをサポートしない場合は、次のクエリを使"
 "用してください:"
 
 #. Tag: programlisting
-#: query_hql.xml:949
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2159,17 +2156,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:951
-#, no-c-format
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "内部結合をしているせいで上の解決法がmessageの件数が ゼロの <literal>User</"
 "literal> を返すことができないならば、以下の形式が使えます。"
 
 #. Tag: programlisting
-#: query_hql.xml:956
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2180,7 +2177,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:958
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
@@ -2188,7 +2185,7 @@
 "す。:"
 
 #. Tag: programlisting
-#: query_hql.xml:962
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2198,7 +2195,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:964
+#: query_hql.xml:996
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2208,7 +2205,7 @@
 "ることでページをつけることができます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:968
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2219,15 +2216,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:970
-#, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "コレクションの要素はクエリフィルタを使って、並べ替えやグループ分けが出来ま"
 "す。:"
 
 #. Tag: programlisting
-#: query_hql.xml:974
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2237,13 +2234,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:976
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "コレクションを初期化せずにコレクションのサイズを得ることができます。:"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:1012
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2251,34 +2248,34 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:985
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:987
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:992 query_hql.xml:1038
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:993
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:995
+#: query_hql.xml:1027
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2286,37 +2283,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1000
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1001
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1003
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1007
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1008
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1010
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2324,24 +2321,24 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1016
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1018
+#: query_hql.xml:1050
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1057
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2349,21 +2346,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1059
 #, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1066
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2371,16 +2368,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1040
+#: query_hql.xml:1072
 #, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1045
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2390,10 +2386,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1047
+#: query_hql.xml:1079
 #, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
+
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "ほとんどの場合クエリのほかの部分で <literal>Cat</literal> を参照するの"
+#~ "で、別名を割り当てる必要があるでしょう。"
+
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "または、タイプセーフなJavaオブジェクトを返せます。"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,17 +11,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_sql.xml:5
+#: query_sql.xml:29
 #, no-c-format
 msgid "Native SQL"
 msgstr "ネイティブSQL"
 
 #. Tag: para
-#: query_sql.xml:7
-#, no-c-format
+#: query_sql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -32,29 +32,29 @@
 "ションからHibernateへの移行も容易にしています。"
 
 #. Tag: para
-#: query_sql.xml:13
-#, no-c-format
+#: query_sql.xml:37
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3では、生成、更新、削除、読み込み処理のようなすべての SQL(ストアド"
 "プロシージャを含む)を手書きできます。"
 
 #. Tag: title
-#: query_sql.xml:17
+#: query_sql.xml:41
 #, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "<literal>SQLQuery</literal> の使用"
 
 #. Tag: para
-#: query_sql.xml:19
-#, no-c-format
+#: query_sql.xml:43
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "ネイティブなSQLクエリの実行は <literal>SQLQuery</literal> インターフェイスを"
 "通して制御します。 <literal>SQLQuery</literal> インターフェイスは "
@@ -62,19 +62,19 @@
 "を使って問い合わせする方法を以下で説明します。"
 
 #. Tag: title
-#: query_sql.xml:25
+#: query_sql.xml:49
 #, no-c-format
 msgid "Scalar queries"
 msgstr "スカラーのクエリ"
 
 #. Tag: para
-#: query_sql.xml:27
+#: query_sql.xml:51
 #, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr "最も基本的なSQLクエリはスカラー(値)のリストを得ることです。"
 
 #. Tag: programlisting
-#: query_sql.xml:30
+#: query_sql.xml:54
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
@@ -83,11 +83,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:32
-#, no-c-format
+#: query_sql.xml:56
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "これらはどちらも、CATSテーブルの各カラムのスカラー値を含む Object配列(Object"
@@ -95,19 +95,19 @@
 "HibernateはResultSetMetadataを使用します。"
 
 #. Tag: para
-#: query_sql.xml:37
-#, no-c-format
+#: query_sql.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "<literal>ResultSetMetadata</literal> を使用するオーバーヘッドを避けるため、 "
 "もしくは単に何が返されるか明確にするため、<literal>addScalar()</literal> を使"
 "えます。"
 
 #. Tag: programlisting
-#: query_sql.xml:41
+#: query_sql.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -118,29 +118,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:43 query_sql.xml:89 query_sql.xml:170 query_sql.xml:321
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, no-c-format
 msgid "This query specified:"
 msgstr "このクエリで指定されているものを下記に示します。"
 
 #. Tag: para
-#: query_sql.xml:47 query_sql.xml:93 query_sql.xml:325
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr "SQLクエリ文字列"
 
 #. Tag: para
-#: query_sql.xml:51
+#: query_sql.xml:75
 #, no-c-format
 msgid "the columns and types to return"
 msgstr "返されるカラムと型"
 
 #. Tag: para
-#: query_sql.xml:55
-#, no-c-format
+#: query_sql.xml:79
+#, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
-"<literal>ResultSetMetdata</literal> but will instead explicitly get the ID, "
+"This will return Object arrays, but now it will not use "
+"<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
 "be returned, even though the query is using <literal>*</literal> and could "
@@ -154,7 +154,7 @@
 "です。"
 
 #. Tag: para
-#: query_sql.xml:63
+#: query_sql.xml:87
 #, no-c-format
 msgid ""
 "It is possible to leave out the type information for all or some of the "
@@ -162,7 +162,7 @@
 msgstr "スカラーの型情報を省くこともできます。"
 
 #. Tag: programlisting
-#: query_sql.xml:66
+#: query_sql.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -173,24 +173,24 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:68
-#, no-c-format
+#: query_sql.xml:92
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "これは本質的に前と同じクエリですが、、 NAME と BIRTHDATE の型を決めるために "
 "<literal>ResultSetMetaData</literal> を使用します。一方、ID の型は明示的に指"
 "定されています。"
 
 #. Tag: para
-#: query_sql.xml:72
-#, no-c-format
+#: query_sql.xml:96
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "ResultSetMetaData から返される java.sql.Types を Hibernate の型に マッピング"
@@ -199,13 +199,13 @@
 "<literal>registerHibernateType</literal> を呼び出し、 カスタマイズできます。"
 
 #. Tag: title
-#: query_sql.xml:80
+#: query_sql.xml:104
 #, no-c-format
 msgid "Entity queries"
 msgstr "エンティティのクエリ"
 
 #. Tag: para
-#: query_sql.xml:82
+#: query_sql.xml:106
 #, no-c-format
 msgid ""
 "The above queries were all about returning scalar values, basically "
@@ -219,7 +219,7 @@
 "す。"
 
 #. Tag: programlisting
-#: query_sql.xml:87
+#: query_sql.xml:111
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.class);\n"
@@ -229,13 +229,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:97
+#: query_sql.xml:121
 #, no-c-format
 msgid "the entity returned by the query"
 msgstr "クエリが返すエンティティとSQLテーブルの別名"
 
 #. Tag: para
-#: query_sql.xml:101
+#: query_sql.xml:125
 #, no-c-format
 msgid ""
 "Assuming that Cat is mapped as a class with the columns ID, NAME and "
@@ -246,7 +246,7 @@
 "クエリはどちらも、要素がCatエンティティであるリストを返します。"
 
 #. Tag: para
-#: query_sql.xml:105
+#: query_sql.xml:129
 #, no-c-format
 msgid ""
 "If the entity is mapped with a <literal>many-to-one</literal> to another "
@@ -264,7 +264,7 @@
 "literal> であることを 明示することを私たちは好みます。"
 
 #. Tag: programlisting
-#: query_sql.xml:113
+#: query_sql.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID FROM CATS"
@@ -273,19 +273,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:115
+#: query_sql.xml:139
 #, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr "これにより cat.getDog() が正しく機能します。"
 
 #. Tag: title
-#: query_sql.xml:119
+#: query_sql.xml:143
 #, no-c-format
 msgid "Handling associations and collections"
 msgstr "関連とコレクションの操作"
 
 #. Tag: para
-#: query_sql.xml:121
+#: query_sql.xml:145
 #, no-c-format
 msgid ""
 "It is possible to eagerly join in the <literal>Dog</literal> to avoid the "
@@ -298,7 +298,7 @@
 "ます。 関連もしくはコレクションに結合できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:126
+#: query_sql.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID, D_ID, "
@@ -309,15 +309,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:128
-#, no-c-format
+#: query_sql.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "この例の中で、返される <literal>Cat</literal> は、 データベースへの余分処理な"
 "しで、 完全に初期化された <literal>dog</literal> プロパティを持ちます。 結合"
@@ -327,7 +327,7 @@
 "のようになります。"
 
 #. Tag: programlisting
-#: query_sql.xml:136
+#: query_sql.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_NAME, "
@@ -338,31 +338,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:138
-#, no-c-format
+#: query_sql.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "現在のところ、 Hibernateで使いやすくするためのSQLクエリの拡張なしに、 ネイ"
 "ティブクエリで何かを可能にする限界に来ています。 同じ型のエンティティを複数返"
 "す際や、デフォルトの別名や列名で十分ではない場合に、 問題は起こり始めます。"
 
 #. Tag: title
-#: query_sql.xml:146
+#: query_sql.xml:170
 #, no-c-format
 msgid "Returning multiple entities"
 msgstr "複数エンティティの取得"
 
 #. Tag: para
-#: query_sql.xml:148
-#, no-c-format
+#: query_sql.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "ここまでは、リザルトセットのカラム名は、 マッピングファイルで指定されたカラム"
@@ -370,7 +370,7 @@
 "るため、 複数テーブルを結合するSQLクエリで問題となる場合があります。"
 
 #. Tag: para
-#: query_sql.xml:153
+#: query_sql.xml:177
 #, no-c-format
 msgid ""
 "Column alias injection is needed in the following query (which most likely "
@@ -380,7 +380,7 @@
 "alias injection)が必要です。"
 
 #. Tag: programlisting
-#: query_sql.xml:156
+#: query_sql.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m WHERE c."
@@ -391,15 +391,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:158
-#, no-c-format
+#: query_sql.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specificed in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "このクエリの意図は、 1行ごとに2つのCatインスタンス、つまり猫とその母親を返"
 "すということです。 同じカラム名にマッピングすることにより名前が衝突するため、"
@@ -408,13 +408,13 @@
 "\"NAME\")と等しくないため、失敗します。"
 
 #. Tag: para
-#: query_sql.xml:165
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "下記の形式は、カラム名が重複しても大丈夫です。"
 
 #. Tag: programlisting
-#: query_sql.xml:168
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -425,7 +425,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:174
+#: query_sql.xml:202
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -435,23 +435,22 @@
 "む)"
 
 #. Tag: para
-#: query_sql.xml:179
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr "クエリによって返されるエンティティ"
 
 #. Tag: para
-#: query_sql.xml:183
-#, no-c-format
+#: query_sql.xml:211
+#, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicity, but even in "
-"this case we let Hibernate inject the SQL column aliases for each property. "
-"The placeholder for a column alias is just the property name qualified by "
-"the table alias. In the following example, we retrieve Cats and their "
-"mothers from a different table (cat_log) to the one declared in the mapping "
-"metadata. Notice that we may even use the property aliases in the where "
-"clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "上記で使用している {cat.*} と {mother.*} という表記は、 「すべてのプロパ"
 "ティ」を表す省略形です。 代わりに、明示的にカラムを列挙してもよいですが、 そ"
@@ -462,7 +461,7 @@
 "も、プロパティの別名を使えます。"
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -477,19 +476,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:195
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr "別名とプロパティのリファレンス"
 
 #. Tag: para
-#: query_sql.xml:197
-#, no-c-format
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "多くの場合、上記のような別名インジェクションが必要です。 ただし、複合プロパ"
 "ティ、継承識別子、コレクションなどのような より複雑なマッピングと関連するクエ"
@@ -497,233 +496,234 @@
 "を挿入できます。"
 
 #. Tag: para
-#: query_sql.xml:202
-#, no-c-format
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "別名インジェクションとして使用できるものを下表に示します。 注意:下表の別名は"
 "一例です。 それぞれの別名は一意であり、使用する際にはおそらく異なる名前を持ち"
 "ます。"
 
 #. Tag: title
-#: query_sql.xml:208
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr "別名に挿入する名前"
 
 #. Tag: entry
-#: query_sql.xml:219
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr "説明"
 
 #. Tag: entry
-#: query_sql.xml:221
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr "構文"
 
 #. Tag: entry
-#: query_sql.xml:223
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr "例"
 
 #. Tag: entry
-#: query_sql.xml:229
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr "単純なプロパティ"
 
 #. Tag: literal
-#: query_sql.xml:231
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:233
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:237
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr "複合プロパティ"
 
 #. Tag: literal
-#: query_sql.xml:239
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:241
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
 #. Tag: entry
-#: query_sql.xml:246
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "エンティティのクラスを識別する値"
 
 #. Tag: literal
-#: query_sql.xml:248
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:250
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:254
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr "エンティティの全プロパティ"
 
 #. Tag: literal
-#: query_sql.xml:256 query_sql.xml:304
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:258
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:262
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr "コレクションのキー"
 
 #. Tag: literal
-#: query_sql.xml:264
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:266
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr "コレクションのID"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr "コレクションの要素"
 
 #. Tag: literal
-#: query_sql.xml:280
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:286
-#, no-c-format
-msgid "roperty of the element in the collection"
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "コレクションの要素のプロパティ"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "コレクションの要素の全プロパティ"
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr "コレクションの全プロパティ"
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:315
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "管理されていないエンティティの取得"
 
 #. Tag: para
-#: query_sql.xml:317
-#, no-c-format
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "ネイティブSQLクエリに ResultTransformer を適用できます。 下記のように、例え"
 "ば、管理されていないエンティティを返します。"
 
 #. Tag: programlisting
-#: query_sql.xml:319
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -731,13 +731,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:329
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr "結果を変換したもの"
 
 #. Tag: para
-#: query_sql.xml:333
+#: query_sql.xml:361
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -748,17 +748,17 @@
 "もしくはフィールドに挿入した <literal>CatDTO</literal> のリストを返します。"
 
 #. Tag: title
-#: query_sql.xml:340
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "継承の制御"
 
 #. Tag: para
-#: query_sql.xml:342
-#, no-c-format
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "継承の一部としてマッピングされたエンティティを問い合わせるネイティブSQLクエリ"
@@ -766,21 +766,21 @@
 "りません。"
 
 #. Tag: title
-#: query_sql.xml:348
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr "パラメータ"
 
 #. Tag: para
-#: query_sql.xml:350
-#, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr ""
 "ネイティブSQLクエリは、以下のように、 名前付きパラメータ(:name)と同様に位置"
 "パラメータをサポートします。"
 
 #. Tag: programlisting
-#: query_sql.xml:353
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -793,17 +793,17 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:361
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "名前付きSQLクエリ"
 
 #. Tag: para
-#: query_sql.xml:363
-#, no-c-format
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "名前付きSQLクエリはマッピングドキュメントで定義することができ、 名前付きHQLク"
@@ -811,7 +811,7 @@
 "literal> を呼び出す必要は <emphasis>ない</emphasis> です。"
 
 #. Tag: programlisting
-#: query_sql.xml:368
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -825,7 +825,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:370
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -835,19 +835,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:372
-#, no-c-format
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "関連を結合するためとコレクションを初期化するクエリを定義するために、それぞれ "
 "<literal>&lt;return-join&gt;</literal> と <literal>&lt;load-collection&gt;</"
 "literal> 要素を使います。"
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -868,7 +868,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:379
+#: query_sql.xml:406
 #, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
@@ -880,7 +880,7 @@
 "りません。"
 
 #. Tag: programlisting
-#: query_sql.xml:383
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -893,19 +893,20 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:385
-#, no-c-format
+#: query_sql.xml:412
+#, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them accross several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "リザルトセットのマッピング情報を <literal>&lt;resultset&gt;</literal> に外出"
 "しすることができます。 複数の名前付きクエリで再利用したり、"
 "<literal>setResultSetMapping()</literal> APIを通して再利用したりできます。"
 
 #. Tag: programlisting
-#: query_sql.xml:390
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -929,17 +930,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:392
-#, no-c-format
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr ""
 "代わりに、hbmファイル内のリザルトセットのマッピング情報を 直接Javaコードの中"
 "で使用できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:395
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -951,24 +952,24 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:398
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr "列と列の別名を明示的に指定するために return-property を使う"
 
 #. Tag: para
-#: query_sql.xml:401
-#, no-c-format
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "別名を挿入するために <literal>{}</literal> 構文を使う代わりに、 <literal>&lt;"
 "return-property&gt;</literal> を使い、 どの列の別名を使うのかを明示できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:406
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -986,11 +987,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:408
-#, no-c-format
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal> は複数の列も扱えます。 これは、複"
@@ -998,7 +999,7 @@
 "制限を解決します。"
 
 #. Tag: programlisting
-#: query_sql.xml:413
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -1019,19 +1020,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:415
-#, no-c-format
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "この例では、挿入のための <literal>{}</literal> 構文といっしょに、 "
 "<literal>&lt;return-property&gt;</literal> を使っていることに注意してくださ"
 "い。 列とプロパティをどのように参照するかを選べます。"
 
 #. Tag: para
-#: query_sql.xml:420
+#: query_sql.xml:447
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1041,20 +1042,20 @@
 "ために、&lt;return-discriminator&gt; を使わなければなりません。"
 
 #. Tag: title
-#: query_sql.xml:426
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "問い合わせするためにストアドプロシージャを使う"
 
 #. Tag: para
-#: query_sql.xml:428
-#, no-c-format
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernateはバージョン3から、ストアドプロシージャとストアド関数経由の問い合わ"
 "せが サポートされました。 以降の文書の多くは、両方に当てはまります。 ストアド"
@@ -1063,7 +1064,7 @@
 "ジョン)のストアドプロシージャの例を以下に示します。"
 
 #. Tag: programlisting
-#: query_sql.xml:434
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1081,7 +1082,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:436
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
@@ -1089,7 +1090,7 @@
 "ります。"
 
 #. Tag: programlisting
-#: query_sql.xml:439
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1110,30 +1111,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:441
-#, no-c-format
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "注意:今のところ、ストアドプロシージャはスカラとエンティティを返すのみです。 "
 "<literal>&lt;return-join&gt;</literal> と <literal>&lt;load-collection&gt;</"
 "literal> はサポートされていません。"
 
 #. Tag: title
-#: query_sql.xml:446
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "ストアドプロシージャを使う上でのルールと制限"
 
 #. Tag: para
-#: query_sql.xml:448
-#, no-c-format
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1146,20 +1147,20 @@
 "セマンティックスとシンタックスは、 データベースベンダごとに異なるためです。"
 
 #. Tag: para
-#: query_sql.xml:455
-#, no-c-format
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "<literal>setFirstResult()/setMaxResults()</literal> を使って、 ストアドプロ"
 "シージャクエリをページ分けすることはできません。"
 
 #. Tag: para
-#: query_sql.xml:458
-#, no-c-format
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
@@ -1169,20 +1170,20 @@
 "はサポートされていません。"
 
 #. Tag: para
-#: query_sql.xml:463
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "Oracleには下記のルールが適用されます。"
 
 #. Tag: para
-#: query_sql.xml:467
-#, no-c-format
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "関数はリザルトセットを返さなければなりません。 プロシージャの第一引数はリザル"
 "トセットを返すため、 <literal>OUT</literal> でなければなりません。 Oracle 9と"
@@ -1191,26 +1192,26 @@
 "を参照してください。"
 
 #. Tag: para
-#: query_sql.xml:476
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "SybaseとMS SQLサーバーに適用されるルールを下記に示します。"
 
 #. Tag: para
-#: query_sql.xml:480
-#, no-c-format
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "プロシージャはリザルトセットを返さなければなりません。 サーバーは複数のリザル"
 "トセットと更新カウントを返しますが、 Hibernateは1つ目のリザルトセットだけを返"
 "すことに注意してください。 その他はすべて捨てられます。"
 
 #. Tag: para
-#: query_sql.xml:488
+#: query_sql.xml:515
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1220,13 +1221,13 @@
 "らく効率がよくなるでしょう。 しかし、これは必要条件ではありません。"
 
 #. Tag: title
-#: query_sql.xml:498
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "作成、更新、削除のためのカスタムSQL"
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:527
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1244,7 +1245,7 @@
 "タグが優先されます。"
 
 #. Tag: programlisting
-#: query_sql.xml:508
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1260,18 +1261,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:510
-#, no-c-format
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "SQLを直接データベースで実行するため、好みの方言を自由に使用できます。 データ"
 "ベース独自のSQLを使えば、当然マッピングのポータビリティが下がります。"
 
 #. Tag: para
-#: query_sql.xml:514
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1281,7 +1282,7 @@
 "きます。"
 
 #. Tag: programlisting
-#: query_sql.xml:517
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1297,25 +1298,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:519
-#, no-c-format
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr ""
 "今のところ、位置パラメータの順番はとても重要です。 すなわち、Hibernateが期待"
 "する順序でなければなりません。"
 
 #. Tag: para
-#: query_sql.xml:522
-#, no-c-format
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "<literal>org.hiberante.persister.entity</literal> レベルのデバッグログを 有効"
 "にすることによって、期待される順番を確かめられます。 このレベルを有効にするこ"
@@ -1325,14 +1326,13 @@
 "さい。)"
 
 #. Tag: para
-#: query_sql.xml:529
-#, no-c-format
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "ストアドプロシージャは挿入/更新/削除された行数を返す必要があります (読み込み"
 "の場合は、返さないよりは返す方がよいです)。 実行時にHibernateがSQL文の成功を"
@@ -1340,7 +1340,7 @@
 "て、 SQL文の最初のパラメータをいつも記録します。"
 
 #. Tag: programlisting
-#: query_sql.xml:535
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1360,20 +1360,20 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:539
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "ロードのためのカスタムSQL"
 
 #. Tag: para
-#: query_sql.xml:541
-#, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 "エンティティを読み込むための独自のSQL(もしくはHQL)クエリも宣言できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:544
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1386,17 +1386,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
-#, no-c-format
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr ""
 "これは、まさに(以前議論した)名前付きクエリの宣言です。 この名前付きクエリを"
 "クラスのマッピングから参照できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:549
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1409,19 +1409,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:551
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr "これはストアドプロシージャでさえも動作します。"
 
 #. Tag: para
-#: query_sql.xml:553
-#, no-c-format
-msgid "You may even define a query for collection loading:"
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr "次のように、コレクションをロードするためのクエリさえ定義してよいです。"
 
 #. Tag: programlisting
-#: query_sql.xml:555
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1432,7 +1432,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:557
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1445,17 +1445,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:559
-#, no-c-format
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr ""
 "次のように、結合フェッチによりコレクションをロードする エンティティローダーを"
 "定義できます。"
 
 #. Tag: programlisting
-#: query_sql.xml:562
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: session_api.xml:5
+#: session_api.xml:29
 #, no-c-format
 msgid "Working with objects"
 msgstr "オブジェクトを扱う"
 
 #. Tag: para
-#: session_api.xml:7
-#, no-c-format
+#: session_api.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "Hibernate は完全なオブジェクト/リレーショナルマッピングソリューションであ"
 "り、 データベース管理システムの詳細を開発者から隠蔽するだけでなく、 オブジェ"
@@ -34,7 +34,7 @@
 "ける永続化に対する、とても自然なオブジェクト指向の考え方を提供します。"
 
 #. Tag: para
-#: session_api.xml:16
+#: session_api.xml:40
 #, no-c-format
 msgid ""
 "In other words, Hibernate application developers should always think about "
@@ -49,27 +49,27 @@
 "ムのパフォーマンスをチューニングするときにだけ、 問題になってきます。"
 
 #. Tag: title
-#: session_api.xml:24
+#: session_api.xml:48
 #, no-c-format
 msgid "Hibernate object states"
 msgstr "Hibernateにおけるオブジェクトの状態"
 
 #. Tag: para
-#: session_api.xml:26
+#: session_api.xml:50
 #, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr "Hibernateは次のようなオブジェクトの状態を定義し、サポートしています。"
 
 #. Tag: para
-#: session_api.xml:32
-#, no-c-format
+#: session_api.xml:56
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -84,15 +84,15 @@
 "状態遷移に必要となるSQL文の発行は、Hibernateに任せましょう。)"
 
 #. Tag: para
-#: session_api.xml:44
-#, no-c-format
+#: session_api.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -106,8 +106,8 @@
 "<literal>DELETE</literal> 文を実行しません。"
 
 #. Tag: para
-#: session_api.xml:55
-#, no-c-format
+#: session_api.xml:79
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -116,8 +116,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>分離(Detached)</emphasis> - 分離されたインスタンスとは、永続化され"
 "ているが、 それと関連付いていた <literal>Session</literal> がクローズされてい"
@@ -131,23 +131,23 @@
 "すなわち、ユーザから見た作業単位だということです。"
 
 #. Tag: para
-#: session_api.xml:69
-#, no-c-format
+#: session_api.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "これから、状態と状態遷移(そして、遷移のきっかけとなるHibernateのメソッド)に"
 "ついて 、詳細に述べます。"
 
 #. Tag: title
-#: session_api.xml:77
+#: session_api.xml:101
 #, no-c-format
 msgid "Making objects persistent"
 msgstr "オブジェクトを永続状態にする"
 
 #. Tag: para
-#: session_api.xml:79
+#: session_api.xml:103
 #, no-c-format
 msgid ""
 "Newly instantiated instances of a a persistent class are considered "
@@ -160,7 +160,7 @@
 "(persistent)</emphasis> にできます。"
 
 #. Tag: programlisting
-#: session_api.xml:86
+#: session_api.xml:110
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
@@ -171,15 +171,15 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:88
-#, no-c-format
+#: session_api.xml:112
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -193,11 +193,11 @@
 "です。"
 
 #. Tag: para
-#: session_api.xml:100
-#, no-c-format
+#: session_api.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -213,7 +213,7 @@
 "Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:111
+#: session_api.xml:135
 #, no-c-format
 msgid ""
 "<literal>save()</literal> does guarantee to return an identifier. If an "
@@ -229,17 +229,17 @@
 "running conversation with an extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:121
-#, no-c-format
+#: session_api.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr ""
 "代わりに、識別子を引数にとる <literal>save()</literal> メソッドを使って、 識"
 "別子を割り当てることもできます。"
 
 #. Tag: programlisting
-#: session_api.xml:126
+#: session_api.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
@@ -252,12 +252,12 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:128
-#, no-c-format
+#: session_api.xml:152
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -272,13 +272,13 @@
 "せん。"
 
 #. Tag: para
-#: session_api.xml:138
-#, no-c-format
+#: session_api.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "関連するオブジェクトを自動的に保存する、 Hibernateの <emphasis>遷移的な永続化"
@@ -288,19 +288,19 @@
 "章の後半に書かれています。"
 
 #. Tag: title
-#: session_api.xml:149
+#: session_api.xml:173
 #, no-c-format
 msgid "Loading an object"
 msgstr "オブジェクトのロード"
 
 #. Tag: para
-#: session_api.xml:151
-#, no-c-format
+#: session_api.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "永続化されたインスタンスの識別子があらかじめ分かっているなら、 "
 "<literal>Session</literal> の <literal>load()</literal> メソッドを使って、復"
@@ -309,13 +309,13 @@
 "の状態は、永続(persistent)状態です。"
 
 #. Tag: programlisting
-#: session_api.xml:158
+#: session_api.xml:182
 #, no-c-format
 msgid "<![CDATA[Cat fritz = (Cat) sess.load(Cat.class, generatedId);]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:160
+#: session_api.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[// you need to wrap primitive identifiers\n"
@@ -325,14 +325,14 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:162
+#: session_api.xml:186
 #, no-c-format
 msgid "Alternatively, you can load state into a given instance:"
 msgstr ""
 "あるいは、以下のように、既存のインスタンスに状態をロードすることもできます。"
 
 #. Tag: programlisting
-#: session_api.xml:166
+#: session_api.xml:190
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -342,17 +342,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:168
-#, no-c-format
+#: session_api.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "DBに該当する行が無い場合、 <literal>load()</literal> は回復不可能な例外を 投"
 "げることに注意しましょう。 そのクラスがプロキシを使ってマッピングされている場"
@@ -363,11 +363,11 @@
 "定義されているならば、 複数のインスタンスを一括でロードすることが可能です。"
 
 #. Tag: para
-#: session_api.xml:179
-#, no-c-format
+#: session_api.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "該当する行が存在することを確信できない場合は、 <literal>get()</literal> メ"
@@ -375,7 +375,7 @@
 "い場合はnullを返します。"
 
 #. Tag: programlisting
-#: session_api.xml:185
+#: session_api.xml:209
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id);\n"
@@ -387,10 +387,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:187
-#, no-c-format
+#: session_api.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -399,19 +399,19 @@
 "は、APIドキュメントを参照してください。"
 
 #. Tag: programlisting
-#: session_api.xml:192
+#: session_api.xml:216
 #, no-c-format
 msgid "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id, LockMode.UPGRADE);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:194
-#, no-c-format
+#: session_api.xml:218
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "関連に対するカスケード方法として <literal>lock</literal> や <literal>all</"
 "literal> を 指定しない限り、関連するインスタンスや含まれるコレクションは "
@@ -419,7 +419,7 @@
 "しましょう。"
 
 #. Tag: para
-#: session_api.xml:201
+#: session_api.xml:225
 #, no-c-format
 msgid ""
 "It is possible to re-load an object and all its collections at any time, "
@@ -432,7 +432,7 @@
 "する場合、このメソッドが役に立ちます。"
 
 #. Tag: programlisting
-#: session_api.xml:207
+#: session_api.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
@@ -441,13 +441,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:209
-#, no-c-format
+#: session_api.xml:233
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "大切な問題は、いつも次の点に関するものです。それは、Hibernateがデータベースか"
 "ら、 どのくらいの量を復元するのかと、どのくらいの数のSQLの <literal>SELECT</"
@@ -456,19 +456,19 @@
 "ています。"
 
 #. Tag: title
-#: session_api.xml:219
+#: session_api.xml:243
 #, no-c-format
 msgid "Querying"
 msgstr "クエリ"
 
 #. Tag: para
-#: session_api.xml:221
-#, no-c-format
+#: session_api.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -480,13 +480,13 @@
 "ティブなSQLでクエリを表現することもできます。"
 
 #. Tag: title
-#: session_api.xml:231
+#: session_api.xml:255
 #, no-c-format
 msgid "Executing queries"
 msgstr "クエリの実行"
 
 #. Tag: para
-#: session_api.xml:233
+#: session_api.xml:257
 #, no-c-format
 msgid ""
 "HQL and native SQL queries are represented with an instance of <literal>org."
@@ -502,7 +502,7 @@
 "<literal>Session</literal> を使って取得します。"
 
 #. Tag: programlisting
-#: session_api.xml:240
+#: session_api.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
@@ -532,17 +532,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:242
-#, no-c-format
+#: session_api.xml:266
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "クエリは、普通、 <literal>list()</literal> を呼び出すことによって実行されま"
 "す。 クエリの結果は、メモリ上にあるコレクションにすべてロードされます。 クエ"
@@ -554,20 +554,20 @@
 "の重複は <literal>Set</literal> を使って取り除くことができます。"
 
 #. Tag: title
-#: session_api.xml:254
+#: session_api.xml:278
 #, no-c-format
 msgid "Iterating results"
 msgstr "結果をイテレートする"
 
 #. Tag: para
-#: session_api.xml:256
-#, no-c-format
+#: session_api.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -583,7 +583,7 @@
 "初期化するために後から行うn回のselectのことです。"
 
 #. Tag: programlisting
-#: session_api.xml:268
+#: session_api.xml:292
 #, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
@@ -602,23 +602,23 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:272
+#: session_api.xml:296
 #, no-c-format
 msgid "Queries that return tuples"
 msgstr "オブジェクトの組(tuple)を返すクエリ"
 
 #. Tag: para
-#: session_api.xml:274
-#, no-c-format
+#: session_api.xml:298
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "Hibernateのクエリでは、時々、オブジェクトの組を返すことがあります。 その場合"
 "は、各タプルは配列として返されます。"
 
 #. Tag: programlisting
-#: session_api.xml:279
+#: session_api.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
@@ -636,25 +636,25 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:284
+#: session_api.xml:308
 #, no-c-format
 msgid "Scalar results"
 msgstr "スカラーの結果"
 
 #. Tag: para
-#: session_api.xml:286
-#, no-c-format
+#: session_api.xml:310
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "クエリでは、 <literal>select</literal> 節でクラスのプロパティを指定できま"
 "す。 SQLの集合関数を呼ぶこともできます。プロパティや集合関数は、 (永続状態の"
 "エンティティではなく)「スカラー値」であると見なされます。"
 
 #. Tag: programlisting
-#: session_api.xml:292
+#: session_api.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
@@ -674,20 +674,20 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:297
+#: session_api.xml:321
 #, no-c-format
 msgid "Bind parameters"
 msgstr "パラメータのバインド"
 
 #. Tag: para
-#: session_api.xml:299
-#, no-c-format
+#: session_api.xml:323
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "<literal>Query</literal> は、名前付きのパラメータやJDBCスタイルの <literal>?"
 "</literal> パラメータに値をバインドするためのメソッドを持っています。 "
@@ -696,26 +696,26 @@
 "name</literal> 形式の識別子です。 名前付きパラメータの利点は次の通りです。"
 
 #. Tag: para
-#: session_api.xml:309
+#: session_api.xml:333
 #, no-c-format
 msgid ""
 "named parameters are insensitive to the order they occur in the query string"
 msgstr "名前付きパラメータは、クエリ文字列に登場する順番と無関係です"
 
 #. Tag: para
-#: session_api.xml:315
-#, no-c-format
-msgid "they may occur multiple times in the same query"
+#: session_api.xml:339
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "同じクエリ内に複数回登場することができます"
 
 #. Tag: para
-#: session_api.xml:320
+#: session_api.xml:344
 #, no-c-format
 msgid "they are self-documenting"
 msgstr "自分自身を説明します"
 
 #. Tag: programlisting
-#: session_api.xml:326
+#: session_api.xml:350
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter (preferred)\n"
@@ -726,7 +726,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:328
+#: session_api.xml:352
 #, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
@@ -736,7 +736,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:330
+#: session_api.xml:354
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
@@ -750,25 +750,25 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:335
+#: session_api.xml:359
 #, no-c-format
 msgid "Pagination"
 msgstr "ページ分け"
 
 #. Tag: para
-#: session_api.xml:337
-#, no-c-format
+#: session_api.xml:361
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "ResultSetに制限(復元したい最大行数や復元したい最初の行)を加える必要があれ"
 "ば、 以下のように、 <literal>Query</literal> インターフェイスのメソッドを使い"
 "ます。"
 
 #. Tag: programlisting
-#: session_api.xml:343
+#: session_api.xml:367
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"from DomesticCat cat\");\n"
@@ -778,7 +778,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:345
+#: session_api.xml:369
 #, no-c-format
 msgid ""
 "Hibernate knows how to translate this limit query into the native SQL of "
@@ -788,19 +788,19 @@
 "ます。"
 
 #. Tag: title
-#: session_api.xml:353
+#: session_api.xml:377
 #, no-c-format
 msgid "Scrollable iteration"
 msgstr "スクロール可能なイテレーション"
 
 #. Tag: para
-#: session_api.xml:355
-#, no-c-format
+#: session_api.xml:379
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "JDBCドライバがスクロール可能な <literal>ResultSet</literal> をサポートしてい"
 "れば、 <literal>Query</literal> インターフェイスを使って、 "
@@ -808,7 +808,7 @@
 "と、クエリの結果に対して柔軟にナビゲーションできます。"
 
 #. Tag: programlisting
-#: session_api.xml:362
+#: session_api.xml:386
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"select cat.name, cat from DomesticCat "
@@ -838,11 +838,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:364
-#, no-c-format
+#: session_api.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "この機能にはオープン状態のデータベースコネクションが必要であることに注意して"
@@ -851,25 +851,25 @@
 "いましょう。"
 
 #. Tag: title
-#: session_api.xml:373
+#: session_api.xml:397
 #, no-c-format
 msgid "Externalizing named queries"
 msgstr "名前付きクエリの外出し"
 
 #. Tag: para
-#: session_api.xml:375
-#, no-c-format
+#: session_api.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "マッピングドキュメントに名前付きのクエリを定義することができます。 (マーク"
 "アップと解釈される文字がクエリに含まれるなら、 <literal>CDATA</literal> セク"
 "ションを 使うことを忘れないようにしましょう。)"
 
 #. Tag: programlisting
-#: session_api.xml:381
+#: session_api.xml:405
 #, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
@@ -880,14 +880,14 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:383
+#: session_api.xml:407
 #, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr ""
 "パラメータのバインディングと実行は、以下のようなプログラムで行われます。"
 
 #. Tag: programlisting
-#: session_api.xml:387
+#: session_api.xml:411
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
@@ -897,12 +897,12 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:389
-#, no-c-format
+#: session_api.xml:413
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "実際のプログラムコードは、使われるクエリ言語に依存していないことに注意しま"
 "しょう。 メタデータには、ネイティブSQLクエリを定義することもできます。 また、"
@@ -910,14 +910,14 @@
 "ます。"
 
 #. Tag: para
-#: session_api.xml:395
-#, no-c-format
+#: session_api.xml:419
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "<literal>&lt;hibernate-mapping&gt;</literal> の中のクエリ定義は、クエリに対す"
 "る ユニークな名前が必要なことにも注意してください。それに対して、 "
@@ -926,17 +926,17 @@
 "ByNameAndMaximumWeight</literal>"
 
 #. Tag: title
-#: session_api.xml:408
+#: session_api.xml:432
 #, no-c-format
 msgid "Filtering collections"
 msgstr "コレクションのフィルタリング"
 
 #. Tag: para
-#: session_api.xml:409
-#, no-c-format
+#: session_api.xml:433
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "コレクション <emphasis>フィルタ</emphasis> は、永続化されているコレクションや"
@@ -944,7 +944,7 @@
 "のその時点での要素を意味する <literal>this</literal> を使います。"
 
 #. Tag: programlisting
-#: session_api.xml:415
+#: session_api.xml:439
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
@@ -956,31 +956,31 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:417
-#, no-c-format
+#: session_api.xml:441
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "返されるコレクションはBagとみなされます。そして、それはもとのコレクションのコ"
 "ピーになります。 元のコレクションは修正されません(これは、\"filter\"という名"
 "前の意味とは異なりますが、 期待される動きとは一致しています)。"
 
 #. Tag: para
-#: session_api.xml:423
-#, no-c-format
+#: session_api.xml:447
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "フィルタには <literal>from</literal> 節が不要であることに気づくでしょう(必要"
 "なら、持つことも可能ですが)。 フィルタは、コレクションの要素自体を返して構い"
 "ません。"
 
 #. Tag: programlisting
-#: session_api.xml:428
+#: session_api.xml:452
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
@@ -990,17 +990,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:430
-#, no-c-format
+#: session_api.xml:454
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "クエリを含まないフィルタも役に立ちます。 例えば、非常に大きなコレクションの部"
 "分集合をロードするために使えます。"
 
 #. Tag: programlisting
-#: session_api.xml:435
+#: session_api.xml:459
 #, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
@@ -1010,17 +1010,17 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:440
+#: session_api.xml:464
 #, no-c-format
 msgid "Criteria queries"
 msgstr "クライテリアのクエリ"
 
 #. Tag: para
-#: session_api.xml:442
-#, no-c-format
+#: session_api.xml:466
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1029,7 +1029,7 @@
 "Hibernateは直感的な <literal>Criteria</literal> クエリAPIを提供しています。"
 
 #. Tag: programlisting
-#: session_api.xml:448
+#: session_api.xml:472
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = session.createCriteria(Cat.class);\n"
@@ -1039,7 +1039,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:450
+#: session_api.xml:474
 #, no-c-format
 msgid ""
 "The <literal>Criteria</literal> and the associated <literal>Example</"
@@ -1050,20 +1050,20 @@
 "<xref linkend=\"querycriteria\"/> に述べられています。"
 
 #. Tag: title
-#: session_api.xml:458
+#: session_api.xml:482
 #, no-c-format
 msgid "Queries in native SQL"
 msgstr "ネイティブSQLのクエリ"
 
 #. Tag: para
-#: session_api.xml:460
-#, no-c-format
+#: session_api.xml:484
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "<literal>createSQLQuery()</literal> を使って、SQLでクエリを表現することもでき"
 "ます。 そして、Hibernateに、ResultSet からオブジェクトへのマッピングをまかせ"
@@ -1073,7 +1073,7 @@
 "ばなりません。"
 
 #. Tag: programlisting
-#: session_api.xml:468
+#: session_api.xml:492
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
@@ -1083,7 +1083,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:470
+#: session_api.xml:494
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
@@ -1096,10 +1096,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:472
-#, no-c-format
+#: session_api.xml:496
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1108,24 +1108,24 @@
 "は、 <xref linkend=\"querysql\"/> を参照してください。"
 
 #. Tag: title
-#: session_api.xml:483
+#: session_api.xml:507
 #, no-c-format
 msgid "Modifying persistent objects"
 msgstr "永続オブジェクトの修正"
 
 #. Tag: para
-#: session_api.xml:485
-#, no-c-format
+#: session_api.xml:509
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "<emphasis>処理中の永続インスタンス</emphasis> (例: <literal>Session</"
 "literal> によって、 ロード、セーブ、作成、クエリされたオブジェクト)は、アプ"
@@ -1138,7 +1138,7 @@
 "literal> をオープンにしている間に、直接操作することです。"
 
 #. Tag: programlisting
-#: session_api.xml:496
+#: session_api.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat cat = (DomesticCat) sess.load( Cat.class, new Long"
@@ -1148,14 +1148,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:498
-#, no-c-format
+#: session_api.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "(オブジェクトをロードするための)SQLの <literal>SELECT</literal> と(更新さ"
 "れた状態を永続化するための) SQLの <literal>UPDATE</literal> が同じセッション"
@@ -1163,19 +1162,19 @@
 "す。 そのため、Hibernateは別の方法を用意しています。それは、インスタンスを分"
 "離する(detached)方法です。"
 
-#. Tag: emphasis
-#: session_api.xml:506
+#. Tag: para
+#: session_api.xml:529
 #, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "Hibernateは、 <placeholder-1/> 文や <placeholder-2/> 文を直接実行するAPIを用"
@@ -1189,13 +1188,13 @@
 "いくつかの工夫については、 <xref linkend=\"batch\"/> を参照してください。"
 
 #. Tag: title
-#: session_api.xml:521
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "分離オブジェクトの修正"
 
 #. Tag: para
-#: session_api.xml:523
+#: session_api.xml:548
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1211,7 +1210,7 @@
 "離性を保証するために、バージョンデータが通常使われます。"
 
 #. Tag: para
-#: session_api.xml:530
+#: session_api.xml:555
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1223,7 +1222,7 @@
 "に対応します。"
 
 #. Tag: programlisting
-#: session_api.xml:536
+#: session_api.xml:561
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1240,7 +1239,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:538
+#: session_api.xml:563
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1252,16 +1251,16 @@
 "ときに、例外が投げられます。"
 
 #. Tag: para
-#: session_api.xml:544
-#, no-c-format
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "同じ識別子を持つ永続インスタンスをセッションが既に保持していないことを 確信で"
 "きるなら <literal>update()</literal> を使いましょう。 そして、セッションの状"
@@ -1271,14 +1270,14 @@
 "セッションのなかで最初に呼ばれるメソッドになります。"
 
 #. Tag: para
-#: session_api.xml:553
-#, no-c-format
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "分離インスタンスから到達可能な、分離インスタンスをアプリケーションは個別に "
 "<literal>update()</literal> すべきです。それは、その状態を更新したい場合に "
@@ -1287,18 +1286,18 @@
 "照してください。"
 
 #. Tag: para
-#: session_api.xml:560
-#, no-c-format
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "メソッドでもまた、新しいセッションにオブジェクトを再関連付けできます。 しか"
 "し、分離インスタンスは無修正でなければなりません。"
 
 #. Tag: programlisting
-#: session_api.xml:565
+#: session_api.xml:590
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1310,11 +1309,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:567
-#, no-c-format
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1324,7 +1323,7 @@
 "ではありません。"
 
 #. Tag: para
-#: session_api.xml:574
+#: session_api.xml:599
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1334,13 +1333,13 @@
 "optimistic\"/> で述べています。"
 
 #. Tag: title
-#: session_api.xml:581
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "自動的な状態検出"
 
 #. Tag: para
-#: session_api.xml:583
+#: session_api.xml:608
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1355,7 +1354,7 @@
 "現したメソッドです。"
 
 #. Tag: programlisting
-#: session_api.xml:590
+#: session_api.xml:615
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1373,7 +1372,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:592
+#: session_api.xml:617
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1391,7 +1390,7 @@
 "もあります。"
 
 #. Tag: para
-#: session_api.xml:600
+#: session_api.xml:625
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1401,31 +1400,31 @@
 "のシナリオで 使われます。"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "アプリケーションが最初のセッションでオブジェクトをロードします。"
 
 #. Tag: para
-#: session_api.xml:612
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "オブジェクトがUI層に送られます。"
 
 #. Tag: para
-#: session_api.xml:617
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "オブジェクトに対して変更が加えられます。"
 
 #. Tag: para
-#: session_api.xml:622
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "オブジェクトがビジネスロジック層に送られます。"
 
 #. Tag: para
-#: session_api.xml:627
+#: session_api.xml:652
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1435,20 +1434,20 @@
 "とで、これらの変更を永続化します。"
 
 #. Tag: para
-#: session_api.xml:634
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal> は以下のことを行います。"
 
 #. Tag: para
-#: session_api.xml:640
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr ""
 "オブジェクトがこのセッションで、すでに永続化されていれば、何もしません。"
 
 #. Tag: para
-#: session_api.xml:645
+#: session_api.xml:670
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1458,14 +1457,14 @@
 "例外を投げます。"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
 "オブジェクトの識別子が値を持たないならば、 <literal>save()</literal> します。"
 
 #. Tag: para
-#: session_api.xml:656
+#: session_api.xml:681
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1476,11 +1475,11 @@
 "す。"
 
 #. Tag: para
-#: session_api.xml:662
-#, no-c-format
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1490,20 +1489,20 @@
 "ある場合、 そのオブジェクトを <literal>save()</literal> します。"
 
 #. Tag: para
-#: session_api.xml:670
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr ""
 "そうでない場合は、そのオブジェクトを <literal>update()</literal> します。"
 
 #. Tag: para
-#: session_api.xml:676
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "そして、 <literal>merge()</literal> は以下のようにとても異なります。"
 
 #. Tag: para
-#: session_api.xml:682
+#: session_api.xml:707
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1514,7 +1513,7 @@
 "ば、 引数で受け取ったオブジェクトの状態を永続化インスタンスにコピーします。"
 
 #. Tag: para
-#: session_api.xml:689
+#: session_api.xml:714
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1524,13 +1523,13 @@
 "からそれをロードするか、あるいは、新しい永続化インスタンスを作成します。"
 
 #. Tag: para
-#: session_api.xml:695
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "永続化インスタンスが返されます。"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:725
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1540,19 +1539,19 @@
 "のままです。"
 
 #. Tag: title
-#: session_api.xml:710
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "永続オブジェクトの削除"
 
 #. Tag: para
-#: session_api.xml:712
-#, no-c-format
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "<literal>Session.delete()</literal> はオブジェクトの状態をデータベースから削"
 "除します。 もちろん、削除したオブジェクトをアプリケーションが保持したままでも"
@@ -1560,19 +1559,19 @@
 "にするものと考えるのが一番です。"
 
 #. Tag: programlisting
-#: session_api.xml:719
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:721
-#, no-c-format
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "外部キー制約に違反するリスクもなく、好きな順番でオブジェクトを削除することが"
 "できます。 ただし、間違った順番でオブジェクトを削除すると、外部キーカラムの "
@@ -1580,16 +1579,16 @@
 "ジェクトを削除したときに、子供オブジェクトを削除し忘れた場合です。"
 
 #. Tag: title
-#: session_api.xml:732
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "異なる二つのデータストア間でのオブジェクトのレプリケーション"
 
 #. Tag: para
-#: session_api.xml:734
-#, no-c-format
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1597,7 +1596,7 @@
 "生成せずにすむと便利な場合があります。"
 
 #. Tag: programlisting
-#: session_api.xml:740
+#: session_api.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1616,51 +1615,51 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:742
-#, no-c-format
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "レプリケーション先のデータベースに行が既にある場合、 <literal>replicate()</"
 "literal> が衝突をどのように扱うかを <literal>ReplicationMode</literal> で指定"
 "します。"
 
 #. Tag: para
-#: session_api.xml:749
-#, no-c-format
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.IGNORE</literal> - 同じ識別子を持つ行がデータベース"
 "に存在するなら、 そのオブジェクトを無視します。"
 
 #. Tag: para
-#: session_api.xml:755
-#, no-c-format
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.OVERWRITE</literal> - 同じ識別子を持つ既存の行を す"
 "べて上書きします。"
 
 #. Tag: para
-#: session_api.xml:761
-#, no-c-format
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.EXCEPTION</literal> - 同じ識別子を持つ行がデータベー"
 "スに存在するなら、 例外を投げます。"
 
 #. Tag: para
-#: session_api.xml:767
-#, no-c-format
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1669,7 +1668,7 @@
 "きします。"
 
 #. Tag: para
-#: session_api.xml:775
+#: session_api.xml:800
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1682,112 +1681,111 @@
 "ザクションのなかで加えられた変更のロールバックなどです。"
 
 #. Tag: title
-#: session_api.xml:784
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "セッションのフラッシュ"
 
 #. Tag: para
-#: session_api.xml:786
-#, no-c-format
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "JDBCコネクションの状態とメモリ上のオブジェクトの状態を同期させるために必要な "
 "SQL文を <literal>Session</literal> が実行することがときどきあります。 この処"
 "理 <emphasis>flush</emphasis> は、デフォルトでは次のときに起こります。"
 
 #. Tag: para
-#: session_api.xml:795
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr "クエリを実行する前"
 
 #. Tag: para
-#: session_api.xml:800
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr "<literal>org.hibernate.Transaction.commit()</literal> を実行したとき"
 
 #. Tag: para
-#: session_api.xml:805
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "<literal>Session.flush()</literal> を実行したとき"
 
 #. Tag: para
-#: session_api.xml:811
-#, no-c-format
-msgid "The SQL statements are issued in the following order"
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "SQL文は以下の順番で発行されます。"
 
 #. Tag: para
-#: session_api.xml:817
-#, no-c-format
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "すべてのエンティティの挿入。これは、 <literal>Session.save()</literal> を使っ"
 "てセーブした オブジェクトの順に実行していきます。"
 
 #. Tag: para
-#: session_api.xml:823
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr "すべてのエンティティの更新"
 
 #. Tag: para
-#: session_api.xml:828
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr "すべてのコレクションの削除"
 
 #. Tag: para
-#: session_api.xml:833
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "すべてのコレクションの要素に対する削除、更新、挿入"
 
 #. Tag: para
-#: session_api.xml:838
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr "すべてのコレクションの挿入"
 
 #. Tag: para
-#: session_api.xml:843
-#, no-c-format
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "すべてのエンティティの削除。これは、<literal>Session.delete()</literal> を"
 "使って 削除したオブジェクトの順に実行していきます。"
 
 #. Tag: para
-#: session_api.xml:850
-#, no-c-format
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(1つ例外があります。 <literal>native</literal> ID 生成を使ったオブジェクト"
 "は、 それらがセーブされたときに挿入されます。)"
 
 #. Tag: para
-#: session_api.xml:855
-#, no-c-format
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "明示的に <literal>flush()</literal> するときを除いて、 <emphasis>いつ</"
 "emphasis><literal>Session</literal> がJDBCをコールするのかについて 絶対的な保"
@@ -1796,17 +1794,17 @@
 "データや間違ったデータ返さないことを 保証しています。"
 
 #. Tag: para
-#: session_api.xml:863
-#, no-c-format
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "フラッシュが頻繁に起こらないようにデフォルトの振る舞いを変えることができま"
 "す。 <literal>FlushMode</literal> クラスは3つの異なるモードを定義します。 そ"
@@ -1818,7 +1816,7 @@
 "longsession\"/> を参照してください)。"
 
 #. Tag: programlisting
-#: session_api.xml:873
+#: session_api.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1838,7 +1836,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:875
+#: session_api.xml:900
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1852,13 +1850,13 @@
 "で説明します。"
 
 #. Tag: title
-#: session_api.xml:884
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "連鎖的な永続化"
 
 #. Tag: para
-#: session_api.xml:886
+#: session_api.xml:911
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1870,17 +1868,17 @@
 "は、親子関係を扱うケースです。 以下の例を考えてみましょう。"
 
 #. Tag: para
-#: session_api.xml:892
-#, no-c-format
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "もし、親子関係の子が値型なら(例えば、住所や文字列のコレクション)、 それらの"
 "ライフサイクルは親に依存しており、便利な状態変化の\"カスケード\"を使うため"
@@ -1891,12 +1889,12 @@
 "参照を共有できないので、データベースからその子供を削除します。"
 
 #. Tag: para
-#: session_api.xml:903
-#, no-c-format
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1911,7 +1909,7 @@
 "よる永続化</emphasis> をデフォルトでは実行しません。"
 
 #. Tag: para
-#: session_api.xml:912
+#: session_api.xml:937
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1931,29 +1929,29 @@
 "ん。 例えば、以下のようにします。"
 
 #. Tag: programlisting
-#: session_api.xml:921
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:923
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "カスケードスタイルは、組み合わせることができます。"
 
 #. Tag: programlisting
-#: session_api.xml:927
+#: session_api.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:929
-#, no-c-format
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -1964,7 +1962,7 @@
 "します。"
 
 #. Tag: para
-#: session_api.xml:935
+#: session_api.xml:960
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -1977,16 +1975,16 @@
 "<literal>delete()</literal> 操作が適用されることを意味します。"
 
 #. Tag: para
-#: session_api.xml:942
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr "おすすめ:"
 
 #. Tag: para
-#: session_api.xml:948
-#, no-c-format
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -1997,7 +1995,7 @@
 "literal> 関連に対しては、 カスケードが役に立つことがあります。"
 
 #. Tag: para
-#: session_api.xml:956
+#: session_api.xml:981
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -2009,7 +2007,7 @@
 "を <emphasis>ライフサイクルオブジェクト</emphasis> にします。"
 
 #. Tag: para
-#: session_api.xml:963
+#: session_api.xml:988
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -2023,7 +2021,7 @@
 "\"</literal> を使うことを考えましょう。"
 
 #. Tag: para
-#: session_api.xml:971
+#: session_api.xml:996
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -2036,12 +2034,12 @@
 "親のセーブ/更新/削除が、子のセーブ/更新/削除を引き起こす関係のことです。"
 
 #. Tag: para
-#: session_api.xml:977
-#, no-c-format
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -2055,7 +2053,7 @@
 "になります。"
 
 #. Tag: para
-#: session_api.xml:988
+#: session_api.xml:1013
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -2065,7 +2063,7 @@
 "<literal>persist()</literal> に渡されます。"
 
 #. Tag: para
-#: session_api.xml:994
+#: session_api.xml:1019
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -2075,7 +2073,7 @@
 "literal> に渡されます。"
 
 #. Tag: para
-#: session_api.xml:1000
+#: session_api.xml:1025
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2087,7 +2085,7 @@
 "<literal>saveOrUpdate()</literal> に渡されます。"
 
 #. Tag: para
-#: session_api.xml:1006
+#: session_api.xml:1031
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2097,7 +2095,7 @@
 "<literal>saveOrUpdate()</literal> に渡されます。"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1037
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2107,7 +2105,7 @@
 "す。"
 
 #. Tag: para
-#: session_api.xml:1017
+#: session_api.xml:1042
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2121,13 +2119,13 @@
 "きます。 この場合、「親のない」子は削除されます。"
 
 #. Tag: para
-#: session_api.xml:1026
-#, no-c-format
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2140,21 +2138,21 @@
 "ンティティに伝播します。"
 
 #. Tag: title
-#: session_api.xml:1038
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr "メタデータの使用"
 
 #. Tag: para
-#: session_api.xml:1040
-#, no-c-format
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "Hibernateは、すべてのエンティティと値型の非常にリッチなメタレベルのモデルを必"
 "要とします。 ときどき、このモデルはアプリケーションにとってとても役に立ちま"
@@ -2165,12 +2163,12 @@
 "るものです。"
 
 #. Tag: para
-#: session_api.xml:1047
-#, no-c-format
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "Hibernateは<literal>ClassMetadata</literal> と<literal>CollectionMetadata</"
@@ -2179,7 +2177,7 @@
 "<literal>SessionFactory</literal> から得られます。"
 
 #. Tag: programlisting
-#: session_api.xml:1054
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,26 +11,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: toolset_guide.xml:5
+#: toolset_guide.xml:29
 #, no-c-format
 msgid "Toolset Guide"
 msgstr "Toolset Guide ツールセットガイド"
 
 #. Tag: para
-#: toolset_guide.xml:7
-#, no-c-format
+#: toolset_guide.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "Hibernateを使ったラウンドトリップエンジニアリングは、 Eclipseプラグインやコマ"
 "ンドラインツール、もちろんAntタスクを使うことで可能です。"
 
 #. Tag: para
-#: toolset_guide.xml:12
-#, no-c-format
+#: toolset_guide.xml:36
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -38,13 +38,13 @@
 "ニアリングのAntタスクに加えて、EclipseIDEのプラグインを含みます。"
 
 #. Tag: para
-#: toolset_guide.xml:18
-#, no-c-format
+#: toolset_guide.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>マッピングエディタ:</emphasis> HibernateのXMLマッピングファイル用の"
 "エディタで、 自動補完と構文強調表示をサポートしています。クラス名やプロパ"
@@ -52,14 +52,14 @@
 "す。"
 
 #. Tag: para
-#: toolset_guide.xml:23
-#, no-c-format
+#: toolset_guide.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>Console:</emphasis> コンソールはエクリプスの新しいビューです。 コン"
 "ソールコンフィギュレーションのツリーオーバービューに加えて、永続クラスとその"
@@ -67,15 +67,14 @@
 "リプス上で見ることができます。"
 
 #. Tag: para
-#: toolset_guide.xml:30
-#, no-c-format
+#: toolset_guide.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>開発ウィザード</emphasis> HibernateのEclipseツールはいくつかのウィ"
 "ザードを提供します。 ウィザードを使ってHibernateの設定ファイル(cfg.xml)をすば"
@@ -84,47 +83,41 @@
 "す。 リバースエンジニアリングウィザードはカスタマイズ可能なテンプレートをサ"
 "ポートします。"
 
-#. Tag: emphasis
-#: toolset_guide.xml:38
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr "Ant Tasks:"
-
 #. Tag: para
-#: toolset_guide.xml:43
-#, no-c-format
+#: toolset_guide.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "より詳しい情報は <emphasis>Hibernate Tools</emphasis> パッケージとそのドキュ"
 "メントを参照してください。"
 
 #. Tag: para
-#: toolset_guide.xml:48
-#, no-c-format
+#: toolset_guide.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "しかし、Hibernateのメインパッケージは <emphasis>SchemaExport</emphasis> 、 別"
 "名 <literal>hbm2ddl</literal> も含みます(Hibernate内でオンザフライで使用でき"
 "ます)。"
 
 #. Tag: title
-#: toolset_guide.xml:55
+#: toolset_guide.xml:79
 #, no-c-format
 msgid "Automatic schema generation"
 msgstr "スキーマの自動生成"
 
 #. Tag: para
-#: toolset_guide.xml:57
-#, no-c-format
+#: toolset_guide.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "DDLはHibernateユーティリティによりマッピングファイルから生成することができま"
@@ -133,38 +126,40 @@
 "子ジェネレータに対して生成されます。"
 
 #. Tag: para
-#: toolset_guide.xml:64
-#, no-c-format
+#: toolset_guide.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "DDLはベンダー依存なので、このツールを使うときは、<literal>hibernate.dialect</"
 "literal> プロパティでSQLの <literal>方言</literal> を指定 <emphasis>しなけれ"
 "ばなりません</emphasis> 。"
 
 #. Tag: para
-#: toolset_guide.xml:70
-#, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+#: toolset_guide.xml:94
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr ""
 "まず、生成されるスキーマを改善するように、マッピングファイルをカスタマイズし"
 "てください。"
 
 #. Tag: title
-#: toolset_guide.xml:75
+#: toolset_guide.xml:99
 #, no-c-format
 msgid "Customizing the schema"
 msgstr "スキーマのカスタマイズ"
 
 #. Tag: para
-#: toolset_guide.xml:77
-#, no-c-format
+#: toolset_guide.xml:101
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "多くのHibernateのマッピング要素では、オプションの <literal>length</literal> "
@@ -172,39 +167,39 @@
 "(またはNUMERIC/DECIMAL型のデータの精度を設定できます)。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:84
+#: toolset_guide.xml:108
 #, no-c-format
 msgid "<![CDATA[<property name=\"zip\" length=\"5\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:85
+#: toolset_guide.xml:109
 #, no-c-format
 msgid "<![CDATA[<property name=\"balance\" precision=\"12\" scale=\"2\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:87
-#, no-c-format
+#: toolset_guide.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "<literal>not-null</literal> 属性(テーブルのカラムへ <literal>NOT NULL</"
 "literal> 制約を生成する)と <literal>unique</literal> 属性(テーブルのカラム"
 "へ <literal>UNIQUE</literal> 制約を生成する)が設定できるタグもあります。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:93
+#: toolset_guide.xml:117
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:95
+#: toolset_guide.xml:119
 #, no-c-format
 msgid ""
 "<![CDATA[<element column=\"serialNumber\" type=\"long\" not-null=\"true\" "
@@ -212,14 +207,14 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:97
-#, no-c-format
+#: toolset_guide.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "<literal>unique-key</literal> 属性はカラムをグループ化して一つのキー制約にす"
 "るために使われます。 現在、<literal>unique-key</literal> 属性で指定された値は"
@@ -227,7 +222,7 @@
 "グループ化することにのみ使われます。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:105
+#: toolset_guide.xml:129
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"org\" column=\"orgId\" unique-key="
@@ -236,19 +231,19 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:107
-#, no-c-format
+#: toolset_guide.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "<literal>index</literal> 属性はマッピングするカラムを使って生成したインデック"
 "スの名前を指定します。 複数カラムを1つのインデックスにグループ化できます。単"
 "に、同じインデックス名を指定するだけです。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:113
+#: toolset_guide.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
@@ -256,17 +251,17 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:115
-#, no-c-format
+#: toolset_guide.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "<literal>foreign-key</literal> 属性は、生成された外部キー制約の名前をオーバー"
 "ライドするために使用できます。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:120
+#: toolset_guide.xml:144
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" foreign-key=\"FKFooBar\"/"
@@ -274,7 +269,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:122
+#: toolset_guide.xml:146
 #, no-c-format
 msgid ""
 "Many mapping elements also accept a child <literal>&lt;column&gt;</literal> "
@@ -284,7 +279,7 @@
 "す。これは複数カラム型のマッピングには特に有用です。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:127
+#: toolset_guide.xml:151
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
@@ -297,19 +292,19 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:129
-#, no-c-format
+#: toolset_guide.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "<literal>default</literal> 属性はカラムのデフォルト値を指定します (マッピング"
 "したクラスの新しいインスタンスを保存する前に、 マッピングしたプロパティへ同じ"
 "値を代入すべきです)。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:135
+#: toolset_guide.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
@@ -318,7 +313,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:137
+#: toolset_guide.xml:161
 #, no-c-format
 msgid ""
 "<![CDATA[<version name=\"version\" type=\"integer\" insert=\"false\">\n"
@@ -327,7 +322,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:139
+#: toolset_guide.xml:163
 #, no-c-format
 msgid ""
 "The <literal>sql-type</literal> attribute allows the user to override the "
@@ -337,7 +332,7 @@
 "へのマッピングをオーバーライドできます。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:144
+#: toolset_guide.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
@@ -346,7 +341,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:146
+#: toolset_guide.xml:170
 #, no-c-format
 msgid ""
 "The <literal>check</literal> attribute allows you to specify a check "
@@ -354,7 +349,7 @@
 msgstr "<literal>check</literal> 属性でチェック制約を指定することができます。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:150
+#: toolset_guide.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"foo\" type=\"integer\">\n"
@@ -363,7 +358,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:152
+#: toolset_guide.xml:176
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Foo\" table=\"foos\" check=\"bar < 100.0\">\n"
@@ -372,152 +367,158 @@
 "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:156
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr "まとめ"
 
 #. Tag: entry
-#: toolset_guide.xml:163
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr "属性"
 
 #. Tag: entry
-#: toolset_guide.xml:164
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr "値"
 
 #. Tag: entry
-#: toolset_guide.xml:165
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr "説明"
 
 #. Tag: literal
-#: toolset_guide.xml:170
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:171 toolset_guide.xml:176 toolset_guide.xml:181
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr "数値"
 
 #. Tag: entry
-#: toolset_guide.xml:172
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr "カラムの長さ"
 
 #. Tag: literal
-#: toolset_guide.xml:175
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:177
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr "カラムのDECIMAL型の精度(precision)"
 
 #. Tag: literal
-#: toolset_guide.xml:180
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:182
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr "カラムのDECIMAL型のスケール(scale)"
 
 #. Tag: literal
-#: toolset_guide.xml:185
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:186 toolset_guide.xml:191
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:187
-#, no-c-format
-msgid "specfies that the column should be non-nullable"
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "カラムがnull値を取らないことを指定します"
 
 #. Tag: literal
-#: toolset_guide.xml:190
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:192
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "カラムがユニーク制約を持つことを指定します"
 
 #. Tag: literal
-#: toolset_guide.xml:195
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:196
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr "インデックス名"
 
 #. Tag: entry
-#: toolset_guide.xml:197
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "(複数カラムの)インデックスの名前を指定します"
 
 #. Tag: literal
-#: toolset_guide.xml:200
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:201
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr "ユニークキー名"
 
 #. Tag: entry
-#: toolset_guide.xml:202
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "複数カラムのユニーク制約の名前を指定します"
 
 #. Tag: literal
-#: toolset_guide.xml:205
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:206
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "外部キー名"
 
 #. Tag: entry
-#: toolset_guide.xml:207
+#: toolset_guide.xml:233
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -532,19 +533,19 @@
 "be considered by <placeholder-6/>."
 
 #. Tag: literal
-#: toolset_guide.xml:217
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:218
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQLのカラム型"
 
 #. Tag: entry
-#: toolset_guide.xml:219
+#: toolset_guide.xml:245
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -553,37 +554,37 @@
 "デフォルトのカラム型をオーバーライドします( <placeholder-1/> 要素の属性のみ)"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:226 toolset_guide.xml:233
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, no-c-format
 msgid "SQL expression"
 msgstr "SQL式"
 
 #. Tag: entry
-#: toolset_guide.xml:227
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "カラムのデフォルト値を指定します"
 
 #. Tag: literal
-#: toolset_guide.xml:232
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:234
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr "カラムかテーブルにSQLのチェック制約を作成します"
 
 #. Tag: para
-#: toolset_guide.xml:242
+#: toolset_guide.xml:268
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -593,7 +594,7 @@
 "ことができます。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:247
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -603,7 +604,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:249
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -614,23 +615,23 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:251
-#, no-c-format
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "これにより、生成したDDLに <literal>comment on table</literal> や "
 "<literal>comment on column</literal> 文が書かれます。"
 
 #. Tag: title
-#: toolset_guide.xml:260
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr "ツールの実行"
 
 #. Tag: para
-#: toolset_guide.xml:262
+#: toolset_guide.xml:288
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -640,7 +641,17 @@
 "DDL文を実行したりもします。"
 
 #. Tag: para
-#: toolset_guide.xml:267
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr ""
+"<literal>SchemaExport</literal> Command Line Options <literal>SchemaExport</"
+"literal> のコマンドラインオプション"
+
+#. Tag: para
+#: toolset_guide.xml:295
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -649,7 +660,7 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:273
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr ""
@@ -657,28 +668,28 @@
 "literal> のコマンドラインオプション"
 
 #. Tag: entry
-#: toolset_guide.xml:279 toolset_guide.xml:429 toolset_guide.xml:498
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr "オプション"
 
 #. Tag: entry
-#: toolset_guide.xml:280 toolset_guide.xml:367 toolset_guide.xml:430
-#: toolset_guide.xml:499
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
 #, no-c-format
 msgid "Description"
 msgstr "説明"
 
 #. Tag: literal
-#: toolset_guide.xml:285 toolset_guide.xml:435
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:286 toolset_guide.xml:436
+#: toolset_guide.xml:314 toolset_guide.xml:464
 #, fuzzy, no-c-format
-msgid "don't output the script to stdout"
+msgid "do not output the script to stdout"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "スクリプトを標準出力に出力しません\n"
@@ -686,85 +697,85 @@
 "標準出力にスクリプトを出力しません"
 
 #. Tag: literal
-#: toolset_guide.xml:289
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:290
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr "テーブルの削除だけを行います"
 
 #. Tag: literal
-#: toolset_guide.xml:293
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:294
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr "テーブルの生成のみを行います。"
 
 #. Tag: literal
-#: toolset_guide.xml:297 toolset_guide.xml:439
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:298
-#, no-c-format
-msgid "don't export to the database"
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "データベースにエクスポートしません"
 
 #. Tag: literal
-#: toolset_guide.xml:301
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:302
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "DDLスクリプトをファイルに出力します"
 
 #. Tag: literal
-#: toolset_guide.xml:305 toolset_guide.xml:443 toolset_guide.xml:504
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
 #. Tag: entry
-#: toolset_guide.xml:306 toolset_guide.xml:444 toolset_guide.xml:505
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "<literal>hibernate.properties</literal> ファイル内で"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:451 toolset_guide.xml:512
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:310
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "XMLファイルからHibernateの定義情報を読み込みます"
 
 #. Tag: literal
-#: toolset_guide.xml:313 toolset_guide.xml:447 toolset_guide.xml:508
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
 #. Tag: entry
-#: toolset_guide.xml:314 toolset_guide.xml:448 toolset_guide.xml:509
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -776,38 +787,38 @@
 "ファイルからデータベースのプロパティを読み込みます"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "スクリプト内に生成するSQLを読みやすいようにフォーマットします"
 
 #. Tag: literal
-#: toolset_guide.xml:321
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=x"
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "スクリプトの行区切り文字を設定します"
 
 #. Tag: para
-#: toolset_guide.xml:328
-#, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 "アプリケーションに <literal>SchemaExport</literal> を組み込むこともできます:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:332
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -815,19 +826,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:337
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr "プロパティ"
 
 #. Tag: para
-#: toolset_guide.xml:339
-#, no-c-format
-msgid "Database properties may be specified"
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "次のように、データベースのプロパティを指定することができます。"
 
 #. Tag: para
-#: toolset_guide.xml:345
+#: toolset_guide.xml:373
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -837,103 +848,103 @@
 "プロパティとして"
 
 #. Tag: para
-#: toolset_guide.xml:348
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "<literal>hibernate.properties</literal> ファイル内で"
 
 #. Tag: para
-#: toolset_guide.xml:351
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr "<literal>--properties</literal> を使って指定したプロパティファイル内で"
 
 #. Tag: para
-#: toolset_guide.xml:355
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "必要なプロパティは以下のものです:"
 
 #. Tag: title
-#: toolset_guide.xml:360
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExportコネクションプロパティ"
 
 #. Tag: entry
-#: toolset_guide.xml:366
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr "プロパティ名"
 
 #. Tag: literal
-#: toolset_guide.xml:372
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:373
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "jdbcのドライバークラス"
 
 #. Tag: literal
-#: toolset_guide.xml:376
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:377
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr "jdbcのurl"
 
 #. Tag: literal
-#: toolset_guide.xml:380
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:381
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr "データベースのユーザ"
 
 #. Tag: literal
-#: toolset_guide.xml:384
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:385
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr "ユーザパスワード"
 
 #. Tag: literal
-#: toolset_guide.xml:388
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:389
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr "データベース方言"
 
 #. Tag: title
-#: toolset_guide.xml:398
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr "Antを使用する"
 
 #. Tag: para
-#: toolset_guide.xml:400
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
@@ -942,7 +953,7 @@
 "きます。:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:404
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -965,19 +976,18 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:409
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "インクリメンタルなスキーマ更新"
 
 #. Tag: para
-#: toolset_guide.xml:411
-#, no-c-format
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "<literal>SchemaUpdate</literal> ツールは既存のスキーマをインクリメンタルに更"
 "新します。 <literal>SchemaUpdate</literal> はJDBCのメタデータAPIに強く依存し"
@@ -985,7 +995,7 @@
 "ださい。"
 
 #. Tag: para
-#: toolset_guide.xml:417
+#: toolset_guide.xml:445
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -994,33 +1004,33 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:423
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal> のコマンドライン・オプション"
 
 #. Tag: entry
-#: toolset_guide.xml:440
-#, no-c-format
-msgid "don't export the script to the database"
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "データベースにスクリプトをエクスポートしません"
 
 #. Tag: entry
-#: toolset_guide.xml:452 toolset_guide.xml:513
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr "<placeholder-1/> ファイルを指定します"
 
 #. Tag: para
-#: toolset_guide.xml:458
-#, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 "アプリケーションに <literal>SchemaUpdate</literal> を組み込むことができま"
 "す。:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:462
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1028,20 +1038,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:467
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "インクリメンタルなスキーマ更新に対するAntの使用"
 
 #. Tag: para
-#: toolset_guide.xml:469
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 "Antスクリプトから <literal>SchemaUpdate</literal> を呼び出すことができます:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:473
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1060,20 +1070,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:478
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr "Schema validation"
 
 #. Tag: para
-#: toolset_guide.xml:480
-#, no-c-format
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "<literal>SchemaValidator</literal> ツールは、既存のデータベーススキーマと作成"
 "したマッピングドキュメントが\"一致する\"ことを検証します。 "
@@ -1082,7 +1092,7 @@
 "ん。このツールはテスト時に非常に有用です。"
 
 #. Tag: para
-#: toolset_guide.xml:486
+#: toolset_guide.xml:514
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1090,22 +1100,30 @@
 "<emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal> のコマンドライン・オプション"
+
 #. Tag: title
-#: toolset_guide.xml:492
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> のコマンドライン・オプション"
 
 #. Tag: para
-#: toolset_guide.xml:519
-#, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr ""
 "<literal>SchemaValidator</literal> をアプリケーションに組み込むことが出来ま"
 "す:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:523
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1113,19 +1131,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:528
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "スキーマのバリデーションにAntを使用します"
 
 #. Tag: para
-#: toolset_guide.xml:530
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr "Antスクリプトから <literal>SchemaValidator</literal> を呼び出せます:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:534
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
@@ -1142,6 +1160,9 @@
 "</target>]]>"
 msgstr ""
 
+#~ msgid "Ant Tasks:"
+#~ msgstr "Ant Tasks:"
+
 #~ msgid "&lt;one-to-one&gt;"
 #~ msgstr "&lt;one-to-one&gt;"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,18 +12,18 @@
 
 #. Tag: title
 #: transactions.xml:29
-#, no-c-format
-msgid "Transactions And Concurrency"
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "トランザクションと並行性"
 
 #. Tag: para
 #: transactions.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "Hibernateと同時実行制御について最も重要な点は、容易に理解できることです。 "
@@ -33,14 +33,13 @@
 
 #. Tag: para
 #: transactions.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "Hibernateはメモリ内のオブジェクトをロックしません。 アプリケーションは、デー"
 "タベーストランザクションの分離レベルで 定義した振る舞いを期待できます。 トラ"
@@ -50,12 +49,12 @@
 
 #. Tag: para
 #: transactions.xml:46
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "バージョニングによる自動的な楽観的同時実行制御に加えて、 <literal>SELECT FOR "
 "UPDATE</literal> 文を使用して、 行を悲観的ロックするための(マイナーな)APIも"
@@ -64,9 +63,9 @@
 
 #. Tag: para
 #: transactions.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -84,12 +83,12 @@
 
 #. Tag: para
 #: transactions.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "<literal>SessionFactory</literal> は生成することが高価で、 スレッドセーフなオ"
 "ブジェクトです。 よって、アプリケーションのすべてのスレッドで共有すべきで"
@@ -98,13 +97,13 @@
 
 #. Tag: para
 #: transactions.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "<literal>Session</literal> は高価ではなく、スレッドセーフなオブジェクトでもあ"
 "りません。 よって、1つの要求や1つの対話、1つの作業単位(unit of work)に対"
@@ -115,14 +114,13 @@
 
 #. Tag: para
 #: transactions.xml:76
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "この状況を完了させるために、 データベーストランザクションについても考えなけれ"
 "ばなりません。 データベース内のロックの競合を少なくするために、 データベース"
@@ -132,14 +130,14 @@
 "るのは、たいていの場合よい設計とはいえません。"
 
 #. Tag: para
-#: transactions.xml:85
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "作業単位というスコープとは何でしょうか? 1つのHibernate <literal>Session</"
 "literal> は、 いくつかのデータベーストランザクションをまたがることができるで"
@@ -148,28 +146,43 @@
 "境界をどのように分けるのでしょうか?"
 
 #. Tag: title
-#: transactions.xml:93
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "作業単位(Unit of work)"
 
 #. Tag: para
-#: transactions.xml:95
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "1つ目は、<emphasis>session-per-operation</emphasis> アンチパターンを使っては"
@@ -189,19 +202,19 @@
 "ん。 後者は保守性や拡張性もよりすぐれています。"
 
 #. Tag: para
-#: transactions.xml:111
+#: transactions.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is sent to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "マルチユーザーのクライアント/サーバーアプリケーションの中で、 最もよく使われ"
 "るパターンは、<emphasis>session-per-request</emphasis> です。 このモデルの中"
@@ -215,20 +228,20 @@
 "す。 このモデルは多くのアプリケーションに完全に適合します。"
 
 #. Tag: para
-#: transactions.xml:123
+#: transactions.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is sent to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "以降の実装にチャレンジしてください。 Hibernateは単純なこのパターンのために、"
 "予め組み込まれた 「current session」の管理を提供します。 サーバーリクエストを"
@@ -243,15 +256,14 @@
 "ほうがよいです。"
 
 #. Tag: para
-#: transactions.xml:136
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "アプリケーションのコードは、必要なときにどこでも、何回でも、 単に "
 "<literal>sessionFactory.getCurrentSession()</literal> を呼び出すだけで 「現在"
@@ -261,19 +273,18 @@
 "current-session\"/> を参照してください)。"
 
 #. Tag: para
-#: transactions.xml:144
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "ときどき、「ビューを描画する」まで <literal>セッション</literal> とデータベー"
 "ストランザクションのスコープを拡張すると便利なことがあります。 これは、要求の"
@@ -286,20 +297,20 @@
 "いては、 HibernateのWebサイトやフォーラムを参照してください。"
 
 #. Tag: title
-#: transactions.xml:159
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "長い対話"
 
 #. Tag: para
-#: transactions.xml:161
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "session-per-requestパターンは、作業単位を設計する際に役立つ考えというだけでは"
 "ありません。 多くのビジネスプロセスは、ユーザーとの一連の相互作用全体を要求し"
@@ -308,10 +319,10 @@
 "まで渡ることは許されません。 次の例をよく考えてみてください。"
 
 #. Tag: para
-#: transactions.xml:171
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -320,39 +331,38 @@
 "ブジェクトを自由に修正できます。"
 
 #. Tag: para
-#: transactions.xml:178
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "5分後にユーザーは「Save」をクリックし、修正が永続化されるのを期待します。 ま"
 "た、この情報を編集したのは自分1人だけで、 修正のコンフリクトは発生しないと期"
 "待します。"
 
 #. Tag: para
-#: transactions.xml:186
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "この作業単位を(ユーザーの視点で)長期の <emphasis>対話</emphasis> (もしく"
 "は、<emphasis>アプリケーショントランザクション</emphasis> )と呼びます。 アプ"
 "リケーションにこれを実装する方法はたくさんあります。"
 
 #. Tag: para
-#: transactions.xml:192
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "最初に思いつく実装は、ユーザーが考えている間、<literal>Session</literal> と"
 "データベーストランザクションを開いたままにしておくことです。 同時に修正され"
@@ -362,17 +372,17 @@
 "す。"
 
 #. Tag: para
-#: transactions.xml:200
+#: transactions.xml:214
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"conversation. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "明らかに、対話を実装するためには、 いくつかのデータベーストランザクションを使"
 "用するべきです。 この場合、ビジネスプロセスの分離を維持することは、 アプリ"
@@ -384,28 +394,28 @@
 "ば、特に簡単です。"
 
 #. Tag: para
-#: transactions.xml:213
+#: transactions.xml:227
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occurred during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>自動バージョニング</emphasis> - Hibernateは自動的に楽観的同時実行制"
 "御ができます。 ユーザーが考えている間に同時に修正がおきた場合、自動的に検出で"
 "きます。 通常、対話の終了時にチェックするだけです。"
 
 #. Tag: para
-#: transactions.xml:221
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>分離(Detached)オブジェクト</emphasis> - すでに議論した "
 "<emphasis>session-per-request</emphasis> パターンを使うと決定した場合、 ロー"
@@ -416,17 +426,17 @@
 "きます。"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:245
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitly."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>拡張(もしくは、長い)セッション</emphasis> - Hibernateの "
 "<literal>Session</literal> は、 データベーストランザクションをコミットした"
@@ -438,13 +448,13 @@
 "を自動的にフラッシュさせず、 明示的にフラッシュします。"
 
 #. Tag: para
-#: transactions.xml:244
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "<emphasis>session-per-request-with-detached-objects</emphasis> と "
 "<emphasis>session-per-conversation</emphasis> の2つは、 利点と欠点を持ってい"
@@ -452,19 +462,19 @@
 "します。"
 
 #. Tag: title
-#: transactions.xml:253
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "オブジェクト識別子を考える"
 
 #. Tag: para
-#: transactions.xml:255
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "アプリケーションは、2つの異なる <literal>Session</literal> から 同じ永続状態"
 "に同時にアクセスできます。 しかし、2つの <literal>Session</literal> インスタ"
@@ -472,41 +482,41 @@
 "識別子には2つの異なる概念があるということになります。"
 
 #. Tag: term
-#: transactions.xml:264
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "データベース識別子"
 
 #. Tag: literal
-#: transactions.xml:267
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:272
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM識別子"
 
 #. Tag: literal
-#: transactions.xml:275
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:281
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "<emphasis>個々の</emphasis><literal>Session</literal> に追加されたオブジェク"
 "トにとって (すなわち、1つの <literal>Session</literal> のスコープの中で"
@@ -518,16 +528,16 @@
 "す。"
 
 #. Tag: para
-#: transactions.xml:290
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "このアプローチでは、Hibernateとデータベースに同時実行についての心配が残りま"
 "す。 一方で、最高のスケーラビリティが提供されます。 なぜなら、1スレッドの作"
@@ -538,28 +548,29 @@
 "めに、 <literal>==</literal> を安全に使用できます。"
 
 #. Tag: para
-#: transactions.xml:299
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "けれども、<literal>Session</literal> の外で <literal>==</literal> を使うアプ"
 "リケーションは、予期しない結果に遭遇します。 これは予期しない場所で起こりえま"
@@ -580,19 +591,19 @@
 "ジェクトの識別子や等価性を どのように実装すべきかということです。"
 
 #. Tag: title
-#: transactions.xml:320
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "一般的な問題"
 
 #. Tag: para
-#: transactions.xml:322
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "<emphasis>session-per-user-session</emphasis> と <emphasis>session-per-"
@@ -601,17 +612,17 @@
 "現します。 設計を決定する前に、裏の意味を理解するようにしてください。"
 
 #. Tag: para
-#: transactions.xml:331
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "<literal>Session</literal> はスレッドセーフではありません。 HTTPリクエスト、"
 "セッションBean、Swingワーカーのように、 同時実行が可能なものが "
@@ -623,18 +634,18 @@
 "れます。"
 
 #. Tag: para
-#: transactions.xml:342
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "Hibernateが例外を投げた場合は、データベーストランザクションをロールバック"
 "し、 直ちに <literal>Session</literal> を閉じるべきです(詳細を後で議論しま"
@@ -646,18 +657,18 @@
 "ないからです。 とにかくロールバックした後にやり直すべきです。"
 
 #. Tag: para
-#: transactions.xml:354
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "<literal>Session</literal> は永続(persistent)状態のすべてのオブジェクトを "
 "キャッシュします(Hibernateは監視し、ダーティ状態かチェックします)。 これ"
@@ -672,21 +683,21 @@
 "す。"
 
 #. Tag: title
-#: transactions.xml:372
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "データベーストランザクション境界"
 
 #. Tag: para
-#: transactions.xml:374
+#: transactions.xml:388
 #, fuzzy, no-c-format
 msgid ""
-"Database (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -700,18 +711,18 @@
 "込みであっても)パフォーマンスがすぐれています。"
 
 #. Tag: para
-#: transactions.xml:384
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "J2EE環境に管理されていない状態 (すなわち、スタンドアロン、単純なWebやSwingア"
 "プリケーション)でも、 管理された状態でも、Hibernateアプリケーションを実行で"
@@ -725,12 +736,12 @@
 "せん。"
 
 #. Tag: para
-#: transactions.xml:394
+#: transactions.xml:408
 #, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
 "transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
@@ -744,61 +755,61 @@
 "を強く推奨します。"
 
 #. Tag: para
-#: transactions.xml:403
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 "通常、<literal>Session</literal> 終了は、4つの異なるフェーズを含みます。"
 
 #. Tag: para
-#: transactions.xml:409
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "セッションのフラッシュ"
 
 #. Tag: para
-#: transactions.xml:414
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "トランザクションのコミット"
 
 #. Tag: para
-#: transactions.xml:419
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "セッションのクローズ"
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "例外のハンドリング"
 
 #. Tag: para
-#: transactions.xml:430
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "セッションのフラッシュについては、前のほうですでに議論しました。 管理された環"
 "境と管理されていない環境の両方について、 トランザクション境界と例外ハンドリン"
 "グをもっと詳しく見ていきましょう。"
 
 #. Tag: title
-#: transactions.xml:437
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "管理されていない環境"
 
 #. Tag: para
-#: transactions.xml:439
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -808,7 +819,7 @@
 "します。 セッション/トランザクション制御のイディオムは次のようになります。"
 
 #. Tag: programlisting
-#: transactions.xml:446
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -832,12 +843,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:448
-#, no-c-format
+#: transactions.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -853,17 +864,17 @@
 "きます。"
 
 #. Tag: para
-#: transactions.xml:457
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "より適応性のある解決策は、Hibernateに予め組み込まれている 「current session」"
 "コンテキスト管理です。 言葉で説明するより下記を見たほうが速いでしょう。"
 
 #. Tag: programlisting
-#: transactions.xml:462
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -882,17 +893,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:464
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "正規のアプリケーションの中では、このようなコードの切れ端を決して見ないでしょ"
 "う。 致命的な(システム)例外は、常に「最上位」でキャッチすべきです。 言い換"
@@ -904,12 +915,12 @@
 "の章の後のほうで議論します。"
 
 #. Tag: para
-#: transactions.xml:474
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "注意:(デフォルトですが) <literal>org.hibernate.transaction."
@@ -918,17 +929,17 @@
 "\"thread\"</literal> とするとよいでしょう。"
 
 #. Tag: title
-#: transactions.xml:483
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "JTAを使用する"
 
 #. Tag: para
-#: transactions.xml:485
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -940,12 +951,12 @@
 "供します。"
 
 #. Tag: para
-#: transactions.xml:492
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "Bean管理トランザクション(BMT)を使い、<literal>Transaction</literal> APIを使"
@@ -954,7 +965,7 @@
 "じになります。"
 
 #. Tag: programlisting
-#: transactions.xml:498
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -978,13 +989,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:500
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 "トランザクション境界として <literal>Session</literal> を使いたい場合、 簡単に"
 "コンテキストを伝播する機能である <literal>getCurrentSession()</literal> があ"
@@ -992,7 +1002,7 @@
 "う。"
 
 #. Tag: programlisting
-#: transactions.xml:506
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1015,18 +1025,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:508
+#: transactions.xml:522
 #, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programmatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "CMTでは、トランザクション境界をセッションBeanのデプロイメントディスクリプタで"
 "定義し、 プログラムでは行いません。 ゆえに、コードは次のように少なくなりま"
 "す。"
 
 #. Tag: programlisting
-#: transactions.xml:513
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1038,15 +1048,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:515
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "CMT/EJBの中では、常にロールバックが自動的に実施されます。 なぜなら、セッショ"
 "ンビーンのメソッドにより投げられた制御されていない "
@@ -1056,17 +1066,16 @@
 "という意味です。</emphasis>"
 
 #. Tag: para
-#: transactions.xml:523
+#: transactions.xml:537
 #, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatibility), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "Hibernateのトランザクションファクトリを設定する際に、 JTAを直接使う(BMTの)"
 "場合は <literal>org.hibernate.transaction.JTATransactionFactory</literal> "
@@ -1078,21 +1087,21 @@
 "<literal>\"jta\"</literal> をセットしてください。"
 
 #. Tag: para
-#: transactions.xml:532
+#: transactions.xml:546
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
 "close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "<literal>getCurrentSession()</literal> オペレーションは、JTA環境では1つの欠"
 "点を持ちます。 デフォルトで使われる <literal>after_statement</literal> コネク"
@@ -1108,23 +1117,23 @@
 "()</literal> の使用を避けるのは容易です。)"
 
 #. Tag: title
-#: transactions.xml:548
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "例外ハンドリング"
 
 #. Tag: para
-#: transactions.xml:550
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "<literal>Session</literal> が例外(<literal>SQLException</literal>を含む)を"
 "投げた場合、 直ちに、データベーストランザクションをロールバックし、"
@@ -1136,19 +1145,19 @@
 "<literal>Session</literal> を確実に閉じてください。"
 
 #. Tag: para
-#: transactions.xml:561
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "<literal>HibernateException</literal> は、Hibernate永続化層の中で発生する多く"
 "のエラーを ラップする、検査されない例外です(Hibernateの古いバージョンは違い"
@@ -1161,7 +1170,7 @@
 "意してください。 これらもまた、回復不可能であり、適切な処理を実施すべきです。"
 
 #. Tag: para
-#: transactions.xml:573
+#: transactions.xml:587
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
@@ -1174,9 +1183,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "Hibernateは、データベースとの対話中に投げられた <literal>SQLException</"
@@ -1194,73 +1203,73 @@
 "します。"
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - 基礎となるJDBC通信のエラーを表し"
 "ます。"
 
 #. Tag: para
-#: transactions.xml:595
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - 発行するSQLの文法もしくは構文の問題"
 "を表します。"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - 何らかの形式の完全性制約違"
 "反を表します。"
 
 #. Tag: para
-#: transactions.xml:607
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - 要求された操作を実施するのに必"
 "要なロックレベルを得る際のエラーを表します。"
 
 #. Tag: para
-#: transactions.xml:613
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr ""
 "<literal>GenericJDBCException</literal> - 他のカテゴリに一致しなかった一般的"
 "な例外です。"
 
 #. Tag: title
-#: transactions.xml:623
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "トランザクションのタイムアウト"
 
 #. Tag: para
-#: transactions.xml:625
+#: transactions.xml:639
 #, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
 "transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
@@ -1276,7 +1285,7 @@
 "<literal>Transaction</literal> オブジェクトに よって抽象化されています。"
 
 #. Tag: programlisting
-#: transactions.xml:638
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1301,33 +1310,32 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:640
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "CMTビーンの中では <literal>setTimeout()</literal> を 呼び出せないことに注意し"
 "てください。 トランザクションタイムアウトは宣言的に定義されるべきです。"
 
 #. Tag: title
-#: transactions.xml:650
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "楽観的同時実行制御"
 
 #. Tag: para
-#: transactions.xml:652
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "高い並列性と高いスケーラビリティの両方を実現するアプローチは、 バージョニング"
 "を使った楽観的同時実行制御のみです。 更新の衝突を見つけるために(および、更新"
@@ -1338,22 +1346,22 @@
 "クションの中で更新を失うことを防ぐ 利点も持っています。"
 
 #. Tag: title
-#: transactions.xml:663
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "アプリケーションによるバージョンチェック"
 
 #. Tag: para
-#: transactions.xml:665
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "Hibernateにほとんど助けてもらわずに実装するケースです。 データベースとのやり"
 "取りは、それぞれ新しい <literal>Session</literal> の中で起こります。 開発者"
@@ -1364,7 +1372,7 @@
 "も似ているアプローチです。"
 
 #. Tag: programlisting
-#: transactions.xml:674
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1382,7 +1390,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:676
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1395,15 +1403,15 @@
 "メントします。"
 
 #. Tag: para
-#: transactions.xml:682
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "もちろん、データの並列性が低い環境で運用しており、バージョンチェックが不要な"
 "ら、 このアプローチを使い、バージョンチェックをスキップするだけです。 その場"
@@ -1413,14 +1421,14 @@
 "競合した変更をマージする機会が ないまま、更新を失う経験をするためです。"
 
 #. Tag: para
-#: transactions.xml:691
+#: transactions.xml:705
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "確かに、マニュアルによるバージョンチェックは、些細な儀式だけで実行できます"
 "が、 多くのアプリケーションにとって実用的ではありません。 しばしば、1つのイ"
@@ -1429,22 +1437,22 @@
 "literal> か 分離されたインスタンスを自動的にバージョンチェックします。"
 
 #. Tag: title
-#: transactions.xml:702
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "拡張セッションと自動バージョニング"
 
 #. Tag: para
-#: transactions.xml:704
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "1つの <literal>Session</literal> インスタンスとその永続性インスタンスは、 "
 "<emphasis>session-per-conversation</emphasis> として知られる、 対話全体で使わ"
@@ -1454,14 +1462,14 @@
 "データでビジネス対話を 再スタートする機会をユーザーに提供することです)。"
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "ユーザーの対話を待っているときは、 <literal>Session</literal> を基礎となる"
 "JDBCコネクションから切り離します。 このアプローチは、データベースアクセスの中"
@@ -1470,7 +1478,7 @@
 "ベーストランザクションの中で インスタンスを再読み込みする必要はありません。"
 
 #. Tag: programlisting
-#: transactions.xml:721
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1485,24 +1493,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:722
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "<literal>foo</literal> オブジェクトは、自分をロードした <literal>Session</"
 "literal> をまだ知っています。 古いセッションの上で新しいデータベーストランザ"
@@ -1520,16 +1527,16 @@
 "て、対話を終わらせるために、 セッションも <literal>close()</literal> します。"
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "ユーザーが考慮中に、格納することができないくらい <literal>Session</literal> "
 "が大きいのであれば、このパターンは問題があります。 例えば、"
@@ -1539,27 +1546,33 @@
 "数回であれば、この戦略が使えます。 1つの対話のためだけに <literal>Session</"
 "literal> を使うべきです。 なぜなら、すぐに新鮮でないデータを持つためです。"
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:747
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "(Hibernateの以前のバージョンは、明示的な <literal>Session</literal> の 切断"
 "と再接続が必要だったことに注意してください。 これらのメソッドは非推奨になりま"
 "した。 なぜなら、トランザクションの開始と終了は同じ効果があるためです。)"
 
 #. Tag: para
-#: transactions.xml:753
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "切断した <literal>Session</literal> を永続化層の近くで保持すべきであることに "
 "注意してください。 言い換えると、3層環境の中で <literal>Session</literal> を"
@@ -1568,13 +1581,13 @@
 "(別の層へのシリアライズもしないでください)。"
 
 #. Tag: para
-#: transactions.xml:761
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "拡張セッションパターン(もしくは、<emphasis>session-per-conversation</"
@@ -1583,13 +1596,13 @@
 "給する必要があります。 Hibernate Wikiにある例を参照してください。"
 
 #. Tag: title
-#: transactions.xml:771
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "デタッチされたオブジェクトと自動バージョニング"
 
 #. Tag: para
-#: transactions.xml:773
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1609,7 +1622,7 @@
 "スを再追加します。"
 
 #. Tag: programlisting
-#: transactions.xml:781
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1623,7 +1636,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:783
+#: transactions.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
@@ -1633,12 +1646,12 @@
 "チェックします。 更新の競合が発生した場合には、例外を投げます。"
 
 #. Tag: para
-#: transactions.xml:788
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "オブジェクトが修正されていないことを確信している場合は、 <literal>update()</"
@@ -1647,16 +1660,16 @@
 "し、バージョンチェックを実施します)。"
 
 #. Tag: title
-#: transactions.xml:797
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "自動バージョニングのカスタマイズ"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1667,19 +1680,19 @@
 "バージョンをインクリメントしません。"
 
 #. Tag: para
-#: transactions.xml:806
+#: transactions.xml:822
 #, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this conceptually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "レガシーのデータベーススキーマは、しばしば固定的であり、変更できません。 また"
 "は、他のアプリケーションが同じデータベースにアクセスしなければならず、 そのア"
@@ -1694,13 +1707,13 @@
 "<literal>Session</literal> を使う場合です。"
 
 #. Tag: para
-#: transactions.xml:817
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "ときどき、行われた変更が重ならない限り、同時に行われた変更を受け入れることが"
 "できます。 <literal>&lt;class&gt;</literal> マッピングに <literal>optimistic-"
@@ -1708,21 +1721,21 @@
 "ティフィールドのみを比較します。"
 
 #. Tag: para
-#: transactions.xml:823
+#: transactions.xml:840
 #, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute unnecessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "専用のバージョン/タイムスタンプのカラムを使う場合、 もしくはすべて/ダーティ"
 "のフィールドを比較する場合どちらであっても、 Hibernateはエンティティごとに1つ"
@@ -1737,20 +1750,20 @@
 "更新する前に、 必ずインスタンスを <literal>SELECT</literal> します。"
 
 #. Tag: title
-#: transactions.xml:841
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "悲観的ロック"
 
 #. Tag: para
-#: transactions.xml:843
+#: transactions.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "It is not intended that users spend much time worrying about locking "
-"strategies. It's usually enough to specify an isolation level for the JDBC "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "ユーザがロック戦略に悩むのに多くの時間を費やすことを意図していません。 通常"
 "は、JDBCコネクションに分離レベルを指定し、 単にデータベースにすべての仕事をさ"
@@ -1759,27 +1772,27 @@
 "どき望むかもしれません。"
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr ""
 "Hibernateはいつもデータベースのロックの仕組みを使います。 メモリ内のオブジェ"
 "クトを決してロックしません!"
 
 #. Tag: para
-#: transactions.xml:855
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "<literal>LockMode</literal> クラスは、Hibernateが獲得できる異なるロックレベル"
 "を定義します。 以下の仕組みにより、ロックを獲得できます。"
 
 #. Tag: para
-#: transactions.xml:862
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1789,10 +1802,10 @@
 "に自動的に得られます。"
 
 #. Tag: para
-#: transactions.xml:868
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1801,10 +1814,10 @@
 "より得られるかもしれません。"
 
 #. Tag: para
-#: transactions.xml:874
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1813,19 +1826,19 @@
 "求により得られるかもしれません。"
 
 #. Tag: para
-#: transactions.xml:880
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "<literal>LockMode.READ</literal> は、 Repeatable ReadもしくはSerializableの分"
 "離レベルで、データを読んだ際に自動的に得られます。 おそらく、明示的なユーザー"
 "要求により、再取得されます。"
 
 #. Tag: para
-#: transactions.xml:887
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1841,14 +1854,14 @@
 "も、このロックモードで出発します。"
 
 #. Tag: para
-#: transactions.xml:896
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "「明示的なユーザー要求」とは、下記の方法の1つで言い表せます。"
 
 #. Tag: para
-#: transactions.xml:902
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1858,19 +1871,19 @@
 "び出し。"
 
 #. Tag: para
-#: transactions.xml:907
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "<literal>Session.lock()</literal> の呼び出し。"
 
 #. Tag: para
-#: transactions.xml:912
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "<literal>Query.setLockMode()</literal> の呼び出し。"
 
 #. Tag: para
-#: transactions.xml:918
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1890,14 +1903,14 @@
 "ジェクトのために、<literal>lock()</literal> を呼び出します。"
 
 #. Tag: para
-#: transactions.xml:927
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "指定されたロックモードが <literal>READ</literal> もしくは、<literal>UPGRADE</"
 "literal>、 <literal>UPGRADE_NOWAIT</literal> だった場合、<literal>Session."
@@ -1906,37 +1919,37 @@
 "合、 <literal>SELECT ... FOR UPDATE</literal> が使われます。)"
 
 #. Tag: para
-#: transactions.xml:934
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "データベースが要求されたロックモードをサポートしていない場合、 Hibernateは"
 "(例外を投げる代わりに、)適切な代わりのモードを使います。 これは、アプリケー"
 "ションがポータブルであることを保証します。"
 
 #. Tag: title
-#: transactions.xml:943
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "コネクション開放モード"
 
 #. Tag: para
-#: transactions.xml:945
-#, no-c-format
+#: transactions.xml:962
+#, fuzzy, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 "Hibernateのレガシー(2.x)のJDBCコネクション管理に関する振る舞いは、 最初に必"
 "要とした際に <literal>Session</literal> がコネクションを得るというものでし"
@@ -1948,38 +1961,36 @@
 "ConnectionReleaseMode</literal> に 列挙された値により確認されます。"
 
 #. Tag: para
-#: transactions.xml:959
+#: transactions.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obtains a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 "<literal>ON_CLOSE</literal> - 本質的に上記で述べたレガシーの振る舞いです。 "
 "Hibernateセッションは最初にJDBCアクセスを実行する必要がある際にコネクションを"
 "得ます。 そして、セッションが閉じられるまで、コネクションを保持します。"
 
 #. Tag: para
-#: transactions.xml:966
-#, no-c-format
+#: transactions.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 "<literal>AFTER_TRANSACTION</literal> - <literal>org.hibernate.Transaction</"
 "literal> が完了した後、 コネクションを開放します。"
 
 #. Tag: para
-#: transactions.xml:972
-#, no-c-format
+#: transactions.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 "<literal>AFTER_STATEMENT</literal> (積極的な開放とも呼ばれる) - すべてのス"
 "テートメントがそれぞれ実行された後、コネクションが開放されます。 ステートメン"
@@ -1988,27 +1999,28 @@
 "ScrollableResults</literal> が使われる場合のみです。"
 
 #. Tag: para
-#: transactions.xml:982
-#, no-c-format
+#: transactions.xml:999
+#, fuzzy, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 "コンフィグレーションパラメータの <literal>hibernate.connection.release_mode</"
 "literal> は、使用する開放モードを指定するために使います。 指定できる値は次の"
 "通りです。"
 
 #. Tag: para
-#: transactions.xml:989
-#, no-c-format
+#: transactions.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 "<literal>auto</literal> (デフォルト) - これを選択すると <literal>org."
 "hibernate.transaction.TransactionFactory.getDefaultReleaseMode()</literal> メ"
@@ -2020,24 +2032,23 @@
 "すいからです。"
 
 #. Tag: para
-#: transactions.xml:999
-#, no-c-format
+#: transactions.xml:1016
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 "<literal>on_close</literal> - ConnectionReleaseMode.ON_CLOSEを使います。 この"
 "設定は後方互換のために残されていますが、使わないことを強く勧めます。"
 
 #. Tag: para
-#: transactions.xml:1005
-#, no-c-format
+#: transactions.xml:1022
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 "<literal>after_transaction</literal> - ConnectionReleaseMode."
@@ -2047,18 +2058,18 @@
 "ことに注意してください。"
 
 #. Tag: para
-#: transactions.xml:1013
-#, no-c-format
+#: transactions.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""
 "<literal>after_statement</literal> - ConnectionReleaseMode.AFTER_STATEMENTを"
 "使います。 さらに、設定された <literal>ConnectionProvider</literal> は、 この"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,164 +11,193 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:7
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
-msgstr "Hibernateの導入"
+msgid "Tutorial"
+msgstr ""
 
-#. Tag: title
-#: tutorial.xml:10
-#, no-c-format
-msgid "Preface"
-msgstr "前書き"
-
 #. Tag: para
-#: tutorial.xml:12
+#: tutorial.xml:33
 #, no-c-format
 msgid ""
-"This chapter is an introductory tutorial for new users of Hibernate. We "
-"start with a simple command line application using an in-memory database and "
-"develop it in easy to understand steps."
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
+"Gloegl. All code is contained in the <filename>tutorials/web</filename> "
+"directory of the project source."
 msgstr ""
-"この章はHibernateを初めて使うユーザ向けの入門的なチュートリアルです。 インメ"
-"モリデータベースを使う簡単なコマンドラインアプリケーションから始め、 一歩一歩"
-"わかりやすいやり方で開発を進めます。"
 
 #. Tag: para
-#: tutorial.xml:18
+#: tutorial.xml:42
 #, no-c-format
 msgid ""
-"This tutorial is intended for new users of Hibernate but requires Java and "
-"SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-party "
-"libraries we name are for JDK 1.4 and 5.0. You might need others for JDK 1.3."
+"This tutorial expects the user have knowledge of both Java and SQL. If you "
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
-"このチュートリアルはHibernateを初めて使うユーザを想定していますが、 理解する"
-"にはJavaとSQLについての知識が必要です。 これはMichael Gloeglの手によるチュー"
-"トリアルを下敷きにしていますが、 ここでサードパーティライブラリと言っているの"
-"は、JDK 1.4と5.0用のものです。 JDK 1.3を利用するのであれば他のライブラリが必"
-"要かもしれません。"
 
 #. Tag: para
-#: tutorial.xml:24
+#: tutorial.xml:51
 #, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
-"チュートリアルのソースコードはHibernateディストリビューションの <literal>doc/"
-"reference/tutorial/</literal> にあります。"
 
 #. Tag: title
-#: tutorial.xml:32
+#: tutorial.xml:59
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "パート1 - 初めてのHibernateアプリケーション"
 
 #. Tag: para
-#: tutorial.xml:34
+#: tutorial.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
+msgstr ""
+"仮に小さなデータベースアプリケーションが必要だとしましょう。 そのアプリケー"
+"ションには出席したいイベントと、 そのイベントのホストについての情報を格納する"
+"ものとします。"
+
+#. Tag: para
+#: tutorial.xml:67
 #, no-c-format
 msgid ""
-"First, we'll create a simple console-based Hibernate application. We use an "
-"Java database (HSQL DB), so we do not have to install any database server."
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
-"最初にコンソールベースの簡単なHibernateアプリケーションを作成します。 Java"
-"データベース(HSQL DB)を利用するので、 データベースサーバをインストールする"
-"必要はありません。"
 
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:39
+#: tutorial.xml:78
 #, no-c-format
 msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the hosts of these events."
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
-"仮に小さなデータベースアプリケーションが必要だとしましょう。 そのアプリケー"
-"ションには出席したいイベントと、 そのイベントのホストについての情報を格納する"
-"ものとします。"
 
 #. Tag: para
-#: tutorial.xml:44
+#: tutorial.xml:88
 #, no-c-format
 msgid ""
-"The first thing we do, is set up our development directory and put all the "
-"Java libraries we need into it. Download the Hibernate distribution from the "
-"Hibernate website. Extract the package and place all required libraries "
-"found in <literal>/lib</literal> into into the <literal>/lib</literal> "
-"directory of your new development working directory. It should look like "
-"this:"
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
 msgstr ""
-"まず最初にすることは開発用のディレクトリをセットアップして、 必要となるすべて"
-"のJavaライブラリを配置することです。 HibernateウェブサイトからHibernateディス"
-"トリビューションをダウンロードしてください。 ファイルを解凍して <literal>/"
-"lib</literal> にある必要なライブラリのすべてを、 新しい開発用ディレクトリの "
-"<literal>/lib</literal> ディレクトリに配置してください。 このようになっている"
-"はずです:"
 
 #. Tag: programlisting
-#: tutorial.xml:52
+#: tutorial.xml:94
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+"         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
+"apache.org/xsd/maven-4.0.0.xsd\">\n"
+"\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
+"\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>org.hibernate</groupId>\n"
+"            <artifactId>hibernate-core</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Because this is a web app, we also have a dependency on the "
+"servlet api. -->\n"
+"        <dependency>\n"
+"            <groupId>javax.servlet</groupId>\n"
+"            <artifactId>servlet-api</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:54
+#: tutorial.xml:97
 #, no-c-format
 msgid ""
-"This is the minimum set of required libraries (note that we also copied "
-"hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
-"writing</emphasis>. The Hibernate release you are using might require more "
-"or less libraries. See the <literal>README.txt</literal> file in the "
-"<literal>lib/</literal> directory of the Hibernate distribution for more "
-"information about required and optional third-party libraries. (Actually, "
-"Log4j is not required but preferred by many developers.)"
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
 msgstr ""
-"これが <emphasis>本ドキュメント執筆時点での</emphasis> Hibernateの必要最低限"
-"のライブラリです (メインアーカイブのhibernate3.jarもコピーしていることに注意"
-"してください)。 Hibernateのバージョンによってはさらに必要なライブラリや、不"
-"要なライブラリがあるかもしれません。 Hibernateディストリビューションの "
-"<literal>lib/</literal> ディレクトリにある <literal>README.txt</literal> ファ"
-"イルを見てください。 必須またはオプションのサードパーティライブラリについての"
-"情報を載せています (実際Log4jは必須ではありませんが、多くの開発者が好んでい"
-"ます)。"
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:114
 #, no-c-format
 msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
-msgstr "次にデータベースに格納するイベントを表すクラスを作成します。"
+"Save this file as <filename>pom.xml</filename> in the project root directory."
+msgstr ""
 
 #. Tag: title
-#: tutorial.xml:68
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr "最初のクラス"
 
 #. Tag: para
-#: tutorial.xml:70
-#, no-c-format
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
-msgstr "最初の永続クラスは、プロパティをいくつか持つシンプルなJavaBeanです:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
+msgstr "次にデータベースに格納するイベントを表すクラスを作成します。"
 
 #. Tag: programlisting
-#: tutorial.xml:74
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -207,15 +236,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:76
-#, no-c-format
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "ご覧のとおり、このクラスはフィールドがprivateの可視性を持っているのと同時"
 "に、 JavaBean標準のゲッター、セッターメソッドの命名規約に従っています。 この"
@@ -225,20 +253,20 @@
 "のインスタンスを作成するために 必要です。"
 
 #. Tag: para
-#: tutorial.xml:84
-#, no-c-format
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "<literal>id</literal> プロパティは、ある特定のイベントに対するユニークな識別"
 "子の値を保持します。 Hibernateの完全な機能を使いたければ、すべての永続エン"
@@ -254,13 +282,13 @@
 "ションの設計に合わせることができます。"
 
 #. Tag: para
-#: tutorial.xml:96
-#, no-c-format
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "引数のないコンストラクタはすべての永続クラスに必須です。 これはHibernateが"
@@ -269,43 +297,21 @@
 "トコード操作なしの効率的なデータの抽出には、 package可視性が必要です。"
 
 #. Tag: para
-#: tutorial.xml:103
+#: tutorial.xml:161
 #, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"開発フォルダの <literal>src</literal> というディレクトリの適切なパッケージ"
-"に、 このJavaソースファイルを配置してください。 この時点でディレクトリは以下"
-"のようになっているはずです:"
 
-#. Tag: programlisting
-#: tutorial.xml:108
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:110
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr "次のステップでは、Hibernateにこの永続クラスの情報を教えます。"
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr "マッピングファイル"
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:170
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -319,13 +325,13 @@
 "テーブルのどのカラムを使うべきかを、Hibernateに教えます。"
 
 #. Tag: para
-#: tutorial.xml:126
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "マッピングファイルの基本的な構造はこのようになります:"
 
 #. Tag: programlisting
-#: tutorial.xml:130
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -333,23 +339,23 @@
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
 "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:132
-#, no-c-format
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "Hibernate DTDが非常に洗練されていることに注目してください。 このDTDは、エディ"
 "タやIDEでのXMLマッピング要素と属性のオートコンプリーション機能に利用できま"
@@ -361,23 +367,23 @@
 "様、<literal>hibernate3.jar</literal> にも含まれています。"
 
 #. Tag: para
-#: tutorial.xml:143
-#, no-c-format
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "以降の例ではコードを短くするためにDTD宣言を省略します。 当然ですがこれはオプ"
 "ションではありません。"
 
 #. Tag: para
-#: tutorial.xml:148
-#, no-c-format
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "2つの <literal>hibernate-mapping</literal> タグの間に <literal>class</"
 "literal> 要素を含めてください。 すべての永続エンティティクラス(念を押します"
@@ -385,12 +391,12 @@
 "ます) はSQLデータベース内のテーブルへのこのようなマッピングを必要とします。"
 
 #. Tag: programlisting
-#: tutorial.xml:155
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -398,16 +404,15 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:157
-#, no-c-format
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "これまで私たちは、<literal>Event</literal> クラスのオブジェクトを "
 "<literal>EVENTS</literal> テーブルに対して、どのように永続化したりロードした"
@@ -418,12 +423,12 @@
 "定します。"
 
 #. Tag: programlisting
-#: tutorial.xml:165
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -433,50 +438,56 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
+#: tutorial.xml:224
 #, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"The <literal>id</literal> element is the declaration of the identifier "
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"<literal>id</literal> 要素は識別子プロパティの宣言であり、 <literal>name=\"id"
-"\"</literal> でJavaプロパティの名前を宣言します。 Hibernateはこのプロパティへ"
-"アクセスするためにゲッター、セッターメソッドを使います。 カラム属性では "
-"<literal>EVENTS</literal> テーブルのどのカラムを主キーとして使うのかを "
-"Hibernateに教えます。 入れ子になっている <literal>generator</literal> 要素"
-"は、識別子を生成する時の戦略を指定します。 (この例では <literal>native</"
-"literal> を用いました)。 この要素は、設定したデータベース(dialect)に対する"
-"最良な識別子生成戦略を選定するものです。 Hibernateは、アプリケーションで値を"
-"割り当てる戦略(もしくは独自に拡張した戦略)と同様に、 グローバルにユニークな"
-"値をデータベースに生成させる戦略もサポートしています。"
 
 #. Tag: para
-#: tutorial.xml:180
+#: tutorial.xml:234
 #, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "最後にクラスの永続プロパティの宣言をマッピングファイルに含めます。 デフォルト"
 "では、クラスのプロパティは永続と見なされません:"
 
 #. Tag: programlisting
-#: tutorial.xml:186
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -488,14 +499,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:188
-#, no-c-format
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "<literal>id</literal> 要素の場合と同様に、 <literal>property</literal> 要素"
 "の <literal>name</literal> 属性で、どのゲッターとセッターメソッドを使うべきか"
@@ -503,15 +514,15 @@
 "</literal> と <literal>getTitle()/setTitle()</literal> を 探します。"
 
 #. Tag: para
-#: tutorial.xml:195
-#, no-c-format
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "なぜ <literal>date</literal> プロパティのマッピングには <literal>column</"
 "literal> 属性があり、<literal>title</literal> プロパティにはないのでしょう"
@@ -521,24 +532,23 @@
 "前でマッピングした方がよいのです。"
 
 #. Tag: para
-#: tutorial.xml:204
-#, no-c-format
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "次に興味深いのは <literal>title</literal> マッピングが <literal>type</"
 "literal> 属性をも欠いている点です。 マッピングファイルで宣言して使うtypeは、"
@@ -557,75 +567,55 @@
 "ます。"
 
 #. Tag: para
-#: tutorial.xml:220
+#: tutorial.xml:297
 #, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"このマッピングファイルは、<literal>Event.hbm.xml</literal> として "
-"<literal>Event</literal> Javaクラスソースファイルのすぐ隣にセーブするべきで"
-"す。 マッピングファイルの命名方法は任意ですが、<literal>hbm.xml</literal> サ"
-"フィックスがHibernateの開発者のコミュニティ内での習慣となっています。 現在"
-"ディレクトリ構造はこのようになっているはずです:"
 
-#. Tag: programlisting
-#: tutorial.xml:228
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:230
-#, no-c-format
-msgid "We continue with the main configuration of Hibernate."
-msgstr "Hibernateの主要な設定を続けます。"
-
 #. Tag: title
-#: tutorial.xml:237
+#: tutorial.xml:312
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Hibernateの設定"
 
 #. Tag: para
-#: tutorial.xml:239
+#: tutorial.xml:314
 #, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"ここまでで永続クラスとマッピングファイルが揃いました。これからHibernateの設定"
-"を行いますが、 その前にデータベースが必要です。 HSQL DBはJavaベースのインメモ"
-"リSQL DBMSであり、HSQL DBウェブサイトからダウンロードできます。 実際にはダウ"
-"ンロードした中の <literal>hsqldb.jar</literal> だけが必要です。 このファイル"
-"を開発フォルダの <literal>lib/</literal> ディレクトリに配置してください。"
 
 #. Tag: para
-#: tutorial.xml:247
+#: tutorial.xml:321
 #, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "<literal>data</literal> というディレクトリを開発ディレクトリのルートに作成し"
 "てください。 HSQL DBはここにデータファイルを格納します。 このデータディレクト"
@@ -638,35 +628,35 @@
 "HSQL DBを再起動します。"
 
 #. Tag: para
-#: tutorial.xml:257
+#: tutorial.xml:337
 #, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"Hibernateはアプリケーションのデータベースに接続する層なので、 コネクションの"
-"情報が必要になります。 コネクションはJDBCコネクションプールを通じて行われます"
-"が、これも設定する必要があります。 Hibernateディストリビューションにはいくつ"
-"かのオープンソースのJDBCコネクションプールツールが含まれていますが、 この"
-"チュートリアルではHibernateに組み込まれたコネクションプールを使います。 もし"
-"製品レベルの品質のサードパーティJDBCコネクションプールソフトウェアを使いたけ"
-"れば、 クラスパスに必要なライブラリをコピーして、異なるコネクションプールを設"
-"定しなければ ならないことに注意してください。"
 
 #. Tag: para
-#: tutorial.xml:267
+#: tutorial.xml:348
 #, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "Hibernateの設定では、単純な <literal>hibernate.properties</literal> ファイ"
 "ル、 それより少し洗練されている <literal>hibernate.cfg.xml</literal> ファイ"
@@ -674,7 +664,7 @@
 "のユーザが好むのはXML設定ファイルです:"
 
 #. Tag: programlisting
-#: tutorial.xml:273
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -713,9 +703,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -723,14 +713,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:275
+#: tutorial.xml:363
 #, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "このXMLの設定が異なるDTDを使うことに注意してください。 特定のデータベースを受"
 "け持つグローバルファクトリであるHibernateの <literal>SessionFactory</"
@@ -739,20 +734,34 @@
 "session-factory&gt;</literal> を使う設定にしてください。"
 
 #. Tag: para
-#: tutorial.xml:283
+#: tutorial.xml:373
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "最初の4つの <literal>property</literal> 要素はJDBCコネクションに必要な設定を"
 "含んでいます。 dialectという名前の <literal>property</literal> 要素は、"
 "Hibernateが生成する特定のSQL方言を指定します。 永続的なコンテキストに対する"
@@ -764,140 +773,80 @@
 "続クラスのためのマッピングファイルを設定に追加します。"
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"このファイルをソースディレクトリにコピーしてください。 するとこれはクラスパス"
-"のルートにあることになります。 Hibernateは、スタートアップ時にクラスパスの"
-"ルートで <literal>hibernate.cfg.xml</literal> というファイルを自動的に探しま"
-"す。"
 
 #. Tag: title
-#: tutorial.xml:305
-#, no-c-format
-msgid "Building with Ant"
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "Antによるビルド"
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:405
 #, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"それではAntを使ってチュートリアルをビルドしましょう。 それにはAntがインストー"
-"ルされていなければなりません。 <ulink url=\"http://ant.apache.org/"
-"bindownload.cgi\">Antダウンロードページ</ulink> からダウンロードしてくださ"
-"い。 Antのインストール方法はここでは説明しませんので、 <ulink url=\"http://"
-"ant.apache.org/manual/index.html\">Antマニュアル</ulink> を参照してくださ"
-"い。 Antをインストールすれば、ビルドファイルの作成を開始できます。 このファイ"
-"ルは <literal>build.xml</literal> と呼ばれ、開発ディレクトリに直接配置しま"
-"す。"
 
-#. Tag: para
-#: tutorial.xml:316
-#, no-c-format
-msgid "A basic build file looks like this:"
-msgstr "基本的なビルドファイルはこのようになります:"
-
 #. Tag: programlisting
-#: tutorial.xml:320
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:322
-#, no-c-format
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr ""
-"これは <literal>.jar</literal> で終わるlibディレクトリのすべてのファイルを、 "
-"コンパイルに使用するクラスパスに追加することをAntに教えます。 また、Javaソー"
-"スファイルでないすべてのファイルをターゲットディレクトリにコピーするというこ"
-"とでもあります。 例えば設定ファイルやHibernateマッピングファイルなどです。 今"
-"Antを実行すると、このような出力があるはずです:"
-
-#. Tag: programlisting
-#: tutorial.xml:329
-#, no-c-format
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:334
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "スタートアップとヘルパ"
 
 #. Tag: para
-#: tutorial.xml:336
-#, no-c-format
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "さて <literal>Event</literal> オブジェクトをロードしたり格納したりする準備が"
 "できました。 しかしまずはインフラストラクチャのコードを書いて、セットアップを"
@@ -911,36 +860,37 @@
 "あり、 一度だけインスタンス化されます。"
 
 #. Tag: para
-#: tutorial.xml:346
-#, no-c-format
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr ""
 "ここでスタートアップを行い、 便利に <literal>SessionFactory</literal> へアク"
 "セスする <literal>HibernateUtil</literal> ヘルパクラスを作成します。 実装を見"
 "てみましょう:"
 
 #. Tag: programlisting
-#: tutorial.xml:352
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -956,30 +906,39 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:354
+#: tutorial.xml:444
 #, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "このクラスは静的初期化ブロック(クラスがロードされるときにJVMによって一度だけ"
 "呼ばれる) でグローバルの <literal>SessionFactory</literal> を生成するだけで"
 "はなく、 静的シングルトンの使用を隠蔽します。 アプリケーションサーバーのJNDI"
 "から <literal>SessionFactory</literal> を ルックアップするのと同様です。"
 
 #. Tag: para
-#: tutorial.xml:361
-#, no-c-format
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "設定ファイル内で <literal>SessionFactory</literal> に名前を与えると、 "
 "Hibernateは <literal>SessionFactory</literal> 構築後にJNDIに対しバインドを行"
@@ -989,47 +948,18 @@
 "Hibernateのリファレンスドキュメントで説明されています。"
 
 #. Tag: para
-#: tutorial.xml:370
-#, no-c-format
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"<literal>HibernateUtil.java</literal> を開発ソースディレクトリにある "
-"<literal>events</literal> パッケージの 隣に配置してください。"
-
-#. Tag: programlisting
-#: tutorial.xml:375
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:377
-#, no-c-format
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "これは問題なく再コンパイルできるはずです。 最後にロギングシステムを設定する必"
 "要があります。 Hibernateはcommons loggingを使うため、Log4jとJDK 1.4 loggingの"
 "選択をする必要がありません。 ほとんどの開発者が好むのはLog4jです。 Hibernate"
@@ -1040,43 +970,45 @@
 "Hibernateのスタートアップメッセージだけが標準出力に表示されます。"
 
 #. Tag: para
-#: tutorial.xml:387
-#, no-c-format
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr ""
 "チュートリアルのインフラは完全です。 Hibernateを使って実際の作業をする準備が"
 "整いました。"
 
 #. Tag: title
-#: tutorial.xml:395
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "オブジェクトのロードと格納"
 
 #. Tag: para
-#: tutorial.xml:397
-#, no-c-format
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "ついにオブジェクトのロードと格納にHibernateを使うことができます。 "
 "<literal>main()</literal> メソッドを持つ <literal>EventManager</literal> クラ"
 "スを書きます:"
 
 #. Tag: programlisting
-#: tutorial.xml:402
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1091,16 +1023,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1110,13 +1039,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:404
-#, no-c-format
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "新しい <literal>Event</literal> オブジェクトを生成し、それをHibernateに渡しま"
 "す。 今ではHibernateがSQLを処理し、データベースで <literal>INSERT</literal> "
@@ -1124,15 +1053,17 @@
 "literal> を処理するコードを確認してください。"
 
 #. Tag: para
-#: tutorial.xml:411
-#, no-c-format
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "<literal>Session</literal> は1つの作業単位(Unit of Work)です。 当分の間、話を"
 "簡単にするために、 <literal>Session</literal> と <literal>Transaction</"
@@ -1142,19 +1073,17 @@
 "literal> APIを使用します。"
 
 #. Tag: para
-#: tutorial.xml:419
-#, no-c-format
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "<literal>sessionFactory.getCurrentSession()</literal> はなにをするのでしょう"
 "か? まず、いったん <literal>SessionFactory</literal> を取得し保持すれば "
@@ -1166,21 +1095,28 @@
 "ションを実行する現在のJavaスレッドです。 しかしこれで全てではありません。"
 
 #. Tag: para
-#: tutorial.xml:430
+#: tutorial.xml:529
 #, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "<literal>Session</literal> は最初に必要となったとき、つまり最初に "
 "<literal>getCurrentSession()</literal> が 呼ばれたときに開始します。 そのとき"
 "Hibernateにより現在のスレッドに結び付けられます。 トランザクションが終了(コ"
@@ -1192,19 +1128,20 @@
 "ります。"
 
 #. Tag: para
-#: tutorial.xml:441
-#, no-c-format
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "Related to the unit of work scope, should the Hibernate <literal>Session</"
 "literal> be used to execute one or several database operations? The above "
@@ -1218,69 +1155,44 @@
 "anti-pattern. A real (web) application is shown later in this tutorial."
 
 #. Tag: para
-#: tutorial.xml:452
-#, no-c-format
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "トランザクションの扱いと境界の詳しい情報については、 <xref linkend="
 "\"transactions\"/> を見てください。 この例ではエラー処理やロールバックも割愛"
 "します。"
 
 #. Tag: para
-#: tutorial.xml:458
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"この最初のルーチンを実行するには、Antのビルドファイルに呼び出し可能なターゲッ"
-"トを 追加しなければなりません:"
 
-#. Tag: programlisting
-#: tutorial.xml:462
-#, no-c-format
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:464
+#: tutorial.xml:581
 #, no-c-format
-msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"<literal>action</literal> 引数の値は、ターゲットを呼ぶときにコマンドラインで"
-"設定します:"
 
-#. Tag: programlisting
-#: tutorial.xml:469
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:471
-#, no-c-format
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 "コンパイルすると、Hibernateがスタートし、あなたの設定によりますが、 多くのロ"
 "グ出力があるはずです。 その最後には以下の行があるでしょう:"
 
 #. Tag: programlisting
-#: tutorial.xml:476
+#: tutorial.xml:591
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1288,80 +1200,67 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:478
+#: tutorial.xml:593
 #, no-c-format
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"これはHibernateが実行する <literal>INSERT</literal> で、 クエスチョンマークは"
-"JDBCバインドパラメータを表しています。 引数としてバインドされる値を見るため、"
-"あるいはログの冗長性を減らすためには、 <literal>log4j.properties</literal> を"
-"チェックしてください。"
 
 #. Tag: para
-#: tutorial.xml:484
-#, no-c-format
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "それでは同じように格納されたイベントの一覧を見ようと思います。 そのためメイン"
 "メソッドにオプションを追加します:"
 
 #. Tag: programlisting
-#: tutorial.xml:488
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
-#, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr "新しい <literal>listEvents()メソッド</literal> も追加します。"
 
 #. Tag: programlisting
-#: tutorial.xml:494
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:496
-#, no-c-format
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "ここですることは、データベースから存在するすべての <literal>Event</literal> "
 "オブジェクトをロードするHQL (Hibernate Query Language) クエリを使うことで"
@@ -1370,106 +1269,50 @@
 "雑なクエリを作成できます。"
 
 #. Tag: para
-#: tutorial.xml:503
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr "以下のステップで、すべての実行とテストを行います。"
-
-#. Tag: para
-#: tutorial.xml:509
-#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"hbm2ddlを通す前にデータベースのデータを作成し、データベーススキーマを生成する"
-"ために、 <literal>ant run -Daction=store</literal> を実行してください。"
 
-#. Tag: para
-#: tutorial.xml:515
-#, no-c-format
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-msgstr ""
-"今は <literal>hibernate.cfg.xml</literal> ファイルのプロパティをコメントアウ"
-"トしてhbm2ddlを無効にしてください。 通常は継続的に単体テストをしている間は"
-"hbm2ddlを有効にしておくのですが、 それ以外の場合にhbm2ddlを起動すると格納して"
-"おいた全てのデータを <emphasis>ドロップ</emphasis> するでしょう。 設定を "
-"<literal>create</literal> にすると、結果として 「SessionFactory生成の際、ス"
-"キーマから全てのテーブルをドロップして再作成する」という設定になります。"
-
-#. Tag: para
-#: tutorial.xml:525
-#, no-c-format
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"今 <literal>-Daction=list</literal> と指定してAntを呼ぶと、 これまで格納した"
-"イベントが見えるはずです。 <literal>store</literal> アクションを数回以上呼ぶ"
-"ことも可能です。"
-
-#. Tag: para
-#: tutorial.xml:531
-#, no-c-format
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"注意:初めてHibernateに触れる人々の多くがここで失敗するため、<emphasis>Table "
-"not found</emphasis> エラーメッセージに 関する質問を定期的に見かけます。 しか"
-"し上記のステップに従えば、hbm2ddlが最初に実行されたときにデータベーススキーマ"
-"を作成し、 その後の実行においてもこのスキーマを使用するので、問題は起こらない"
-"でしょう。 マッピングやデータベーススキーマを変更したときは、もう一度hbm2ddl"
-"を有効にしてください。"
-
 #. Tag: title
-#: tutorial.xml:544
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "パート2 - 関連のマッピング"
 
 #. Tag: para
-#: tutorial.xml:546
-#, no-c-format
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr ""
 "永続エンティティクラスをテーブルにマッピングしました。 さらにこの上にいくつか"
 "のクラスの関連を追加しましょう。 まず初めにアプリケーションに人々を追加し、彼"
 "らが参加するイベントのリストを格納します。"
 
 #. Tag: title
-#: tutorial.xml:552
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "Personクラスのマッピング"
 
 #. Tag: para
-#: tutorial.xml:554
-#, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr "最初の <literal>Person</literal> クラスは単純です:"
 
 #. Tag: programlisting
-#: tutorial.xml:558
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1486,22 +1329,28 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:560
+#: tutorial.xml:645
 #, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"<literal>Person.hbm.xml</literal> という新しいマッピングファイルを作成してく"
-"ださい (ファイルの最初にDTDへの参照を忘れずに入れてください):"
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid ""
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:565
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1514,13 +1363,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:567
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr "最後にHibernateの設定に新しいマッピングを追加してください:"
 
 #. Tag: programlisting
-#: tutorial.xml:571
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1528,34 +1377,34 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:573
-#, no-c-format
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "それではこれら2つのエンティティ間の関連を作成します。 人々がイベントに参加で"
 "き、イベントが参加者を持つのは明らかです。 扱わなければならない設計の問題は、"
 "方向、多重度、コレクションの振る舞いです。"
 
 #. Tag: title
-#: tutorial.xml:583
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "単方向Setベース関連"
 
 #. Tag: para
-#: tutorial.xml:585
-#, no-c-format
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr ""
 "イベントのコレクションを <literal>Person</literal> クラスに追加します。 こう"
 "しておくと、明示的なクエリ、つまりわざわざ<literal>aPerson.getEvents()</"
@@ -1563,19 +1412,8 @@
 "できます。 私たちはJavaのコレクション、<literal>Set</literal> を使います。 コ"
 "レクションは重複要素を持たないし、順番は私たちには意味がないからです。"
 
-#. Tag: para
-#: tutorial.xml:592
-#, no-c-format
-msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr ""
-"<literal>Set</literal> で実装される単方向、多値関連が必要です。 Javaクラス内"
-"に対応するコードを書いてマッピングしましょう:"
-
 #. Tag: programlisting
-#: tutorial.xml:597
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1593,19 +1431,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:599
-#, no-c-format
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "この関連をマッピングする前に、反対側について考えてください。 明らかなことです"
 "が、今はこれを単方向にしただけです。 逆に、 <literal>Event</literal> 側にも別"
@@ -1618,10 +1455,10 @@
 "Hibernateのmany-to-manyマッピングを使います:"
 
 #. Tag: programlisting
-#: tutorial.xml:610
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1631,28 +1468,27 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:612
-#, no-c-format
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "Hibernateはありとあらゆる種類のコレクションマッピングをサポートしています"
 "が、 最も一般的なものが <literal>&lt;set&gt;</literal> です。 多対多関連(ま"
@@ -1666,13 +1502,13 @@
 "ばなりません。"
 
 #. Tag: para
-#: tutorial.xml:624
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr "そのためこのマッピングのデータベーススキーマは以下のようになります。:"
 
 #. Tag: programlisting
-#: tutorial.xml:628
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1691,60 +1527,55 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:633
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr "関連を働かせる"
 
 #. Tag: para
-#: tutorial.xml:635
-#, no-c-format
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr ""
 "<literal>EventManager</literal> の新しいメソッドで人々とイベントを一緒にしま"
 "しょう:"
 
 #. Tag: programlisting
-#: tutorial.xml:639
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:641
-#, no-c-format
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "<literal>Person</literal> と <literal>Event</literal> をロードした後、 普通の"
 "コレクションメソッドを使って単純にそのコレクションを修正してください。 ご覧の"
@@ -1763,14 +1594,14 @@
 "対して <literal>thread</literal> を設定したためです。"
 
 #. Tag: para
-#: tutorial.xml:656
-#, no-c-format
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "異なる作業単位(Unit of Work)で人々とイベントをロードすることも当然できます。 "
 "そうでなければ、永続状態にないとき(以前に永続であったなら、この状態を "
@@ -1779,52 +1610,49 @@
 "変更することも可能です:"
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
-#, no-c-format
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "<literal>update</literal> の呼び出しは分離オブジェクトを再び永続化します。 こ"
 "れは、新しい作業単位(Unit of Work)にバインドすると言えるでしょう。 そのため分"
@@ -1832,16 +1660,15 @@
 "オブジェクトのコレクションへの修正(追加・削除)も同様にセーブできます。"
 
 #. Tag: para
-#: tutorial.xml:672
-#, no-c-format
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "これは今はあまり使いみちがありませんが、 自分のアプリケーションの設計に組み込"
 "むことができる重要なコンセプトです。 それではこのエクササイズの最後に、 "
@@ -1851,34 +1678,35 @@
 "すためにメソッドを修正する必要があるかもしれません)。"
 
 #. Tag: programlisting
-#: tutorial.xml:680
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:682
-#, no-c-format
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "これは同じように重要な2つのクラス、つまり2つのエンティティ間の関連の例でし"
 "た。 前に述べたように、典型的なモデルには、普通「比較的重要ではない」他のクラ"
@@ -1894,10 +1722,10 @@
 "自の依存クラスを書くこともできます。"
 
 #. Tag: para
-#: tutorial.xml:695
-#, no-c-format
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -1906,69 +1734,66 @@
 "す。"
 
 #. Tag: title
-#: tutorial.xml:703
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr "値のコレクション"
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:814
 #, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"値型オブジェクトのコレクションを <literal>Person</literal> エンティティへ追加"
-"します。 Eメールアドレスを格納したいのですが、<literal>String</literal> 型を"
-"使っているので、 コレクションは再び <literal>Set</literal> です:"
 
 #. Tag: programlisting
-#: tutorial.xml:710
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:712
-#, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "この <literal>Set</literal> のマッピングです:"
 
 #. Tag: programlisting
-#: tutorial.xml:716
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:718
-#, no-c-format
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "前のマッピングと比べて違うのは <literal>element</literal> の部分ですが、 "
 "Hibernateにこのコレクションが他のエンティティへの参照を含まず、 "
@@ -1981,13 +1806,13 @@
 "<literal>String</literal> の値が実際に格納されるカラムの名前を定義します。"
 
 #. Tag: para
-#: tutorial.xml:728
-#, no-c-format
-msgid "Have a look at the updated schema:"
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "更新したスキーマを見てください:"
 
 #. Tag: programlisting
-#: tutorial.xml:732
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2013,11 +1838,11 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:734
-#, no-c-format
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -2026,43 +1851,41 @@
 "のsetに要求されるセマンティクスそのものです。"
 
 #. Tag: para
-#: tutorial.xml:740
-#, no-c-format
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "以前人とイベントを関連づけたときと全く同じように、 今や試しにコレクションに要"
 "素を追加することができるようになりました。 両方ともJavaでは同じコードです。"
 
 #. Tag: programlisting
-#: tutorial.xml:745
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:747
-#, no-c-format
+#: tutorial.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "今回、コレクションの初期化に <emphasis>fetch</emphasis> クエリを使用しません"
 "でした。 そのため、getterメソッドの呼び出しによってコレクションを初期化するた"
@@ -2070,21 +1893,19 @@
 "視して、即時フェッチを使って最適化してください。"
 
 #. Tag: title
-#: tutorial.xml:757
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "双方向関連"
 
 #. Tag: para
-#: tutorial.xml:759
-#, no-c-format
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "次に双方向関連をマッピングします。 Javaで両側から人とイベントの関連を動作させ"
 "ます。 もちろん、データベーススキーマは変わりませんが、多重度は多対多のままで"
@@ -2093,61 +1914,69 @@
 "法で見たり復元できるということです。"
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:882
 #, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr ""
 "まず <literal>Event</literal> イベントクラスに参加者のコレクションを追加しま"
 "す:"
 
 #. Tag: programlisting
-#: tutorial.xml:771
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:773
-#, no-c-format
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr ""
 "それでは <literal>Event.hbm.xml</literal> で関連のこちら側をマッピングしてく"
 "ださい。"
 
 #. Tag: programlisting
-#: tutorial.xml:777
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:779
-#, no-c-format
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "ご覧のとおり、いずれのマッピングドキュメント(XMLファイル)でも、普通の "
 "<literal>set</literal> マッピングを使っています。 <literal>key</literal> と "
@@ -2157,13 +1986,13 @@
 "素にある <literal>inverse=\"true\"</literal> 属性です。"
 
 #. Tag: para
-#: tutorial.xml:787
-#, no-c-format
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "この指定の意味は、2つの間のエンティティ間のリンクについての情報を探す必要があ"
 "るとき、 Hibernateは反対側のエンティティ、つまり <literal>Person</literal> ク"
@@ -2171,24 +2000,24 @@
 "に作成されるかがわかれば、 これを理解することはとても簡単です。"
 
 #. Tag: title
-#: tutorial.xml:796
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "双方向リンクの動作"
 
 #. Tag: para
-#: tutorial.xml:798
-#, no-c-format
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "まず、Hibernateが通常のJavaのセマンティクスに影響を及ぼさないことを心に留めて"
 "おいてください。 私たちは、単方向の例としてどのように <literal>Person</"
@@ -2201,48 +2030,47 @@
 "必要なので、決して忘れないでください。"
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:932
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"Many developers program defensively and create link management methods to "
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "多くの開発者は慎重にプログラムするので、 エンティティの両側に正しく関連を設定"
 "するリンク管理メソッドを作成します。 例えば <literal>Person</literal> では以"
 "下のようになります。:"
 
 #. Tag: programlisting
-#: tutorial.xml:813
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:815
-#, no-c-format
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "コレクションのゲットとセットメソッドが現在protectedになっていることに注意して"
 "ください。 これは同じパッケージのクラスやサブクラスのメソッドは依然アクセスが"
@@ -2251,23 +2079,21 @@
 "方がいいでしょう。"
 
 #. Tag: para
-#: tutorial.xml:822
-#, no-c-format
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "<literal>inverse</literal> マッピング属性とはいったい何でしょうか? 開発者と"
 "Javaにとっては、双方向リンクは単に両側の参照を正しく設定するということです。 "
@@ -2282,25 +2108,19 @@
 "ということです。 一対多関連ではそれは多側でなければなりません。 多対多関連で"
 "はどちら側でも構いません。どちらでも違いはありません。"
 
-#. Tag: para
-#: tutorial.xml:837
-#, no-c-format
-msgid "Let's turn this into a small web application."
-msgstr "ではこれを小さなWebアプリケーションにしてみましょう。"
-
 #. Tag: title
-#: tutorial.xml:844
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "パート3 - EventManager Webアプリケーション"
 
 #. Tag: para
-#: tutorial.xml:846
-#, no-c-format
+#: tutorial.xml:964
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2312,86 +2132,84 @@
 "しいイベントを入力できるものです。"
 
 #. Tag: title
-#: tutorial.xml:854
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "基本的なServletの記述"
 
 #. Tag: para
-#: tutorial.xml:856
-#, no-c-format
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
 msgstr ""
-"新しいクラスを、ソースディレクトリの <literal>events</literal> パッケージに作"
-"成してください。"
+"ServletはHTTPの <literal>GET</literal> リクエストのみを処理するので、 "
+"<literal>doGet()</literal> を実装します。"
 
 #. Tag: programlisting
-#: tutorial.xml:861
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:863
-#, no-c-format
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"ServletはHTTPの <literal>GET</literal> リクエストのみを処理するので、 "
-"<literal>doGet()</literal> を実装します。"
-
-#. Tag: programlisting
-#: tutorial.xml:868
-#, no-c-format
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: tutorial.xml:982
+#, no-c-format
+msgid ""
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
 #, fuzzy, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
 msgstr ""
 "これは <emphasis>session-per-request</emphasis> というパターンです。 Servlet"
 "がリクエストを受け取ると、 <literal>SessionFactory</literal> の "
@@ -2402,7 +2220,7 @@
 "用しません)。"
 
 #. Tag: para
-#: tutorial.xml:879
+#: tutorial.xml:996
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2416,27 +2234,27 @@
 "literal>, so that it is automatically bound to the current Java thread."
 
 #. Tag: para
-#: tutorial.xml:886
-#, no-c-format
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "次に、リクエストのアクションは処理され、レスポンスであるHTMLが描画されます。 "
 "これについてはすぐに説明します。"
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:1008
 #, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occured during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "最後にリクエストの処理とHTML描画が完了したときに、作業単位(Unit of Work)を終"
 "了します。 もし処理や描画中に問題が発生した場合、exceptionが投げられてデータ"
@@ -2448,59 +2266,64 @@
 "描画をしようとすると、すぐにこのパターンについての情報が必要になるでしょう。"
 
 #. Tag: title
-#: tutorial.xml:905
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr "処理と描画"
 
 #. Tag: para
-#: tutorial.xml:907
-#, no-c-format
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr "では、リクエストの処理とページの描画を実装します。"
 
 #. Tag: programlisting
-#: tutorial.xml:911
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:913
+#: tutorial.xml:1030
 #, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr ""
 "JavaとHTMLが混在するコーディングスタイルは、より複雑なアプリケーションには適"
@@ -2511,22 +2334,24 @@
 "なHTML出力です。"
 
 #. Tag: programlisting
-#: tutorial.xml:922
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:924
+#: tutorial.xml:1041
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2536,37 +2361,37 @@
 "Hibernateの <literal>Session</literal> を使用して、クエリを実行します。"
 
 #. Tag: programlisting
-#: tutorial.xml:930
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:932
+#: tutorial.xml:1049
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2578,31 +2403,32 @@
 "<literal>Session</literal> を利用します。"
 
 #. Tag: programlisting
-#: tutorial.xml:938
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
-#, no-c-format
+#: tutorial.xml:1057
+#, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "これでサーブレットの完成です。 サーブレットへのリクエストは、一つの "
 "<literal>Session</literal> と <literal>Transaction</literal> で処理されるで"
@@ -2615,54 +2441,24 @@
 "のWikiを参照してください。"
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "デプロイとテスト"
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1073
 #, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"このアプリケーションのデプロイのために、Webアーカイブ(WAR)を作成してくださ"
-"い。 以下のAntターゲットを <literal>build.xml</literal> に加えてください。"
 
 #. Tag: programlisting
-#: tutorial.xml:961
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:963
-#, no-c-format
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"このターゲットは <literal>hibernate-tutorial.war</literal> というファイルを "
-"プロジェクトディレクトリに作成します。 このファイルはすべてのライブラリと "
-"<literal>web.xml</literal> 記述子を含んでおり、 プロジェクトのベースディレク"
-"トリに置かれることを期待されます。"
-
-#. Tag: programlisting
-#: tutorial.xml:969
-#, no-c-format
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -2672,7 +2468,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -2683,31 +2480,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:971
-#, no-c-format
+#: tutorial.xml:1081
+#, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"Webアプリケーションのコンパイルとデプロイの前に、 <literal>jsdk.jar</"
-"literal> という 追加のライブラリが必要なことに注意してください。 これはJava"
-"サーブレットの開発キットです。 もしまだこのライブラリを持っていないなら、Sun"
-"のウェブサイトで入手して、 ライブラリディレクトリにコピーしてください。 しか"
-"し、これはコンパイルにのみ使用され、WARパッケージからは除外されます。"
-
-#. Tag: para
-#: tutorial.xml:979
-#, no-c-format
-msgid ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
-msgstr ""
 "ビルドとデプロイのために、プロジェクトディレクトリで <literal>ant war</"
 "literal> を呼び出し、 <literal>hibernate-tutorial.war</literal> ファイルを"
 "Tomcatの <literal>webapp</literal> ディレクトリにコピーしてください。 まだ"
@@ -2716,9 +2495,18 @@
 "の設定を変更する必要はありません。"
 
 #. Tag: para
-#: tutorial.xml:987
+#: tutorial.xml:1088
 #, no-c-format
 msgid ""
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:1096
+#, no-c-format
+msgid ""
 "Once deployed and Tomcat is running, access the application at "
 "<literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. "
 "Make sure you watch the Tomcat log to see Hibernate initialize when the "
@@ -2734,44 +2522,407 @@
 "なら詳細を確認してください。"
 
 #. Tag: title
-#: tutorial.xml:1000
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr "要約"
 
 #. Tag: para
-#: tutorial.xml:1002
-#, no-c-format
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "このチュートリアルでは、簡単なスタンドアローンのHibernateアプリケーションと "
 "小規模のWebアプリケーションを書くための基本を紹介しました。"
 
-#. Tag: para
-#: tutorial.xml:1007
-#, no-c-format
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"もうHibernateに自信があれば、リファレンスドキュメントの目次に目を通して、 面"
-"白そうだと思うトピックを探してください。 最も頻繁に質問があるのは、トランザク"
-"ション処理(<xref linkend=\"transactions\"/>)、 フェッチのパフォーマンス"
-"(<xref linkend=\"performance\"/>)、 APIの使い方(<xref linkend="
-"\"objectstate\"/>)とクエリ (<xref linkend=\"objectstate-querying\"/>)で"
-"す。"
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Hibernateの導入"
 
-#. Tag: para
-#: tutorial.xml:1015
-#, no-c-format
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-"さらに(特別な)チュートリアルが必要なら、Hibernateウェブサイトを忘れずに"
-"チェックしてください。"
+#~ msgid "Preface"
+#~ msgstr "前書き"
+
+#~ msgid ""
+#~ "This chapter is an introductory tutorial for new users of Hibernate. We "
+#~ "start with a simple command line application using an in-memory database "
+#~ "and develop it in easy to understand steps."
+#~ msgstr ""
+#~ "この章はHibernateを初めて使うユーザ向けの入門的なチュートリアルです。 イン"
+#~ "メモリデータベースを使う簡単なコマンドラインアプリケーションから始め、 一"
+#~ "歩一歩わかりやすいやり方で開発を進めます。"
+
+#~ msgid ""
+#~ "This tutorial is intended for new users of Hibernate but requires Java "
+#~ "and SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-"
+#~ "party libraries we name are for JDK 1.4 and 5.0. You might need others "
+#~ "for JDK 1.3."
+#~ msgstr ""
+#~ "このチュートリアルはHibernateを初めて使うユーザを想定していますが、 理解す"
+#~ "るにはJavaとSQLについての知識が必要です。 これはMichael Gloeglの手による"
+#~ "チュートリアルを下敷きにしていますが、 ここでサードパーティライブラリと"
+#~ "言っているのは、JDK 1.4と5.0用のものです。 JDK 1.3を利用するのであれば他の"
+#~ "ライブラリが必要かもしれません。"
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "チュートリアルのソースコードはHibernateディストリビューションの "
+#~ "<literal>doc/reference/tutorial/</literal> にあります。"
+
+#~ msgid ""
+#~ "First, we'll create a simple console-based Hibernate application. We use "
+#~ "an Java database (HSQL DB), so we do not have to install any database "
+#~ "server."
+#~ msgstr ""
+#~ "最初にコンソールベースの簡単なHibernateアプリケーションを作成します。 Java"
+#~ "データベース(HSQL DB)を利用するので、 データベースサーバをインストールす"
+#~ "る必要はありません。"
+
+#~ msgid ""
+#~ "The first thing we do, is set up our development directory and put all "
+#~ "the Java libraries we need into it. Download the Hibernate distribution "
+#~ "from the Hibernate website. Extract the package and place all required "
+#~ "libraries found in <literal>/lib</literal> into into the <literal>/lib</"
+#~ "literal> directory of your new development working directory. It should "
+#~ "look like this:"
+#~ msgstr ""
+#~ "まず最初にすることは開発用のディレクトリをセットアップして、 必要となるす"
+#~ "べてのJavaライブラリを配置することです。 Hibernateウェブサイトから"
+#~ "Hibernateディストリビューションをダウンロードしてください。 ファイルを解凍"
+#~ "して <literal>/lib</literal> にある必要なライブラリのすべてを、 新しい開発"
+#~ "用ディレクトリの <literal>/lib</literal> ディレクトリに配置してください。 "
+#~ "このようになっているはずです:"
+
+#~ msgid ""
+#~ "This is the minimum set of required libraries (note that we also copied "
+#~ "hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
+#~ "writing</emphasis>. The Hibernate release you are using might require "
+#~ "more or less libraries. See the <literal>README.txt</literal> file in the "
+#~ "<literal>lib/</literal> directory of the Hibernate distribution for more "
+#~ "information about required and optional third-party libraries. (Actually, "
+#~ "Log4j is not required but preferred by many developers.)"
+#~ msgstr ""
+#~ "これが <emphasis>本ドキュメント執筆時点での</emphasis> Hibernateの必要最低"
+#~ "限のライブラリです (メインアーカイブのhibernate3.jarもコピーしていること"
+#~ "に注意してください)。 Hibernateのバージョンによってはさらに必要なライブラ"
+#~ "リや、不要なライブラリがあるかもしれません。 Hibernateディストリビューショ"
+#~ "ンの <literal>lib/</literal> ディレクトリにある <literal>README.txt</"
+#~ "literal> ファイルを見てください。 必須またはオプションのサードパーティライ"
+#~ "ブラリについての情報を載せています (実際Log4jは必須ではありませんが、多く"
+#~ "の開発者が好んでいます)。"
+
+#~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "最初の永続クラスは、プロパティをいくつか持つシンプルなJavaBeanです:"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "開発フォルダの <literal>src</literal> というディレクトリの適切なパッケージ"
+#~ "に、 このJavaソースファイルを配置してください。 この時点でディレクトリは以"
+#~ "下のようになっているはずです:"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr "次のステップでは、Hibernateにこの永続クラスの情報を教えます。"
+
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifer "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "<literal>id</literal> 要素は識別子プロパティの宣言であり、 <literal>name="
+#~ "\"id\"</literal> でJavaプロパティの名前を宣言します。 Hibernateはこのプロ"
+#~ "パティへアクセスするためにゲッター、セッターメソッドを使います。 カラム属"
+#~ "性では <literal>EVENTS</literal> テーブルのどのカラムを主キーとして使うの"
+#~ "かを Hibernateに教えます。 入れ子になっている <literal>generator</"
+#~ "literal> 要素は、識別子を生成する時の戦略を指定します。 (この例では "
+#~ "<literal>native</literal> を用いました)。 この要素は、設定したデータベー"
+#~ "ス(dialect)に対する最良な識別子生成戦略を選定するものです。 Hibernate"
+#~ "は、アプリケーションで値を割り当てる戦略(もしくは独自に拡張した戦略)と同"
+#~ "様に、 グローバルにユニークな値をデータベースに生成させる戦略もサポートし"
+#~ "ています。"
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "このマッピングファイルは、<literal>Event.hbm.xml</literal> として "
+#~ "<literal>Event</literal> Javaクラスソースファイルのすぐ隣にセーブするべき"
+#~ "です。 マッピングファイルの命名方法は任意ですが、<literal>hbm.xml</"
+#~ "literal> サフィックスがHibernateの開発者のコミュニティ内での習慣となってい"
+#~ "ます。 現在ディレクトリ構造はこのようになっているはずです:"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "Hibernateの主要な設定を続けます。"
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "ここまでで永続クラスとマッピングファイルが揃いました。これからHibernateの"
+#~ "設定を行いますが、 その前にデータベースが必要です。 HSQL DBはJavaベースの"
+#~ "インメモリSQL DBMSであり、HSQL DBウェブサイトからダウンロードできます。 実"
+#~ "際にはダウンロードした中の <literal>hsqldb.jar</literal> だけが必要です。 "
+#~ "このファイルを開発フォルダの <literal>lib/</literal> ディレクトリに配置し"
+#~ "てください。"
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "Hibernateはアプリケーションのデータベースに接続する層なので、 コネクション"
+#~ "の情報が必要になります。 コネクションはJDBCコネクションプールを通じて行わ"
+#~ "れますが、これも設定する必要があります。 Hibernateディストリビューションに"
+#~ "はいくつかのオープンソースのJDBCコネクションプールツールが含まれています"
+#~ "が、 このチュートリアルではHibernateに組み込まれたコネクションプールを使い"
+#~ "ます。 もし製品レベルの品質のサードパーティJDBCコネクションプールソフト"
+#~ "ウェアを使いたければ、 クラスパスに必要なライブラリをコピーして、異なるコ"
+#~ "ネクションプールを設定しなければ ならないことに注意してください。"
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "このファイルをソースディレクトリにコピーしてください。 するとこれはクラス"
+#~ "パスのルートにあることになります。 Hibernateは、スタートアップ時にクラスパ"
+#~ "スのルートで <literal>hibernate.cfg.xml</literal> というファイルを自動的に"
+#~ "探します。"
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "それではAntを使ってチュートリアルをビルドしましょう。 それにはAntがインス"
+#~ "トールされていなければなりません。 <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Antダウンロードページ</ulink> からダウンロードしてくださ"
+#~ "い。 Antのインストール方法はここでは説明しませんので、 <ulink url="
+#~ "\"http://ant.apache.org/manual/index.html\">Antマニュアル</ulink> を参照し"
+#~ "てください。 Antをインストールすれば、ビルドファイルの作成を開始できま"
+#~ "す。 このファイルは <literal>build.xml</literal> と呼ばれ、開発ディレクト"
+#~ "リに直接配置します。"
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "基本的なビルドファイルはこのようになります:"
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr ""
+#~ "これは <literal>.jar</literal> で終わるlibディレクトリのすべてのファイル"
+#~ "を、 コンパイルに使用するクラスパスに追加することをAntに教えます。 また、"
+#~ "Javaソースファイルでないすべてのファイルをターゲットディレクトリにコピーす"
+#~ "るということでもあります。 例えば設定ファイルやHibernateマッピングファイル"
+#~ "などです。 今Antを実行すると、このような出力があるはずです:"
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "<literal>HibernateUtil.java</literal> を開発ソースディレクトリにある "
+#~ "<literal>events</literal> パッケージの 隣に配置してください。"
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "この最初のルーチンを実行するには、Antのビルドファイルに呼び出し可能なター"
+#~ "ゲットを 追加しなければなりません:"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "<literal>action</literal> 引数の値は、ターゲットを呼ぶときにコマンドライン"
+#~ "で設定します:"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "これはHibernateが実行する <literal>INSERT</literal> で、 クエスチョンマー"
+#~ "クはJDBCバインドパラメータを表しています。 引数としてバインドされる値を見"
+#~ "るため、あるいはログの冗長性を減らすためには、 <literal>log4j.properties</"
+#~ "literal> をチェックしてください。"
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr "以下のステップで、すべての実行とテストを行います。"
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr ""
+#~ "hbm2ddlを通す前にデータベースのデータを作成し、データベーススキーマを生成"
+#~ "するために、 <literal>ant run -Daction=store</literal> を実行してくださ"
+#~ "い。"
+
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "今は <literal>hibernate.cfg.xml</literal> ファイルのプロパティをコメントア"
+#~ "ウトしてhbm2ddlを無効にしてください。 通常は継続的に単体テストをしている間"
+#~ "はhbm2ddlを有効にしておくのですが、 それ以外の場合にhbm2ddlを起動すると格"
+#~ "納しておいた全てのデータを <emphasis>ドロップ</emphasis> するでしょう。 設"
+#~ "定を <literal>create</literal> にすると、結果として 「SessionFactory生成の"
+#~ "際、スキーマから全てのテーブルをドロップして再作成する」という設定になりま"
+#~ "す。"
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "今 <literal>-Daction=list</literal> と指定してAntを呼ぶと、 これまで格納し"
+#~ "たイベントが見えるはずです。 <literal>store</literal> アクションを数回以上"
+#~ "呼ぶことも可能です。"
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "注意:初めてHibernateに触れる人々の多くがここで失敗するため、"
+#~ "<emphasis>Table not found</emphasis> エラーメッセージに 関する質問を定期的"
+#~ "に見かけます。 しかし上記のステップに従えば、hbm2ddlが最初に実行されたとき"
+#~ "にデータベーススキーマを作成し、 その後の実行においてもこのスキーマを使用"
+#~ "するので、問題は起こらないでしょう。 マッピングやデータベーススキーマを変"
+#~ "更したときは、もう一度hbm2ddlを有効にしてください。"
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "<literal>Person.hbm.xml</literal> という新しいマッピングファイルを作成して"
+#~ "ください (ファイルの最初にDTDへの参照を忘れずに入れてください):"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr ""
+#~ "<literal>Set</literal> で実装される単方向、多値関連が必要です。 Javaクラス"
+#~ "内に対応するコードを書いてマッピングしましょう:"
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "値型オブジェクトのコレクションを <literal>Person</literal> エンティティへ"
+#~ "追加します。 Eメールアドレスを格納したいのですが、<literal>String</"
+#~ "literal> 型を使っているので、 コレクションは再び <literal>Set</literal> で"
+#~ "す:"
+
+#~ msgid "Let's turn this into a small web application."
+#~ msgstr "ではこれを小さなWebアプリケーションにしてみましょう。"
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr ""
+#~ "新しいクラスを、ソースディレクトリの <literal>events</literal> パッケージ"
+#~ "に作成してください。"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "このアプリケーションのデプロイのために、Webアーカイブ(WAR)を作成してくだ"
+#~ "さい。 以下のAntターゲットを <literal>build.xml</literal> に加えてくださ"
+#~ "い。"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "このターゲットは <literal>hibernate-tutorial.war</literal> というファイル"
+#~ "を プロジェクトディレクトリに作成します。 このファイルはすべてのライブラリ"
+#~ "と <literal>web.xml</literal> 記述子を含んでおり、 プロジェクトのベース"
+#~ "ディレクトリに置かれることを期待されます。"
+
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+#~ msgstr ""
+#~ "Webアプリケーションのコンパイルとデプロイの前に、 <literal>jsdk.jar</"
+#~ "literal> という 追加のライブラリが必要なことに注意してください。 これは"
+#~ "Javaサーブレットの開発キットです。 もしまだこのライブラリを持っていないな"
+#~ "ら、Sunのウェブサイトで入手して、 ライブラリディレクトリにコピーしてくださ"
+#~ "い。 しかし、これはコンパイルにのみ使用され、WARパッケージからは除外されま"
+#~ "す。"
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "もうHibernateに自信があれば、リファレンスドキュメントの目次に目を通して、 "
+#~ "面白そうだと思うトピックを探してください。 最も頻繁に質問があるのは、トラ"
+#~ "ンザクション処理(<xref linkend=\"transactions\"/>)、 フェッチのパフォー"
+#~ "マンス(<xref linkend=\"performance\"/>)、 APIの使い方(<xref linkend="
+#~ "\"objectstate\"/>)とクエリ (<xref linkend=\"objectstate-querying\"/>)で"
+#~ "す。"
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr ""
+#~ "さらに(特別な)チュートリアルが必要なら、Hibernateウェブサイトを忘れずに"
+#~ "チェックしてください。"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,40 +11,40 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
+#: xml.xml:29
 #, no-c-format
 msgid "XML Mapping"
 msgstr "XMLマッピング"
 
 #. Tag: emphasis
-#: xml.xml:7
-#, no-c-format
+#: xml.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr ""
 "XMLマッピングはHibernate3.0では試験的な機能であり、非常に活動的に開発中です。"
 
 #. Tag: title
-#: xml.xml:13
+#: xml.xml:37
 #, no-c-format
 msgid "Working with XML data"
 msgstr "XMLデータでの作業"
 
 #. Tag: para
-#: xml.xml:15
-#, no-c-format
+#: xml.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "Hibernateでは永続性のPOJOを使って作業するのとほぼ同じようなやり方で、 永続性"
 "のXMLデータを使って作業できます。"
 
 #. Tag: para
-#: xml.xml:22
+#: xml.xml:46
 #, no-c-format
 msgid ""
 "Hibernate supports dom4j as API for manipulating XML trees. You can write "
@@ -64,7 +64,7 @@
 "だサポートしていません)。"
 
 #. Tag: para
-#: xml.xml:32
+#: xml.xml:56
 #, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
@@ -74,31 +74,31 @@
 "XSLTベースのレポートなど、 この機能には多くの用途があります。"
 
 #. Tag: para
-#: xml.xml:37
-#, no-c-format
+#: xml.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "単一のマッピングは、クラスのプロパティとXMLドキュメントのノードを 同時にデー"
 "タベースへマッピングするために使うことができます。 またマッピングするクラスが"
 "なければ、 XMLだけをマッピングするために使うことができます。"
 
 #. Tag: title
-#: xml.xml:44
+#: xml.xml:68
 #, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr "XMLとクラスのマッピングを同時に指定する"
 
 #. Tag: para
-#: xml.xml:46
+#: xml.xml:70
 #, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr "これはPOJOとXMLを同時にマッピングする例です。:"
 
 #. Tag: programlisting
-#: xml.xml:50
+#: xml.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Account\" \n"
@@ -124,19 +124,19 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:54
+#: xml.xml:78
 #, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr "XMLマッピングだけを指定する"
 
 #. Tag: para
-#: xml.xml:56
+#: xml.xml:80
 #, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr "これはPOJOクラスがないマッピングの例です。:"
 
 #. Tag: programlisting
-#: xml.xml:60
+#: xml.xml:84
 #, no-c-format
 msgid ""
 "<![CDATA[<class entity-name=\"Account\" \n"
@@ -165,29 +165,29 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:62
-#, no-c-format
+#: xml.xml:86
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "このマッピングにより、dom4jツリーか、 プロパティ名/値の組のグラフ(javaの "
 "<literal>Map</literal>)として データにアクセスできます。 プロパティの名前"
 "は、HQLクエリー内で参照できる純粋な論理構造です。"
 
 #. Tag: title
-#: xml.xml:73
+#: xml.xml:97
 #, no-c-format
 msgid "XML mapping metadata"
 msgstr "XMLマッピングのメタデータ"
 
 #. Tag: para
-#: xml.xml:75
-#, no-c-format
+#: xml.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -197,38 +197,38 @@
 "ければなりません。:"
 
 #. Tag: para
-#: xml.xml:84
-#, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#: xml.xml:108
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr ""
 "<literal>\"element-name\"</literal> - 指定したXML要素へマッピングします"
 
 #. Tag: para
-#: xml.xml:87
-#, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#: xml.xml:111
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 "<literal>\"@attribute-name\"</literal> - 指定したXML属性へマッピングします"
 
 #. Tag: para
-#: xml.xml:90
-#, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+#: xml.xml:114
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - 親要素へマッピングします"
 
 #. Tag: para
-#: xml.xml:93
-#, no-c-format
+#: xml.xml:117
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - 指定したエレメントの指"
 "定した属性へマッピングします"
 
 #. Tag: para
-#: xml.xml:100
-#, no-c-format
+#: xml.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -236,7 +236,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "コレクションと単一の値の関連に対して、 おまけの <literal>embed-xml</literal> "
 "属性があります。 デフォルトの <literal>embed-xml=\"true\"</literal> と設定し"
@@ -246,17 +246,17 @@
 "連に対するXMLに現れ、 単純にコレクションはまったく現れなくなります。"
 
 #. Tag: para
-#: xml.xml:110
-#, no-c-format
+#: xml.xml:134
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "あまりに多くの関連に対して <literal>embed-xml=\"true\"</literal> としたままに"
 "するのは注意すべきです。 XMLは循環をうまく扱えません。"
 
 #. Tag: programlisting
-#: xml.xml:115
+#: xml.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
@@ -296,17 +296,17 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:117
-#, no-c-format
+#: xml.xml:141
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "この例では、実際のaccountのデータではなく、 accountのidのコレクションを埋め込"
 "むことにしました。 続きのHQLクエリです:"
 
 #. Tag: programlisting
-#: xml.xml:122
+#: xml.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[from Customer c left join fetch c.accounts where c.lastName like :"
@@ -314,13 +314,13 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:124
-#, no-c-format
-msgid "Would return datasets such as this:"
+#: xml.xml:148
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "このようなデータセットを返すでしょう"
 
 #. Tag: programlisting
-#: xml.xml:128
+#: xml.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -336,7 +336,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:130
+#: xml.xml:154
 #, no-c-format
 msgid ""
 "If you set <literal>embed-xml=\"true\"</literal> on the <literal>&lt;one-to-"
@@ -346,7 +346,7 @@
 "\"</literal> と設定した場合、 データはこのようになるでしょう。"
 
 #. Tag: programlisting
-#: xml.xml:135
+#: xml.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -368,23 +368,23 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:141
+#: xml.xml:165
 #, no-c-format
 msgid "Manipulating XML data"
 msgstr "XMLデータを扱う"
 
 #. Tag: para
-#: xml.xml:143
-#, no-c-format
+#: xml.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "XMLドキュメントを、アプリケーション内で再読み込みや更新をしてみましょう。 以"
 "下ではdom4jのセッションを取得することで行います。:"
 
 #. Tag: programlisting
-#: xml.xml:148
+#: xml.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
@@ -408,7 +408,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: xml.xml:150
+#: xml.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
@@ -430,12 +430,11 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:152
-#, no-c-format
+#: xml.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "XMLベースのデータのインポート/エクスポートを実装するために、 Hibernateの "
 "<literal>replicate()</literal> 操作をこの機能を結びつけるのは 極めて有効で"

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - 개성있는 자바를 위한 관계 영속"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "하이버네이트 참조 문서"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,42 +11,57 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: architecture.xml:21
+#: architecture.xml:30
 #, no-c-format
 msgid "Architecture"
 msgstr "아키텍처"
 
 #. Tag: title
-#: architecture.xml:24
+#: architecture.xml:33
 #, no-c-format
 msgid "Overview"
 msgstr "개요"
 
 #. Tag: para
-#: architecture.xml:26
-#, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+#: architecture.xml:35
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Hibernate 아키텍처에 대한 (매우) 높은 수준의 개요::"
 
 #. Tag: para
-#: architecture.xml:39
-#, no-c-format
+#: architecture.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"우리는 런타임 아키텍처에 대한 보다 상세한 뷰를 보여주고 싶다. 불행하게도, "
+"Hibernate는 유연하며 몇 가지 접근법들을 제공한다. 우리는 두 가지 극단을 보여"
+"줄 것이다. \"경량급\" 아키텍처는 그것 자신의 JDBC 커넥션들을 제공하고 그것 자"
+"신의 트랜잭션들을 관리하는 어플리케이션을 갖는다. 이 접근법은 Hibernate의 API"
+"의 최소 부분집합을 사용한다:"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "이 다이어그램은 어플리케이션에 영속화 서비스들(과 영속 객체들)을 제공하기 위"
 "해 데이터베이스와 컨피그레이션을 사용하는 Hibernate를 보여준다."
 
 #. Tag: para
-#: architecture.xml:44
-#, no-c-format
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "우리는 런타임 아키텍처에 대한 보다 상세한 뷰를 보여주고 싶다. 불행하게도, "
 "Hibernate는 유연하며 몇 가지 접근법들을 제공한다. 우리는 두 가지 극단을 보여"
@@ -55,38 +70,38 @@
 "의 최소 부분집합을 사용한다:"
 
 #. Tag: para
-#: architecture.xml:61
-#, no-c-format
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "\"전체 정수\" 아키텍처는 기본 JDBC/JTA로부터 어플리케이션을 추상화 시키고 "
 "Hibernate로 하여금 상세한 것을 처리하게 한다."
 
 #. Tag: para
-#: architecture.xml:75
+#: architecture.xml:88
 #, fuzzy, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr ""
 "다음은 다이어그램들 내에 있는 객체들에 대한 몇가지 정의들이다: <placeholder-"
 "1/>"
 
 #. Tag: term
-#: architecture.xml:80
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:82
-#, no-c-format
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "단일 데이터베이스에 대한 컴파일된 매핑들의 threadsafe (불변의) 캐시. Session"
 "과 ConnectionProvider의 클라이언트를 위한 팩토리. 프로세스 레벨 또는 클러스"
@@ -94,20 +109,20 @@
 "캐시를 보관할 수도 있다."
 
 #. Tag: term
-#: architecture.xml:92
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:94
-#, no-c-format
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "어플리케이션과 영속 저장소 사이의 대화를 표현하는 단일 쓰레드이고, 수명이 짧"
 "은 객체. JDBC 커넥션을 포장한다. <literal>Transaction</literal> 용 팩토리. 객"
@@ -115,21 +130,21 @@
 "들에 대한 필수적인(첫 번째 레벨의) 캐시를 보관한다."
 
 #. Tag: term
-#: architecture.xml:104
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "영속 객체들과 콜렉션들"
 
 #. Tag: para
-#: architecture.xml:106
-#, no-c-format
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "persistent 상태와 비지니스 기능을 포함하는 수명이 짧고, 단일 쓰레드인 객체"
 "들. 이것들은 통상의 JavaBeans/POJO들일 수 있고, 오직 그것들에 대한 오직 특별"
@@ -140,18 +155,18 @@
 "직접적으로 프리젠테이션 계층으로부터 데이터 전송 객체들로서)."
 
 #. Tag: term
-#: architecture.xml:117
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "전이(Transient, 필자 주-과도) 객체들과 콜렉션들"
 
 #. Tag: para
-#: architecture.xml:119
-#, no-c-format
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "<literal>Session</literal>과 현재 연관되어 있지 않은 영속 클래스들의 인스턴스"
@@ -159,21 +174,21 @@
 "것들은 닫혀진<literal>Session</literal>에 의해 초기화 되었을 수도 있다."
 
 #. Tag: term
-#: architecture.xml:128
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:130
-#, no-c-format
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(옵션) 작업의 원자 단위를 지정하기 위해 어플리케이션에 의해 사용되는 단일 쓰"
 "레드이고, 수명이 짧은 객체. 기본 JDBC, JTA 또는 CORBA 트랜잭션으로부터 어플리"
@@ -183,7 +198,7 @@
 "이 아니다!"
 
 #. Tag: term
-#: architecture.xml:141
+#: architecture.xml:153
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -193,13 +208,13 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:143
-#, no-c-format
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(옵션) JDBC 커넥션들에 대한 팩토리(그리고 그것들의 pool). 기본 "
 "<literal>Datasource</literal> 또는 <literal>DriverManager</literal>로부터 어"
@@ -207,7 +222,7 @@
 "장/구현 된다."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:163
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -215,94 +230,96 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
-#, no-c-format
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(옵션) <literal>Transaction</literal> 인스턴스들에 대한 팩토리. 어플리케이션"
 "에 노출되지는 않지만 개발자에 의해 확장/구현 된다."
 
 #. Tag: emphasis
-#: architecture.xml:160
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "Extension Interfaces"
 
 #. Tag: para
-#: architecture.xml:162
-#, no-c-format
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "Hibernate는 당신의 영속 계층의 특성을 맞춤화 시키기 위해 당신이 구현할 수 있"
 "는 선택적인 확장 인터페이스들을 제공한다. 상세한 것은 API 문서를 보라."
 
 #. Tag: para
-#: architecture.xml:171
-#, no-c-format
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "주어진 \"경량급\" 아키텍처의 경우, 어플리케이션은 JTA 또는 JDBC와 직접 대화하"
 "기 위해서 <literal>Transaction</literal>/<literal>TransactionFactory</"
 "literal> 그리고/또는 <literal>ConnectionProvider</literal> API들을 무시한다."
 
 #. Tag: title
-#: architecture.xml:179
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr "인스턴스 상태들"
 
 #. Tag: para
-#: architecture.xml:180
-#, no-c-format
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "영속 클래스들의 인스턴스는 세개의 상태들 중 하나 일 수 있다. 그것들(상태들)"
 "은 영속 컨텍스트(<emphasis>persistence context</emphasis>)에 대해 정의된다. "
 "Hibernate <literal>Session</literal> 객체는 영속 컨텍스트이다:"
 
 #. Tag: term
-#: architecture.xml:188
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr "transient"
 
 #. Tag: para
-#: architecture.xml:190
-#, no-c-format
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr ""
 "인스턴스는 임의의 컨텍스트와 연관되어 있지 않고, 결코 연관된 적이 없었다. 그"
 "것은 영속 식별자(프라이머리 키 값)을 갖지 않는다."
 
 #. Tag: term
-#: architecture.xml:198
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr "persistent"
 
 #. Tag: para
-#: architecture.xml:200
-#, no-c-format
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "인스턴스는 현재 영속 컨텍스트와 연관되어 있다. 그것은 영속 식별자(프라이머리 "
 "키 값) 그리고 아마 데이터베이스 내에 있는 대응하는 행을 갖는다. 특별한 영속 "
@@ -310,19 +327,19 @@
 "위치)와 같다는 점을 <emphasis>보증한다</emphasis>."
 
 #. Tag: term
-#: architecture.xml:212
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr "detached"
 
 #. Tag: para
-#: architecture.xml:214
-#, no-c-format
+#: architecture.xml:226
+#, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corrsponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "인스턴스는 영속 컨텍스트와 한번 연관되었지만, 그 컨텍스트가 닫혔거나, 그 인스"
@@ -331,47 +348,48 @@
 "는 영속 identity과 Java identity 사이의 관계를 보증하지 않는다."
 
 #. Tag: title
-#: architecture.xml:229
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr "JMX 통합"
 
 #. Tag: para
-#: architecture.xml:231
-#, no-c-format
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMX는 자바 컴포넌트 관리를 위한 J2EE 표준이다. Hibernate는 JMX 표준 서비스를 "
 "통해 관리될 수도 있다. 우리는 배포본 내에 MBean 구현, <literal>org.hibernate."
 "jmx.HibernateService</literal>를 제공한다."
 
 #. Tag: para
-#: architecture.xml:237
-#, no-c-format
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "JBoss 어플리케이션 서버 상에 Hibernae를 JMX 서비스로서 배치하는 방법에 대한 "
 "예제는 JBoss 사용자 가이드를 보길 바란다. JBoss 어플리케이션 서버 상에서, 만"
 "일 당신이 JMX를 사용하여 배치할 경우 당신은 또한 다음 이점들을 얻는다:"
 
 #. Tag: para
-#: architecture.xml:245
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>Session 관리:</emphasis> Hibernate <literal>Session</literal>의 생"
@@ -384,16 +402,16 @@
 "literal>에 접근하기 위해 <literal>HibernateContext</literal>를 호출한다."
 
 #. Tag: para
-#: architecture.xml:257
-#, no-c-format
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>HAR 배치:</emphasis> 대개 당신은 JBoss 서비스 배치 디스크립터를 사"
 "용하여 Hibernate JMX 서비스를 (EAR 과/또는 SAR 파일로) 배치하고, 그것은 "
@@ -403,7 +421,7 @@
 "당신의 HAR 파일 내에 있는 모든 매핑 파일들을 자동적으로 검출해낼 것이다."
 
 #. Tag: para
-#: architecture.xml:268
+#: architecture.xml:280
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
@@ -412,51 +430,52 @@
 "라."
 
 #. Tag: para
-#: architecture.xml:272
-#, no-c-format
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "JMX 서비스로서 이용 가능한 또다른 특징은 런타임 Hibernate 통계이다. <xref "
 "linkend=\"configuration-optional-statistics\"/>를 보라."
 
 #. Tag: title
-#: architecture.xml:279
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr "JCA 지원"
 
 #. Tag: para
-#: architecture.xml:280
-#, no-c-format
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hibernate는 JCA 커넥터로서 구성될 수도 있다. 상세한 것은 웹 사이트를 보길 바"
 "란다. Hibernate JCA 지원은 여전히 실험적으로 검토 중에 있음을 노트하길 바란"
 "다."
 
 #. Tag: title
-#: architecture.xml:287
-#, no-c-format
-msgid "Contextual Sessions"
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "컨텍스트 상의 세션들"
 
 #. Tag: para
-#: architecture.xml:288
-#, no-c-format
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "Hibernate를 사용하는 대부분의 어플리케이션들은 어떤 양식의 \"컨텍스트상의"
@@ -470,19 +489,18 @@
 "같은 )제 3의 프레임웍들을 활용하는 경향이 있었다."
 
 #. Tag: para
-#: architecture.xml:297
-#, no-c-format
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "버전 3.0.1에서부터 시작하여, Hibernate는 <literal>SessionFactory."
 "getCurrentSession()</literal> 메소드를 추가했다. 초기에 이것은 <literal>JTA</"
@@ -496,14 +514,14 @@
 "전부다."
 
 #. Tag: para
-#: architecture.xml:307
-#, no-c-format
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "하지만 버전 3.1 이후로 <literal>SessionFactory.getCurrentSession()</literal> "
@@ -514,15 +532,15 @@
 "스트의 플러그 가능성을 허용하기 위해 추가되었다."
 
 #. Tag: para
-#: architecture.xml:314
-#, no-c-format
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "그것의 계약에 대한 상세한 논의는 <literal>org.hibernate.context."
 "CurrentSessionContext</literal> 인터페이스에 관한 javadocs를 보라. 그것은 하"
@@ -531,11 +549,11 @@
 "페이스에 대한 세 개의 구현들을 부수적으로 포함하고 있다."
 
 #. Tag: para
-#: architecture.xml:324
-#, no-c-format
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -544,24 +562,23 @@
 "이전의 JTA-전용 접근과 정확하게 동일하다. 상세한 것은 javadocs를 보라."
 
 #. Tag: para
-#: architecture.xml:332
-#, no-c-format
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - 현재의 "
 "세션들은 실행 쓰레드에 의해 추적된다. 상세한 것은 다시 javadocs를 보라."
 
 #. Tag: para
-#: architecture.xml:338
-#, no-c-format
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "NOT TRANSLATED! <literal>org.hibernate.context.ManagedSessionContext</"
 "literal> - current sessions are tracked by thread of execution. However, you "
@@ -570,20 +587,21 @@
 "<literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:359
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programatic "
-"transaction demarcation in plain JSE without JTA, you are adviced to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "처음의 두 구현들은 <emphasis>session-per-request</emphasis>로 알려지고 사용되"
 "고 있는 \"하나의 세션 - 하나의 데이터베이스 트랜잭션\" 프로그래밍 모형을 제공"
@@ -598,18 +616,18 @@
 "\"transactions\"/>를 참조하라."
 
 #. Tag: para
-#: architecture.xml:359
-#, no-c-format
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "<literal>hibernate.current_session_context_class</literal> 구성 파라미터는 "

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,24 +11,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: association_mapping.xml:6
+#: association_mapping.xml:30
 #, no-c-format
 msgid "Association Mappings"
 msgstr "연관 매핑들"
 
 #. Tag: title
-#: association_mapping.xml:9
+#: association_mapping.xml:33
 #, no-c-format
 msgid "Introduction"
 msgstr "개요"
 
 #. Tag: para
-#: association_mapping.xml:11
-#, no-c-format
+#: association_mapping.xml:35
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -38,22 +38,22 @@
 "literal>과 <literal>Address</literal>를 사용할 것이다."
 
 #. Tag: para
-#: association_mapping.xml:19
-#, no-c-format
+#: association_mapping.xml:43
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr ""
 "우리는 연관들을 중재하는 join 테이블로 매핑시킬 것인지 여부에 따라, 그리고 "
 "multiplicity(다중성)에 따라 연관들을 분류할 것이다."
 
 #. Tag: para
-#: association_mapping.xml:24
-#, no-c-format
+#: association_mapping.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "null 허용 가능한 foreign 키들은 전통적인 데이터 모델링에서 좋은 실례로 간주되"
@@ -62,19 +62,19 @@
 "경우 매핑들은 모두 동작할 것이다."
 
 #. Tag: title
-#: association_mapping.xml:34
+#: association_mapping.xml:58
 #, no-c-format
 msgid "Unidirectional associations"
 msgstr "단방향 연관들"
 
 #. Tag: title
-#: association_mapping.xml:37 association_mapping.xml:108
-#, no-c-format
-msgid "many to one"
+#: association_mapping.xml:61 association_mapping.xml:132
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many to one"
 
 #. Tag: para
-#: association_mapping.xml:39
+#: association_mapping.xml:63
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association</emphasis> is the most "
@@ -84,7 +84,7 @@
 "관이다."
 
 #. Tag: programlisting
-#: association_mapping.xml:44
+#: association_mapping.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -104,7 +104,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:45 association_mapping.xml:161
+#: association_mapping.xml:69 association_mapping.xml:185
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -115,14 +115,14 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:50 association_mapping.xml:121
-#: association_mapping.xml:185 association_mapping.xml:225
-#, no-c-format
-msgid "one to one"
+#: association_mapping.xml:74 association_mapping.xml:145
+#: association_mapping.xml:210
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "one to one"
 
 #. Tag: para
-#: association_mapping.xml:52
+#: association_mapping.xml:76
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a foreign key</"
@@ -133,7 +133,7 @@
 "emphasis> 유일한 차이점은 컬럼 유일(unique) 컨스트레인트이다."
 
 #. Tag: programlisting
-#: association_mapping.xml:57
+#: association_mapping.xml:81
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -154,7 +154,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:58 association_mapping.xml:193
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -165,19 +165,19 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:60
-#, no-c-format
+#: association_mapping.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"emphasis> usually uses a special id generator In this example, however, we "
+"have reversed the direction of the association:"
 msgstr ""
 "<emphasis>하나의 프라이머리 키에 대한 단방향 one-to-one 연관</emphasis>은 대"
 "개 특별한 id 생성기를 사용한다. (이 예제에서 연관의 방향이 역전되었음을 주목"
 "하라.)"
 
 #. Tag: programlisting
-#: association_mapping.xml:66
+#: association_mapping.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -197,7 +197,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:67 association_mapping.xml:201
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -207,23 +207,23 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:72 association_mapping.xml:94
-#, no-c-format
-msgid "one to many"
+#: association_mapping.xml:96 association_mapping.xml:118
+#, fuzzy, no-c-format
+msgid "One-to-many"
 msgstr "one to many"
 
 #. Tag: para
-#: association_mapping.xml:74
-#, no-c-format
+#: association_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "<emphasis>하나의 foreign 키에 대한 단방향 one-to-many 연관</emphasis>은 매우 "
 "색다른 경우이고, 실제로 권장되지 않는다."
 
 #. Tag: programlisting
-#: association_mapping.xml:79
+#: association_mapping.xml:103
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -245,7 +245,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:80
+#: association_mapping.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -256,34 +256,33 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:82
-#, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+#: association_mapping.xml:106
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr ""
 "우리는 이런 종류의 연관에 대해 하나의 join 테이블을 사용하는 것이 더 좋다고 "
 "생각한다."
 
 #. Tag: title
-#: association_mapping.xml:91
+#: association_mapping.xml:115
 #, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "join 테이블들에 대한 단방향 연관들"
 
 #. Tag: para
-#: association_mapping.xml:96
-#, no-c-format
+#: association_mapping.xml:120
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"emphasis> is the preferred option. Specifying <literal>unique=\"true\"</"
+"literal>, changes the multiplicity from many-to-many to one-to-many."
 msgstr ""
 "<emphasis>하나의 join 테이블에 대한 단방향 one-to-many 연관</emphasis>이 보"
 "다 더 선호된다. <literal>unique=\"true\"</literal>를 지정함으로써 우리는 "
 "many-to-many에서 one-to-many로 아중성(multiplicity)를 변경시켰음을 주목하라."
 
 #. Tag: programlisting
-#: association_mapping.xml:102
+#: association_mapping.xml:126
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -306,7 +305,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:103
+#: association_mapping.xml:127
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -318,17 +317,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:110
-#, no-c-format
+#: association_mapping.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "<emphasis>하나의 join 테이블에 대한 단방향 many-to-one 연관</emphasis>은 그 "
 "연관이 선택적일 때 매우 공통적이다."
 
 #. Tag: programlisting
-#: association_mapping.xml:115
+#: association_mapping.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -352,7 +351,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:116
+#: association_mapping.xml:140
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -364,17 +363,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:123
-#, no-c-format
+#: association_mapping.xml:147
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>하나의 join 테이블에 대한 단방향 one-to-one 연관</emphasis>은 극히 "
 "통상적이지 않지만 가능하다."
 
 #. Tag: programlisting
-#: association_mapping.xml:128
+#: association_mapping.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -400,7 +399,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:129 association_mapping.xml:233
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -412,22 +411,22 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:134 association_mapping.xml:238
-#, no-c-format
-msgid "many to many"
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "many to many"
 
 #. Tag: para
-#: association_mapping.xml:136
-#, no-c-format
+#: association_mapping.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr ""
 "마지막으로, 우리는 <emphasis>단방향 many-to-many 연관</emphasis>을 갖는다."
 
 #. Tag: programlisting
-#: association_mapping.xml:140
+#: association_mapping.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -449,7 +448,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:141 association_mapping.xml:246
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -461,29 +460,30 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:148
+#: association_mapping.xml:172
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "양방향 연관들"
 
 #. Tag: title
-#: association_mapping.xml:151 association_mapping.xml:211
-#, no-c-format
-msgid "one to many / many to one"
+#: association_mapping.xml:175 association_mapping.xml:236
+#, fuzzy, no-c-format
+msgid "one-to-many / many-to-one"
 msgstr "one to many / many to one"
 
 #. Tag: para
-#: association_mapping.xml:153
-#, no-c-format
+#: association_mapping.xml:177
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "<emphasis>양방향 many-to-one 연관</emphasis>은 가장 공통된 종류의 연관이다."
 "(이것은 표준 부모/자식 관계이다. )"
 
 #. Tag: programlisting
-#: association_mapping.xml:159
+#: association_mapping.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -507,15 +507,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:163
-#, no-c-format
+#: association_mapping.xml:187
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "만일 당신이 <literal>List</literal>(또는 다른 인덱싱 된 콜렉션)을 사용할 경"
 "우 당신은 foreign key의 <literal>key</literal> 컬럼을 <literal>not null</"
@@ -525,7 +525,7 @@
 "으로부터 연관을 관리하도록 할 필요가 있다:"
 
 #. Tag: programlisting
-#: association_mapping.xml:171
+#: association_mapping.xml:195
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -550,13 +550,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:173
-#, no-c-format
+#: association_mapping.xml:197
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -567,16 +567,16 @@
 "</literal> 요소 상에 선언하라."
 
 #. Tag: para
-#: association_mapping.xml:187
-#, no-c-format
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr ""
 "<emphasis>foreign에 대한 양방향 one-to-one 연관</emphasis>은 꽤 공통적이다."
 
 #. Tag: programlisting
-#: association_mapping.xml:192
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -599,17 +599,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:195
-#, no-c-format
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr ""
 "<emphasis>하나의 프라이머리 키에 대한 양방향 one-to-one 연관</emphasis>은 특"
 "별한 id 생성기를 사용한다."
 
 #. Tag: programlisting
-#: association_mapping.xml:200
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -631,25 +631,26 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:208
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "join 테이블들에 대한 양방향 연관들"
 
 #. Tag: para
-#: association_mapping.xml:213
-#, no-c-format
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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>하나의 join 테이블에 대한 양방향 one-to-many 연관</emphasis>. "
 "<literal>inverse=\"true\"</literal>는 연관의 어느 쪽 끝이든 콜렉션 측으로 또"
 "는 join 측으로 갈 수 있다."
 
 #. Tag: programlisting
-#: association_mapping.xml:219
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -681,7 +682,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:220
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -692,18 +693,24 @@
 "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, no-c-format
+msgid "one to one"
+msgstr "one to one"
+
 #. Tag: para
-#: association_mapping.xml:227
-#, no-c-format
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>하나의 join 테이블에 대한 양방향 one-to-one 연관</emphasis>은 극히 "
 "통상적이지 않지만, 가능하다."
 
 #. Tag: programlisting
-#: association_mapping.xml:232
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -739,17 +746,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:240
-#, no-c-format
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr ""
 "마지막으로, 우리는 하나의 <emphasis>양방향 many-to-many 연관</emphasis>을 갖"
 "는다."
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -776,21 +783,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:253
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "보다 복잡한 연관 매핑들"
 
 #. Tag: para
-#: association_mapping.xml:255
-#, no-c-format
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "보다 복잡한 연관 조인들은 <emphasis>극기</emphasis> 드물다. Hibernate는 매핑 "
 "문서들 내에 삽입된 SQL 조각들을 사용하여 보다 복잡한 상황을 처리하는 것을 가"
@@ -800,7 +807,7 @@
 "핑된다:"
 
 #. Tag: programlisting
-#: association_mapping.xml:264
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -815,18 +822,18 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:266
-#, no-c-format
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"You can then map an association to the <emphasis>current</emphasis> "
+"instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "그때 우리는 다음을 사용하여 하나의 연관을 <emphasis>현재</emphasis> 인스턴스 "
 "(null <literal>effectiveEndDate</literal>을 가진 인스턴스)로 매핑시킬 수 있"
 "다:"
 
 #. Tag: programlisting
-#: association_mapping.xml:271
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -838,15 +845,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:273
-#, no-c-format
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"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</"
@@ -855,7 +862,7 @@
 "literal>를 갖고 있는 것)이 다음 방법으로 매핑될 수 있다:"
 
 #. Tag: programlisting
-#: association_mapping.xml:281
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -873,11 +880,11 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:283
-#, no-c-format
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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 또는 "
 "criteria 질의를 사용하여 이들 종류의 경우들을 처리하는 것이 보다 실용적이다."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,50 +11,50 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: basic_mapping.xml:5
+#: basic_mapping.xml:29
 #, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "기본 O/R 매핑"
 
 #. Tag: title
-#: basic_mapping.xml:8
+#: basic_mapping.xml:32
 #, no-c-format
 msgid "Mapping declaration"
 msgstr "매핑 선언"
 
 #. Tag: para
-#: basic_mapping.xml:10
-#, no-c-format
+#: basic_mapping.xml:34
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "객체/관계형 매핑들은 대개 XML 문서 내에 정의된다. 매핑 문서는 가독성이 있고 "
 "수작업 편집이 가능하도록 설계되어 있다. 매핑 언어는 매핑들이 테이블 선언들이 "
 "아닌, 영속 클래스 선언들로 생성된다는 의미에서 자바 중심적이다."
 
 #. Tag: para
-#: basic_mapping.xml:17
-#, no-c-format
+#: basic_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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를 포함하는, 매핑 문서를 생성시키는 많은 "
 "도구들이 존재한다는 점을 노트하라."
 
 #. Tag: para
-#: basic_mapping.xml:23
-#, no-c-format
-msgid "Lets kick off with an example mapping:"
+#: basic_mapping.xml:47
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "예제 매핑으로 시작하자:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:27
+#: basic_mapping.xml:51
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -124,14 +124,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:29
-#, no-c-format
+#: basic_mapping.xml:53
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "우리는 이제 매핑 문서의 내용을 논의할 것이다. 우리는 Hibernate에 의해 실행 시"
 "에 사용되는 문서 요소들과 속성들 만을 설명할 것이다. 매핑 문서는 또한 스키마 "
@@ -140,21 +140,21 @@
 "성.)"
 
 #. Tag: title
-#: basic_mapping.xml:40
+#: basic_mapping.xml:64
 #, no-c-format
 msgid "Doctype"
 msgstr "Doctype"
 
 #. Tag: para
-#: basic_mapping.xml:42
-#, no-c-format
+#: basic_mapping.xml:66
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "모든 XML 매핑들은 doctype이 보이게 선언해야 한다. 실제 DTD는 위의 URL에서, "
 "<literal>hibernate-x.x.x/src/org/hibernate</literal> 디렉토리 내에서 또는 "
@@ -164,21 +164,20 @@
 "당신의 DTD 선언을 체크하라."
 
 #. Tag: title
-#: basic_mapping.xml:52
+#: basic_mapping.xml:76
 #, no-c-format
 msgid "EntityResolver"
 msgstr "EntityResolver"
 
 #. Tag: para
-#: basic_mapping.xml:53
-#, no-c-format
+#: basic_mapping.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "앞서 언급했듯이, Hibernate는 먼저 그것의 classpath에서 DTD들을 해석하려고 시"
 "도할 것이다. Hibernate가 이것을 행하는 방법은 그것이 xml 파일들을 읽어들이는"
@@ -187,13 +186,13 @@
 "의 다른 systemId namespace들을 인지해낸다."
 
 #. Tag: para
-#: basic_mapping.xml:61
-#, no-c-format
+#: basic_mapping.xml:85
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "<literal>hibernate namespace</literal>는 resolver가 <literal>http://"
 "hibernate.sourceforge.net/</literal>로 시작하는 하나의 systemId와 만날때마다 "
@@ -201,12 +200,12 @@
 "엔티티들을 해석하려고 시도한다."
 
 #. Tag: para
-#: basic_mapping.xml:70
-#, no-c-format
+#: basic_mapping.xml:94
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -216,13 +215,13 @@
 "스로더를 통해 이들 엔티티들을 해석하려고 시도할 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:79
-#, no-c-format
-msgid "An example of utilizing user namespacing:"
+#: basic_mapping.xml:103
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "user namespacing을 활용하는 예제:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:82
+#: basic_mapping.xml:106
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -243,7 +242,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:83
+#: basic_mapping.xml:107
 #, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
@@ -255,24 +254,25 @@
 "xref>를 포함한다."
 
 #. Tag: title
-#: basic_mapping.xml:91
-#, no-c-format
-msgid "hibernate-mapping"
+#: basic_mapping.xml:115
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
-#: basic_mapping.xml:93
-#, no-c-format
+#: basic_mapping.xml:117
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "이 요소는 몇 개의 선택적인 속성들을 갖는다. <literal>schema</literal> 속성과 "
 "<literal>catalog</literal> 속성은 이 매핑 내에서 참조된 테이블들이 명명된 "
@@ -285,7 +285,7 @@
 "속에서 수식어가 붙지 않은(unqualified) 클래스 이름들을 사용하게 할 것이다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:114
+#: basic_mapping.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
@@ -300,45 +300,45 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:117
-#, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#: basic_mapping.xml:141
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr "<literal>schema</literal> (옵션): 데이터베이스 스키마의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:122
-#, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#: basic_mapping.xml:146
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr "<literal>catalog</literal> (옵션): 데이터베이스 카다록의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:127
-#, no-c-format
+#: basic_mapping.xml:151
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (옵션 - 디폴트는 <literal>none</"
 "literal>): 디폴트 cascade 스타일."
 
 #. Tag: para
-#: basic_mapping.xml:133
-#, no-c-format
+#: basic_mapping.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (옵션 - 디폴트는 <literal>property</"
 "literal>): Hibernate가 모든 프로퍼티들에 액세스하는데 사용하게 될 방도. "
 "<literal>PropertyAccessor</literal>에 대한 맞춤형 구현일 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:140
-#, no-c-format
+#: basic_mapping.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (옵션 - 디폴트는 <literal>true</literal>): "
@@ -346,34 +346,34 @@
 "대한 디폴트 값."
 
 #. Tag: para
-#: basic_mapping.xml:147
-#, no-c-format
+#: basic_mapping.xml:171
+#, fuzzy, 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."
+"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:154
-#, no-c-format
+#: basic_mapping.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<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:162
-#, no-c-format
+#: basic_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "만일 당신이 동일한 (수식어가 붙지 않은) 이름을 가진 두 개의 영속 클래스들을 "
 "갖고 있다면, 당신은 <literal>auto-import=\"false\"</literal>를 설정해야 한"
@@ -381,14 +381,14 @@
 "할 경우에 Hibernate는 예외상황을 던질 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:168
-#, no-c-format
+#: basic_mapping.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -401,23 +401,23 @@
 "는 <literal>Animal.hbm.xml</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:181
-#, no-c-format
-msgid "<title>class</title>"
-msgstr ""
+#: basic_mapping.xml:205
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:183
-#, no-c-format
+#: basic_mapping.xml:207
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr ""
 "당신은 <literal>class</literal> 요소를 사용하여 영속 클래스를 선언할 수도 있"
 "다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:211
+#: basic_mapping.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[<class\n"
@@ -447,11 +447,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:214
-#, no-c-format
+#: basic_mapping.xml:238
+#, fuzzy, 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 "
+"<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> (옵션): 영속 클래스(또는 인터페이스)의 전체 수식어가 "
@@ -459,22 +459,22 @@
 "고 가정된다."
 
 #. Tag: para
-#: basic_mapping.xml:221
-#, no-c-format
+#: basic_mapping.xml:245
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (옵션 - 디폴트는 수식어가 붙지 않은 클래스명): 그것"
 "의 데이터베이스 테이블의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:227
-#, no-c-format
+#: basic_mapping.xml:251
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (옵션 - 디폴트는 클래스 이름): 다형성"
@@ -482,20 +482,20 @@
 "값들은<literal>null</literal>과 <literal>not null</literal>을 포함한다."
 
 #. Tag: para
-#: basic_mapping.xml:234
-#, no-c-format
+#: basic_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<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:240 basic_mapping.xml:2204
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -506,10 +506,10 @@
 "literal> 요소에 의해 지정된 스키마 이름을 오버라이드 시킨다"
 
 #. Tag: para
-#: basic_mapping.xml:246 basic_mapping.xml:2210
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -520,33 +520,33 @@
 "literal> 요소에 의해 지정된 카타록 이름을 오버라이드 시킨다."
 
 #. Tag: para
-#: basic_mapping.xml:252
-#, no-c-format
+#: basic_mapping.xml:276
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (옵션): lazy initializing proxy들에 사용할 인터페이"
 "스를 지정한다. 당신은 클래스 그 자체의 이름을 지정할 수 도 있다."
 
 #. Tag: para
-#: basic_mapping.xml:258
-#, no-c-format
+#: basic_mapping.xml:282
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (옵션 - 디폴트는 <literal>false</"
 "literal>): <literal>UPDATE</literal> SQL이 실행 시에 생성되고 그들 컬럼들의 "
 "값들이 변경된 그들 컬럼들 만을 포함할 것인지를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:265
-#, no-c-format
+#: basic_mapping.xml:289
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (옵션 - 디폴트는 <literal>false</"
@@ -554,17 +554,16 @@
 "의 값이 null이 아닌 컬럼들 만을 포함할 것인지를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:272
-#, no-c-format
+#: basic_mapping.xml:296
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (옵션 - 디폴트는 <literal>false</"
 "literal>): 객체가 실제로 변경되는 것이 확실하지 않는 한, Hibernate가 SQL "
@@ -575,11 +574,11 @@
 "Hibernate는 특별한 SQL <literal>SELECT</literal>를 실행할 것임을 의미한다."
 
 #. Tag: para
-#: basic_mapping.xml:282
-#, no-c-format
+#: basic_mapping.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "<literal>polymorphism</literal> (옵션 - 디폴트는 <literal>implicit</"
@@ -587,65 +586,67 @@
 "것인지를 결정한다."
 
 #. Tag: para
-#: basic_mapping.xml:288
-#, no-c-format
+#: basic_mapping.xml:312
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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:294
-#, no-c-format
+#: basic_mapping.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (옵션): 맞춤형 <literal>ClassPersister</literal>"
 "를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:299
-#, no-c-format
+#: basic_mapping.xml:323
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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>) 식별자"
 "에 의해 이 클래스의 인스턴스들을 페치시키는 \"배치 사이즈\"를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:305
-#, no-c-format
+#: basic_mapping.xml:329
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>version</"
 "literal>): optimistic 잠금 방도를 결정한다."
 
 #. Tag: para
-#: basic_mapping.xml:311
-#, no-c-format
+#: basic_mapping.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<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이 전체적으로 사용불가능하게 될 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:317
-#, no-c-format
+#: basic_mapping.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal>(옵션, 디폴트는 클래스 이름): Hibernate3는 하나"
 "의 클래스가 (잠정적으로 다른 테이블들로) 여러번 매핑되는 것을 허용해주고, "
@@ -658,10 +659,10 @@
 "\"persistent-classes-dynamicmodels\"/>과 <xref linkend=\"xml\"/>을 보라."
 
 #. Tag: para
-#: basic_mapping.xml:327
-#, no-c-format
+#: basic_mapping.xml:351
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -669,14 +670,14 @@
 "<emphasis>check</emphasis> constraint를 생성시키는데 사용되는 SQL 표현식."
 
 #. Tag: para
-#: basic_mapping.xml:333
-#, no-c-format
+#: basic_mapping.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (옵션): Hibernate는 지원되는 데이터베이스들, 예를 들"
 "어 Oracle 상에서 이른바 ROWID들을 사용할 수 있고, Hibernate는 당신이 이 옵션"
@@ -685,36 +686,36 @@
 "튜플(tuple)의 물리적이니 위치를 표현한다."
 
 #. Tag: para
-#: basic_mapping.xml:341
-#, no-c-format
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (옵션): 불변의 읽기 전용 엔티티를 데이터베이스 "
 "subselect로 매핑시킨다. 당신이 기본 테이블 대신에 뷰를 갖고자 원할 경우에 유"
 "용하지만, 사용을 자제하라. 추가 정보는 아래를 보라."
 
 #. Tag: para
-#: basic_mapping.xml:348
-#, no-c-format
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (옵션): <literal>&lt;union-subclass&gt;</"
 "literal> 계층 구조들 내에서 abstract 슈퍼클래스들을 마크하는데 사용된다."
 
 #. Tag: para
-#: basic_mapping.xml:356
-#, no-c-format
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "명명된 영속 클래스가 인터페이스가 되는 것은 완전히 수용가능하다. 그런 다음 당"
 "신은 <literal>&lt;subclass&gt;</literal> 요소를 사용하여 그 인터페이스에 대"
@@ -723,10 +724,10 @@
 "Foo$Bar</literal>를 사용하여 클래스 이름을 지정해야 한다."
 
 #. Tag: para
-#: basic_mapping.xml:363
-#, no-c-format
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -735,14 +736,14 @@
 "떤 마이너 퍼포먼스 최적화를 행하게끔 허용해준다."
 
 #. Tag: para
-#: basic_mapping.xml:368
-#, no-c-format
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "선택적인 <literal>proxy</literal> 속성은 그 클래스의 영속 인스턴스들에 대한 "
 "lazy 초기화를 가능하게 해준다. Hibernate는 명명된 인터페이스를 구현하는 "
@@ -750,22 +751,22 @@
 "출될 때 로드될 것이다. 아래 \"Lazy 초기화를 위한 프락시들\"을 보라."
 
 #. Tag: para
-#: basic_mapping.xml:375
-#, no-c-format
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "<emphasis>Implicit</emphasis> 다형성은 클래스의 인스턴스들이 어떤 서브클래스"
 "나 구현된 인터페이스 또는 클래스를 명명하는 질의에 의해 반환될 것임을 의미하"
@@ -781,17 +782,17 @@
 "\"경량급\" 클래스를 허용한다)."
 
 #. Tag: para
-#: basic_mapping.xml:387
-#, no-c-format
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "<literal>persister</literal> 속성은 클래스에 사용되는 영속화 방도를 당신이 커"
 "스트마이징 할 수 있도록 해준다. 예를 들어 당신은 <literal>org.hibernate."
@@ -803,15 +804,14 @@
 "<literal>org.hibernate.test.CustomPersister</literal>를 보라."
 
 #. Tag: para
-#: basic_mapping.xml:398
-#, no-c-format
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "<literal>dynamic-update</literal> 설정과 <literal>dynamic-insert</literal> 설"
 "정은 서브클래스들에 의해 상속되지 않고 따라서 또한 <literal>&lt;subclass&gt;"
@@ -820,12 +820,12 @@
 "만 다른 경우들에서는 퍼포먼스를 실제로 감소시킬 수도 있다. 적절하게 사용하라."
 
 #. Tag: para
-#: basic_mapping.xml:406
-#, no-c-format
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "<literal>select-before-update</literal> 사용은 대개 퍼포먼스를 감소시킬 것이"
@@ -834,7 +834,7 @@
 "방지하는데 매우 유용하다."
 
 #. Tag: para
-#: basic_mapping.xml:412
+#: basic_mapping.xml:435
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -844,42 +844,41 @@
 "optimistic 잠금 전략들을 선택하게 될 것이다:"
 
 #. Tag: para
-#: basic_mapping.xml:418
-#, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr "<literal>version</literal>은 version/timestamp 컬럼들을 체크한다"
 
 #. Tag: para
-#: basic_mapping.xml:423
-#, no-c-format
-msgid "<literal>all</literal> check all columns"
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all</literal>은 모든 컬럼들을 체크한다"
 
 #. Tag: para
-#: basic_mapping.xml:428
-#, no-c-format
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr ""
 "<literal>dirty</literal>는 몇몇 동시성 업데이트들을 허용하여, 변경된 컬럼들"
 "을 체크한다"
 
 #. Tag: para
-#: basic_mapping.xml:433
-#, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none</literal>은 optimistic 잠금을 사용하지 않는다"
 
 #. Tag: para
-#: basic_mapping.xml:438
-#, no-c-format
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "우리는 당신이 Hibernate에서 optimistic 잠금을 위해 version/timestamp 컬럼들"
 "을 사용할 것을 <emphasis>매우</emphasis> 강력하게 권장한다. 이것은 퍼포먼스"
@@ -888,15 +887,15 @@
 "용될 때)."
 
 #. Tag: para
-#: basic_mapping.xml:445
-#, no-c-format
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "Hibernate 매핑의 경우에 베이스 테이블과 뷰 사이에 차이점이 존재하지 않는다. "
 "왜냐하면 이것이 데이터베이스 레벨에서는 투명하다고 기대되기 때문이다(몇몇 "
@@ -906,7 +905,7 @@
 "티를 주어진 SQL subselect 표현식으로 매핑시킬 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:453
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -924,13 +923,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:455
-#, no-c-format
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "auto-flush가 정확하게 발생하도록 하고, 그리고 파생된 엔티티에 대한 질의들이 "
 "쓸효성 없는 데이터를 반환하지 않도록 함으로써, 이 엔티티와 동기화 될 테이블"
@@ -938,13 +937,13 @@
 "양자로서 이용 가능하다."
 
 #. Tag: title
-#: basic_mapping.xml:465
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:467
+#: basic_mapping.xml:490
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -959,7 +958,7 @@
 "는 그 프로퍼티로부터 프라이머리 키 컬럼으로의 매핑을 정의한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:482
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -975,37 +974,37 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:485
-#, no-c-format
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr "<literal>name</literal> (옵션): 식별자 프로퍼티의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:490
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
 msgstr "<literal>type</literal> (옵션): Hibernate 타입을 나타내는 이름."
 
 #. Tag: para
-#: basic_mapping.xml:495
-#, no-c-format
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr ""
 "<literal>column</literal> (옵션 - 디폴트는 프로퍼티 이름): 프라이머리 키 컬럼"
 "의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:501
-#, no-c-format
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal> (옵션 - 디폴트는 \"sensible\" 값): 이전 세션"
 "에서 저장되었거나 로드되었던 detached(분리된) 인스턴스들로부터 그것을 구분지"
@@ -1013,13 +1012,11 @@
 "자 프로퍼티 값."
 
 #. Tag: para
-#: basic_mapping.xml:509 basic_mapping.xml:1017 basic_mapping.xml:1156
-#: basic_mapping.xml:1238 basic_mapping.xml:1345 basic_mapping.xml:1534
-#: basic_mapping.xml:1708 basic_mapping.xml:1878 basic_mapping.xml:2457
+#: basic_mapping.xml:532
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1051,7 +1048,7 @@
 "Hibernate가 프로퍼티 값에 접근하는데 사용할 방도."
 
 #. Tag: para
-#: basic_mapping.xml:517
+#: basic_mapping.xml:540
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1061,7 +1058,7 @@
 "다고 가정된다."
 
 #. Tag: para
-#: basic_mapping.xml:522
+#: basic_mapping.xml:545
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1070,25 +1067,25 @@
 "<literal>unsaved-value</literal> 속성은 Hibernate3에서는 거의 필요하지 않다."
 
 #. Tag: para
-#: basic_mapping.xml:526
-#, no-c-format
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "composite 키들로서 리거시 데이터에 액세스하는 것을 허용해주는 대체적인 "
 "<literal>&lt;composite-id&gt;</literal> 선언이 존재한다. 우리는 그 밖의 어떤"
 "것에 대한 그것의 사용에 대해 강력하게 반대한다."
 
 #. Tag: title
-#: basic_mapping.xml:532
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:534
+#: basic_mapping.xml:557
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1103,7 +1100,7 @@
 "경우, 그것들은 <literal>&lt;param&gt;</literal> 요소 를 사용하여 전달된다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:541
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1115,14 +1112,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:543
+#: basic_mapping.xml:566
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "모든 생성기들은 <literal>org.hibernate.id.IdentifierGenerator</literal> 인터"
 "페이스를 구현한다. 이것은 매우 간단한 인터페이스이다; 몇몇 어플리케이션들은 "
@@ -1131,13 +1128,13 @@
 "축 이름들이 존재한다: <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:551
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:553
+#: basic_mapping.xml:576
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1151,13 +1148,13 @@
 "말라.</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:562
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:564
+#: basic_mapping.xml:587
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1169,13 +1166,13 @@
 "<literal>int</literal> 타입이다."
 
 #. Tag: literal
-#: basic_mapping.xml:572
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:574
+#: basic_mapping.xml:597
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1187,13 +1184,13 @@
 "<literal>short</literal> 또는 <literal>int</literal> 타입이다."
 
 #. Tag: literal
-#: basic_mapping.xml:582
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:584
+#: basic_mapping.xml:607
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1210,13 +1207,13 @@
 "정 데이터베이스에 대해서만 유일한 식별자들을 생성시킨다."
 
 #. Tag: literal
-#: basic_mapping.xml:594
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:596
+#: basic_mapping.xml:619
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1228,46 +1225,46 @@
 "으로 생성시키는데 hi/lo 알고리즘을 사용한다."
 
 #. Tag: literal
-#: basic_mapping.xml:604
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:606
-#, no-c-format
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "네트웍 내에서 유일한(IP 주소가 사용된다) string 타입의 식별자들을 생성시키기 "
 "위해 128 비트 UUID 알고리즘을 사용한다. UUID는 길이가 32인 16진수들의 문자열"
 "로서 인코딩 된다."
 
 #. Tag: literal
-#: basic_mapping.xml:614
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:616
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr "MS SQL Server와 MySQL 상에서 데이터베이스 생성 GUID 문자열을 사용한다."
 
 #. Tag: literal
-#: basic_mapping.xml:622
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:624
-#, no-c-format
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1275,50 +1272,50 @@
 "<literal>sequence</literal> 또는 <literal>hilo</literal>를 찾아낸다."
 
 #. Tag: literal
-#: basic_mapping.xml:632
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:634
-#, no-c-format
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "어플리케이션으로 하여금 <literal>save()</literal>가 호출되기 전에 식별자를 객"
 "체에 할당하도록 한다. <literal>&lt;generator&gt;</literal> 요소가 지정되지 않"
 "을 경우 이것이 디폴트 방도이다."
 
 #. Tag: literal
-#: basic_mapping.xml:642
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:644
-#, no-c-format
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr ""
 "어떤 유일 키에 의해 행을 select하고 프라이머리 키 값을 검색함으로써 데이터베"
 "이스 트리거에 의해 할당된 프라이머리 키를 검색한다."
 
 #. Tag: literal
-#: basic_mapping.xml:651
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:653
-#, no-c-format
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1326,21 +1323,21 @@
 "literal> 프라이머리 키 연관관계와 함께 사용된다."
 
 #. Tag: literal
-#: basic_mapping.xml:660
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:662
-#, no-c-format
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "실제 값 생성을 위해 데이터베이스 시퀀스를 활용하지만, 생성된 식별자 값을 "
 "insert 문장 실행의 부분으로서 실제로 반환시키기 위해 이것을 JDBC3 "
@@ -1350,20 +1347,20 @@
 "게 되어 있음을 노트하라."
 
 #. Tag: title
-#: basic_mapping.xml:679
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "Hi/lo algorithm"
 
 #. Tag: para
-#: basic_mapping.xml:680
-#, no-c-format
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "<literal>hilo</literal>와 <literal>seqhilo</literal> 생성기들은 식별자 생성"
 "에 대한 마음에 드는 접근법인, hi/lo 알고리즘에 대한 두 개의 대체 구현들은 제"
@@ -1372,7 +1369,7 @@
 "퀀스를 사용한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:687
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1385,7 +1382,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:689
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1397,14 +1394,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:691
-#, no-c-format
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "불행히도 당신은 Hibernate에 당신 자신의 <literal>Connection</literal>을 제공"
 "할 때 <literal>hilo</literal>를 사용할 수 없다. Hibernate가 JTA의 도움을 받"
@@ -1413,19 +1410,19 @@
 "해야 한다."
 
 #. Tag: title
-#: basic_mapping.xml:700
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID 알고리즘"
 
 #. Tag: para
-#: basic_mapping.xml:701
-#, no-c-format
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "UUID 는 다음을 포함한다: IP 주소, JVM의 시작 시간(정확히 1/4 초), 시스템 시간"
 "과 (JVM 내에서 유일한) counter 값. Java 코드로부터 MAC 주소 또는 메모리 주소"
@@ -1433,20 +1430,20 @@
 "최상의 것이다."
 
 #. Tag: title
-#: basic_mapping.xml:710
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "식별 컬럼들과 시퀀스들"
 
 #. Tag: para
-#: basic_mapping.xml:711
-#, no-c-format
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "식별 컬럼들을 지원하는 데이터베이스들(DB2, MySQL, Sybase, MS SQL)의 경우, 당"
 "신은 <literal>identity</literal> 키 생성을 사용할 수 있다. 시퀀스들을 지원하"
@@ -1455,7 +1452,7 @@
 "도들 모두 새로운 객체를 insert하기 위해 두 개의 SQL 질의들을 필요로 한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:719
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1466,7 +1463,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:721
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1476,34 +1473,34 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:723
-#, no-c-format
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "크로스 플랫폼 개발을 위해서, <literal>native</literal> 방도가 기준 데이터베이"
 "스들의 가용성들에 따라 <literal>identity</literal>, <literal>sequence</"
 "literal>, <literal>hilo</literal> 방도 중에서 선택될 것이다."
 
 #. Tag: title
-#: basic_mapping.xml:732
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "할당된 식별자들"
 
 #. Tag: para
-#: basic_mapping.xml:733
-#, no-c-format
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "(Hibernate로 하여금 식별자들을 생성시키도록 하는 것과는 반대로) 당신이 어플리"
@@ -1515,12 +1512,12 @@
 "트 특징이다"
 
 #. Tag: para
-#: basic_mapping.xml:742
-#, no-c-format
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1532,22 +1529,22 @@
 "록 한다."
 
 #. Tag: title
-#: basic_mapping.xml:752
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "트리거들에 의해 할당된 프라이머리 키들"
 
 #. Tag: para
-#: basic_mapping.xml:753
-#, no-c-format
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr ""
 "리거시 스키마에 대해서만(Hibernate는 트리거들을 가진 DDL을 생성시키지 않는"
 "다)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:757
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1558,35 +1555,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:759
-#, no-c-format
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "위의 예제에서, natural 키로서 클래스에 의해 <literal>socialSecurityNumber</"
 "literal>로 명명된 유일 값을 가진 프로퍼티가 존재하고, 트리거에 의해 그 값이 "
 "생성되는 <literal>person_id</literal>로 명명된 대용키가 존재한다."
 
 #. Tag: title
-#: basic_mapping.xml:771
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "NOT TRANSLATED!Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:773
-#, no-c-format
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1597,24 +1594,25 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:781
+#: basic_mapping.xml:803
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1634,24 +1632,24 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:795
-#, no-c-format
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:801
-#, no-c-format
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1660,13 +1658,13 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:808
-#, no-c-format
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
@@ -1674,11 +1672,11 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:815
-#, no-c-format
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1686,40 +1684,40 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:822
-#, no-c-format
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:829
+#: basic_mapping.xml:851
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
 "cascade 스타일."
 
 #. Tag: para
-#: basic_mapping.xml:836
+#: basic_mapping.xml:858
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1734,21 +1732,21 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:846
-#, no-c-format
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:852
-#, no-c-format
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1756,13 +1754,13 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:858
-#, no-c-format
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
@@ -1770,10 +1768,10 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:865
-#, no-c-format
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1782,63 +1780,64 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:872
-#, no-c-format
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:878
-#, no-c-format
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:884
-#, no-c-format
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:890
+#: basic_mapping.xml:912
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
 "cascade 스타일."
 
 #. Tag: title
-#: basic_mapping.xml:900
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "NOT TRANSLATED! Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:901
+#: basic_mapping.xml:923
 #, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1849,11 +1848,11 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:909
-#, no-c-format
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1861,13 +1860,13 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:915
-#, no-c-format
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1879,15 +1878,15 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:924
-#, no-c-format
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1897,13 +1896,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:937
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:939
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1922,10 +1921,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:941
-#, no-c-format
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1936,7 +1935,7 @@
 "<literal>&lt;key-many-to-one&gt;</literal> 매핑들을 허용한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:948
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -1946,12 +1945,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:950
-#, no-c-format
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "당신의 영속 클래스는 composite 식별자 동등성을 구현하기 위해서 "
 "<literal>equals()</literal>와 <literal>hashCode()</literal>를 오버라이드 "
@@ -1959,16 +1958,16 @@
 "을 구현해야 한다."
 
 #. Tag: para
-#: basic_mapping.xml:956
-#, no-c-format
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "불행히도, composite 식별자들에 대한 이 접근법은 영속 객체가 그것 자신의 식별"
 "자라는 점을 의미한다. 객체 자신 외의 다른 \"핸들\"이 존재하지 않는다. 당신은 "
@@ -1978,7 +1977,7 @@
 "composite 식별자로 부르고, 중대한 어플리케이션들에 대해 그것을 억제시킨다."
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:987
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -1992,7 +1991,7 @@
 "다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:971
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -2002,16 +2001,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:973
-#, no-c-format
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "이 예제에서, composite 식별자 클래스인 <literal>MedicareId</literal>와 엔티"
 "티 크래스 그 자체 양자는 <literal>medicareNumber</literal>와 "
@@ -2021,17 +2019,17 @@
 "명백한&mdash;코드 중복이다."
 
 #. Tag: para
-#: basic_mapping.xml:982
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
 msgstr "다음 속성들은 매핑된 composite 식별자를 지정하는데 사용된다:"
 
 #. Tag: para
-#: basic_mapping.xml:988
-#, no-c-format
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -2041,20 +2039,20 @@
 "래스와 composite 식별자 클래스 양자를 참조함을 나타낸다."
 
 #. Tag: para
-#: basic_mapping.xml:996
-#, no-c-format
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (옵션, 하지만 하나의 매핑된 commposite 식별자에 대해"
 "서는 필수적임): 하나의 composite 식별자로서 사용되는 클래스."
 
 #. Tag: para
-#: basic_mapping.xml:1003
-#, no-c-format
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -2064,51 +2062,89 @@
 "이다. 아래에 설명되어 있는 속성들은 이 대체적인 접근법에만 적용된다:"
 
 #. Tag: para
-#: basic_mapping.xml:1011
-#, no-c-format
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (옵션, 이 접근법의 경우에는 필수임): 하나의 "
 "component 식별자를 소유하는 컴포넌트 타입의 프로퍼티(9장을 보라)."
 
 #. Tag: para
-#: basic_mapping.xml:1023
-#, no-c-format
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근 하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도."
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (옵션 - 디폴트는 reflection에 의해 결정된 프로퍼티 "
 "타입): 하나의 composite 식별자로서 사용되는 컴포넌트 클래스(다음 절을 보라)."
 
 #. Tag: para
-#: basic_mapping.xml:1030
-#, no-c-format
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "이 세번째 접근법, <emphasis>identifier component</emphasis>은 거의 모든 어플"
 "리케이션들에 대해 우리가 권장하는 것이다."
 
 #. Tag: title
-#: basic_mapping.xml:1038
-#, no-c-format
-msgid "discriminator"
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "discriminator"
 
 #. Tag: para
-#: basic_mapping.xml:1040
-#, no-c-format
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2124,7 +2160,7 @@
 "<literal>yes_no</literal>, <literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1058
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2137,31 +2173,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1061
-#, no-c-format
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal> (옵션 - 디폴트는 <literal>class</literal>) "
 "discriminator 컬럼명."
 
 #. Tag: para
-#: basic_mapping.xml:1067
-#, no-c-format
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (옵션 - 디폴트는 <literal>string</literal>) "
 "Hibernate 타입을 나타내는 이름"
 
 #. Tag: para
-#: basic_mapping.xml:1073
-#, no-c-format
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force</literal> (옵션 - 디폴트는 <literal>false</literal>) 이것은 "
@@ -2169,13 +2205,13 @@
 "discriminator 값들을 지정하도록 \"강제한다\"."
 
 #. Tag: para
-#: basic_mapping.xml:1080
-#, no-c-format
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (옵션 - 디폴트는 <literal>true</literal>) 당신의 "
 "discriminator 컬럼이 또한 매핑된 composite 식별자의 부분일 경우에 이것을 "
@@ -2183,18 +2219,18 @@
 "literal>들 속에 그 컬럼을 포함하지 않도록 통보한다.)"
 
 #. Tag: para
-#: basic_mapping.xml:1088
-#, no-c-format
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (옵션) 타입이 평가 되어야 할 때 실행되는 임의의 "
 "SQL 표현식. 컨텐츠 기반의 판별을 허용해준다."
 
 #. Tag: para
-#: basic_mapping.xml:1096
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2206,29 +2242,29 @@
 "literal> 속성에 의해 지정된다."
 
 #. Tag: para
-#: basic_mapping.xml:1102
-#, no-c-format
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "<literal>force</literal> 속성은 테이블이 영속 클래스로 매핑되지 않는 \"특별한"
 "\" discriminator 값들을 가진 행들을 포함할 경우에(만) 유용하다. 이것은 대개 "
 "그 경우가 아닐 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:1108
-#, no-c-format
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "<literal>formula</literal> 속성을 사용하여 당신은 행의 타입을 판단하는데 사용"
 "될 임의의 SQL 표현식을 선언할 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1113
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2237,25 +2273,26 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1118
-#, no-c-format
-msgid "version (optional)"
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "version (옵션)"
 
 #. Tag: para
-#: basic_mapping.xml:1120
-#, no-c-format
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "<literal>&lt;version&gt;</literal> 요소는 옵션이고 테이블이 버전화된 데이터"
 "를 포함한다는 것을 나타낸다. 이것은 당신이 <emphasis>긴 트랜잭션(long "
 "transaction)들</emphasis>을 사용할 계획이라면 특히 유용하다 (아래를 보라)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1136
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2271,41 +2308,76 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1139
-#, no-c-format
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal> (옵션 - 디폴트는 프로퍼티 명): 버전 번호를 가진 컬"
 "럼의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1145
-#, no-c-format
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr "<literal>name</literal>: 영속 클래스의 프로퍼티 명."
 
 #. Tag: para
-#: basic_mapping.xml:1150
-#, no-c-format
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (옵션 - 디폴트는 <literal>integer</literal>): 버전 번"
 "호의 타입."
 
 #. Tag: para
-#: basic_mapping.xml:1162
-#, no-c-format
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근 하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 액세스하는데 사용할 방도.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
+"Hibernate가 프로퍼티 값에 접근하는데 사용할 방도."
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (옵션 - 디폴트는 <literal>undefined</"
 "literal>): 이전 세션에서 저장되었거나 로드되었던 detached 인스턴스로부터 구별"
@@ -2313,13 +2385,13 @@
 "(<literal>undefined</literal>는 식별자 프로퍼티 값이 사용될 것임을 지정한다.)"
 
 #. Tag: para
-#: basic_mapping.xml:1171
-#, no-c-format
+#: basic_mapping.xml:1193
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (옵션 - 디폴트는 <literal>never</literal>): 이 "
 "version 프로퍼티 값이 데이터베이스에 의해 실제로 산출되는지를 지정한다. "
@@ -2327,13 +2399,13 @@
 "보라."
 
 #. Tag: para
-#: basic_mapping.xml:1178
-#, no-c-format
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "<literal>insert</literal> (옵션 - 디폴트는 <literal>true</literal>): version "
 "컬럼이 SQL insert 문장들 속에 포함될 것인지 여부를 지정한다. 데이터베이스 컬"
@@ -2341,10 +2413,10 @@
 "literal>로 설정될 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:1188
-#, no-c-format
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2353,16 +2425,16 @@
 "<literal>calendar</literal> 타입일 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:1193
-#, no-c-format
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "version 또는 timestamp 프로퍼티는 detached 인스턴스에 대해 결코 null일 수가 "
 "없어서, Hibernate는 다른 <literal>unsaved-value</literal> 방도들이 지정되는 "
@@ -2373,20 +2445,19 @@
 "히 유용하다!</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1204
-#, no-c-format
-msgid "timestamp (optional)"
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp (옵션)"
 
 #. Tag: para
-#: basic_mapping.xml:1206
-#, no-c-format
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "옵션 <literal>&lt;timestamp&gt;</literal> 요소는 테이블이 타임스탬프화 된 데"
 "이터를 포함함을 나타낸다. 이것은 버전화에 대한 대체물로서 고안되었다. "
@@ -2394,7 +2465,7 @@
 "로 어플리케이션은 다른 방법들로 timestamp들을 사용할 수도 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1222
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2409,20 +2480,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1225
-#, no-c-format
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr ""
 "<literal>column</literal> (옵션 - 디폴트는 프로퍼티 명): 타임스탬프를 포함하"
 "는 컬럼 명."
 
 #. Tag: para
-#: basic_mapping.xml:1231
-#, no-c-format
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2430,14 +2501,14 @@
 "는 <literal>Timestamp</literal> 타입을 가진 자바빈즈 스타일의 프로퍼티 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1244
-#, no-c-format
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (옵션 - 디폴트는 <literal>null</literal>): "
 "이전 세션에서 저장되었거나 로드되었던 detached 인스턴스로부터 인스턴스를 구별"
@@ -2445,17 +2516,17 @@
 "(<literal>undefined</literal>는 식별자 프로퍼티 값이 사용될 것임을 지정한다.)"
 
 #. Tag: para
-#: basic_mapping.xml:1253
-#, no-c-format
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "<literal>source</literal> (옵션 - 디폴트는 <literal>vm</literal>): Hibernate"
 "는 어디서 timestamp 값을 검색할 것인가? 데이터베이스로부터인가 현재의 JVM으로"
@@ -2467,25 +2538,31 @@
 "에 있어 사용이 안전하지 않을 수 있음을 노트하라(예를 들면 오라클 8)."
 
 #. Tag: para
-#: basic_mapping.xml:1265
-#, no-c-format
+#: basic_mapping.xml:1287
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (옵션 - 디폴트는 <literal>never</literal>): 이 "
 "timestamp 프로퍼티 값이 데이터베이스에 의해 실제로 생성됨을 지정한다. <xref "
 "linkend=\"mapping-generated\">산출되는 프로퍼티들</xref>에 대한 논의들 보라."
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1274
-#, no-c-format
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "<literal>&lt;timestamp&gt;</literal>는 <literal>&lt;version type=\"timestamp"
@@ -2494,23 +2571,23 @@
 "literal>과 같다"
 
 #. Tag: title
-#: basic_mapping.xml:1284
-#, no-c-format
-msgid "property"
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "프로퍼티"
 
 #. Tag: para
-#: basic_mapping.xml:1286
-#, no-c-format
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "<literal>&lt;property&gt;</literal> 요소는 클래스의 자바빈즈 스타일의 영속 프"
 "로퍼티를 선언한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2536,7 +2613,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1311
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2544,11 +2621,11 @@
 msgstr "<literal>name</literal>: 첫 소문자로 시작하는 프로퍼티 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1317
-#, no-c-format
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal> (옵션 - 디폴트는 프로퍼티 이름): 매핑된 데이터베이"
@@ -2556,22 +2633,15 @@
 "literal> 요소(들)에 의해 지정될 수도 있다."
 
 #. Tag: para
-#: basic_mapping.xml:1324
-#, no-c-format
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr "<literal>type</literal> (옵션): Hibernate 타입을 나타내는 이름."
-
-#. Tag: para
-#: basic_mapping.xml:1329
-#, no-c-format
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (옵션 - 디폴트는 <literal>true</"
 "literal>) : 매핑된 컬럼들이 <literal>UPDATE</literal>와/또는 "
@@ -2581,7 +2651,7 @@
 "기화 되는 순수하게 \"파생된(derived)\" 프로퍼티를 허용해준다."
 
 #. Tag: para
-#: basic_mapping.xml:1338
+#: basic_mapping.xml:1365
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2593,22 +2663,22 @@
 "매핑을 갖지 않는다."
 
 #. Tag: para
-#: basic_mapping.xml:1351
-#, no-c-format
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>false</literal>): 인스턴스 "
 "변수가 처음으로 액세스 될 때 이 프로퍼티가 lazily하게 페치될 것임을 지정한다"
 "(빌드-시 바이트코드 수단을 필요로 한다)."
 
 #. Tag: para
-#: basic_mapping.xml:1358
-#, no-c-format
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2617,23 +2687,23 @@
 "는 것을 허용해준다."
 
 #. Tag: para
-#: basic_mapping.xml:1365
-#, no-c-format
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (옵션): 컬럼들에 대해 null 가능 컨스트레인트의 "
 "DDL 생성을 가능하게 만든다."
 
 #. Tag: para
-#: basic_mapping.xml:1371
-#, no-c-format
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
 "literal>): 이 프로퍼티에 대한 업데이트들이 optimistic 잠금을 획득하는 것을 필"
@@ -2641,73 +2711,73 @@
 "버전 증가가 발생할 경우인지를 결정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1379
-#, no-c-format
+#: basic_mapping.xml:1406
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (옵션 - 디폴트는 <literal>never</literal>): 이 "
 "프로퍼티 값이 데이터베이스에 의해 실제로 산출되는지를 지정한다. <xref "
 "linkend=\"mapping-generated\">산출되는 프로퍼티들</xref>에 대한 논의를 보라."
 
 #. Tag: para
-#: basic_mapping.xml:1388
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis>은 다음일 수 있다:"
 
 #. Tag: para
-#: basic_mapping.xml:1394
-#, no-c-format
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "Hibernate 기본 타입의 이름 (예를 들어. <literal>integer, string, character, "
 "date, timestamp, float, binary, serializable, object, blob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1400
-#, no-c-format
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "디폴트 기본 타입을 가진 Java 클래스의 이름(예를 들어. <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
 "literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1406
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "serializable Java 클래스의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1411
-#, no-c-format
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "맞춤 타입의 클래스 이름(예를 들어. <literal>com.illflow.type.MyCustomType</"
 "literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1417
-#, no-c-format
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "만일 당신이 타입을 지정하지 않을 경우, Hibernate는 정확한 Hibernate 타입을 추"
 "정하기 위해 명명된 프로퍼티에 대해 reflection을 사용할 것이다. Hibernate는 "
@@ -2718,14 +2788,14 @@
 "이를 구별하기 위해, 또는 맞춤 타입을 지정하기 위해.)"
 
 #. Tag: para
-#: basic_mapping.xml:1427
-#, no-c-format
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2738,14 +2808,13 @@
 "티 접근을 위한 당신 자신의 방도를 지정할 수도 있다."
 
 #. Tag: para
-#: basic_mapping.xml:1436
-#, no-c-format
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "특별히 강력한 특징은 파생된 플로퍼티들이다. 이들 프로퍼티들은 정의상 읽기 전"
 "용이고, 그 프로퍼티 값은 로드 시에 계산된다. 당신은 그 계산을 SQL 표현식으로 "
@@ -2753,7 +2822,7 @@
 "literal> 절 서브질의로 번역된다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1443
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2766,13 +2835,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1445
-#, no-c-format
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "당신은 특정 컬럼(주어진 예제에서는 <literal>customerId</literal>)에 대해 "
 "alias를 선언하지 않음으로써 엔티티들 자신의 테이블을 참조할 수 있음을 노트하"
@@ -2780,18 +2849,18 @@
 "<literal>&lt;formula&gt;</literal> 매핑 요소를 사용할 수 있음을 노트하라."
 
 #. Tag: title
-#: basic_mapping.xml:1455
-#, no-c-format
-msgid "many-to-one"
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1457
-#, no-c-format
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "또 다른 영속 클래스에 대한 정규 연관관계는 <literal>many-to-one</literal> 요"
@@ -2800,7 +2869,7 @@
 "다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1485
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2829,17 +2898,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1488 basic_mapping.xml:1669 basic_mapping.xml:1855
-#, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the name of the property."
 msgstr "<literal>name</literal>: 프로퍼티의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1493 basic_mapping.xml:2284
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2850,31 +2919,31 @@
 "된 <literal>&lt;column&gt;</literal> 요소(들)에 의해 지정될 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:1500 basic_mapping.xml:1674
-#, no-c-format
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "<literal>class</literal> (옵션 - 디폴트는 reflection에 의해 결정된 프로퍼티 "
 "타입): 연관된 클래스의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1506
-#, no-c-format
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade</literal> (옵션): 어느 오퍼레이션들이 부모 객체로부터 연관"
-"된 객체로 케스케이드 될 것인지를 지정한다."
+"<literal>cascade</literal> (옵션) 어느 오퍼레이션들이 부모 객체로부터 연관된 "
+"객체로 케스케이드 될 것인지를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1695
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>fetch</literal> (옵션 - 디폴트는 <literal>select</literal>): outer-"
@@ -2884,15 +2953,15 @@
 "join 페칭 또는 순차적인 select 페칭 중에서 선택하라."
 
 #. Tag: para
-#: basic_mapping.xml:1518
-#, no-c-format
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (옵션 - 디폴트는 <literal>true</literal>) "
 "매핑된 컬럼들이 SQL <literal>UPDATE</literal>와/또는 <literal>INSERT</"
@@ -2902,10 +2971,10 @@
 "연관관계 값을 허용한다."
 
 #. Tag: para
-#: basic_mapping.xml:1527
-#, no-c-format
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -2914,13 +2983,13 @@
 "다."
 
 #. Tag: para
-#: basic_mapping.xml:1540
-#, no-c-format
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal> (옵션): foreign-key 컬럼을 위한 유일 컨스트레인트"
 "의 DDL 생성을 가능하도록 해준다. 또한 이것이 property-ref의 대상이 되는 것을 "
@@ -2928,38 +2997,24 @@
 "일로 만든다."
 
 #. Tag: para
-#: basic_mapping.xml:1548
-#, no-c-format
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (옵션): foreign key 컬럼들을 위한 null 가능한 컨"
 "스트레인트의 DDL 생성을 가능하도록 해준다."
 
 #. Tag: para
-#: basic_mapping.xml:1554
-#, no-c-format
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
-"literal>): 이 프로퍼티에 대한 업데이트들이 optimistic lock의 획득을 필요로 하"
-"는지 아닌지 여부를 지정한다. 달리 말해 이 프로퍼티가 dirty일 때 version 증가"
-"가 발생해야 할 경우인지를 결정한다."
-
-#. Tag: para
-#: basic_mapping.xml:1562
-#, no-c-format
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>proxy</literal>): 디폴트"
@@ -2969,12 +3024,12 @@
 "는 그 연관이 항상 eagerly 페치될 것임을 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1572
-#, no-c-format
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (옵션 - 디폴트는 <literal>exception</literal>): "
@@ -2983,15 +3038,15 @@
 "것이다."
 
 #. Tag: para
-#: basic_mapping.xml:1579 basic_mapping.xml:1733
-#, no-c-format
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr "<literal>entity-name</literal> (옵션): 연관된 클래스의 엔티티 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1585
+#: basic_mapping.xml:1611
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -3001,20 +3056,20 @@
 "대한 값을 정의하는 SQL 표현식."
 
 #. Tag: para
-#: basic_mapping.xml:1592
-#, no-c-format
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "<literal>cascade</literal> 속성 값을 <literal>none</literal> 아닌 어떤 의미있"
 "는 다른 값으로 설정하는 것은 어떤 오퍼레이션들을 연관된 객체에게 보급할 것이"
@@ -3028,15 +3083,15 @@
 "과 one-to-one 연관)은 orphan delete를 지원하지 않음을 노트하라."
 
 #. Tag: para
-#: basic_mapping.xml:1605
-#, no-c-format
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 "일반적인 <literal>many-to-one</literal> 선언은 다음과 같이 간단하게 보여진다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1609
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -3044,16 +3099,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1611
-#, no-c-format
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "<literal>property-ref</literal> 속성은 오직 foreign key가 프라이머리 키가 아"
 "닌 연관된 테이블의 유일 키를 참조하는 리거시 데이터를 매핑하는데만 사용된다. "
@@ -3063,7 +3118,7 @@
 "제어한다.)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1620
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -3071,14 +3126,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1622
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr ""
 "그런 다음 <literal>OrderItem</literal>에 대한 매핑은 다음을 사용할 것이다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1626
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -3086,13 +3141,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1628
-#, no-c-format
-msgid "This is certainly not encouraged, however."
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "하지만 이것은 확실히 권장되지 않는다."
 
 #. Tag: para
-#: basic_mapping.xml:1632
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3104,17 +3159,17 @@
 "매핑할 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:1637
-#, no-c-format
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr ""
 "만일 참조된 유일키가 컴포넌트의 프로퍼티일 경우, 당신은 하나의 프로퍼티 경로"
 "를 지정할 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1641
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3122,13 +3177,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1646
-#, no-c-format
-msgid "one-to-one"
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "one-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1648
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3138,7 +3193,7 @@
 "literal> 요소를 사용하여 선언된다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1666
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3159,26 +3214,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1680
-#, no-c-format
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>cascade</literal> (옵션) 어느 오퍼레이션들이 부모 객체로부터 연관된 "
-"객체로 케스케이드 될 것인지를 지정한다."
-
-#. Tag: para
-#: basic_mapping.xml:1686
-#, no-c-format
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>constrained</literal> (옵션) 매핑된 테이블의 프라이머리 키에 대한 "
 "foreign 키 컨스트레인트가 연관된 클래스의 테이블을 참조하는지 여부를 지정한"
 "다. 이 옵션은 <literal>save()</literal>와 <literal>delete()</literal>가 케스"
@@ -3186,10 +3231,10 @@
 "(또한 스키마 내보내기 도구에 의해 사용된다)."
 
 #. Tag: para
-#: basic_mapping.xml:1701
-#, no-c-format
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3198,14 +3243,14 @@
 "리 키가 사용된다."
 
 #. Tag: para
-#: basic_mapping.xml:1714
-#, no-c-format
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>formula</literal> (옵션): 거의 모든 one to one 연관관계들은 소유하"
 "는 엔티티의 프라이머리 키로 매핑된다. 이것이 그 경우가 아닌 드문 경우들에서, "
@@ -3214,17 +3259,17 @@
 "라.)"
 
 #. Tag: para
-#: basic_mapping.xml:1722
-#, no-c-format
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>proxy</literal>): 디폴트로 "
 "한쪽 끝 연관들이 프락시 된다. <literal>lazy=\"no-proxy\"</literal>는 인스턴"
@@ -3235,32 +3280,31 @@
 "eager 페치시킬 것이다!</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1740
-#, no-c-format
-msgid "There are two varieties of one-to-one association:"
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "one-to-one 연관관계에는 두 가지 변종이 존재한다:"
 
 #. Tag: para
-#: basic_mapping.xml:1744
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "primary key associations"
 msgstr "프라이머리 키 연관관계들"
 
 #. Tag: para
-#: basic_mapping.xml:1747
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr "유일 foreign 키 연관관계들"
 
 #. Tag: para
-#: basic_mapping.xml:1752
-#, no-c-format
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "프라이머리 키 연관들은 특별한 테이블 컬럼을 필요로 하지 않는다; 만일 두 개의 "
 "행들이 그 연관에 의해 관계지워지면, 두 개의 테이블 행들은 동일한 프라이머리 "
@@ -3269,23 +3313,23 @@
 "야 한다!"
 
 #. Tag: para
-#: basic_mapping.xml:1759
-#, no-c-format
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "프라이머리 키 연관에 대해, 다음 매핑들을 <literal>Employee</literal>와 "
 "<literal>Person</literal> 각각에 추가하라."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1765
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3293,19 +3337,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1767
-#, no-c-format
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "이제 우리는 PERSON 과 EMPLOYEE 테이블들에서 관계지워진 행들의 프라이머리 키들"
 "이 동일함을 확실히 해야 한다! 우리는 <literal>foreign</literal>로 명명되는 특"
 "별한 Hibernate 식별자 생성 방도를 사용한다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1773
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3322,31 +3366,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1775
-#, no-c-format
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "그때 <literal>Person</literal>의 새로이 저장된 인스턴스는 그 "
 "<literal>Person</literal>의 <literal>employee</literal> 프로퍼티에 대해 참조"
 "된 <literal>Employee</literal> 인스턴스와 동일한 프라이머리 키를 할당받는다."
 
 #. Tag: para
-#: basic_mapping.xml:1781
-#, no-c-format
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "달리, <literal>Employee</literal>로부터 <literal>Person</literal>으로의 유일 "
 "컨스트레인트를 가진 하나의 foreign key는 다음과 같이 표현될 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1786
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3354,17 +3397,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1788
-#, no-c-format
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr ""
 "그리고 이 연관은 다음을 <literal>Person</literal> 매핑에 추가함으로써 양방향"
 "이 될 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1793
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3372,13 +3415,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1798
-#, no-c-format
-msgid "natural-id"
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr "natural-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1800
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3389,15 +3432,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1802
-#, no-c-format
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "비록 우리가 프라이머리 키들로서 대용키들을 사용하는 것을 권장했을지라도, 당신"
@@ -3409,10 +3452,10 @@
 "핑은 보다 자가 설명적이게 될 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:1811
-#, no-c-format
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3421,46 +3464,47 @@
 "력하게 권장한다."
 
 #. Tag: para
-#: basic_mapping.xml:1816
-#, no-c-format
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr ""
 "이 매핑은 natural 프라이머리 키들을 가진 엔티티들을 위한 용도로 고안된 것은 "
 "아니다."
 
 #. Tag: para
-#: basic_mapping.xml:1822
-#, no-c-format
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr ""
 "<literal>mutable</literal> (옵션, 디폴트는 <literal>false</literal>): 디폴트"
 "로, narutal 식별자 프로퍼티들은 변경될 수 없는 것(상수)으로 가정된다."
 
 #. Tag: title
-#: basic_mapping.xml:1832
-#, no-c-format
-msgid "component, dynamic-component"
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr "component, dynamic-component"
 
 #. Tag: para
-#: basic_mapping.xml:1834
-#, no-c-format
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr ""
 "<literal>&lt;component&gt;</literal> 요소는 자식 객체의 프로퍼티들을 부모 클"
 "래스에 대한 테이블의 컬럼들로 매핑시킨다. 컴포넌트들은 그것들 자신의 프로퍼티"
 "들, 컴포넌트들, 또는 콜렉션들을 선언한다. 이래 \"컴포넌트들\"을 보라."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1852
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3482,21 +3526,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1860
-#, no-c-format
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>class</literal> (옵션 - 디폴트는 reflection에 의해 결정된 프로퍼티 "
 "타입): 컴포넌트(자식) 클래스의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:1866 basic_mapping.xml:1955
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
 #, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>insert</literal>: 매핑된 컬럼들이 SQL <literal>INSERT</literal>들 속"
@@ -3506,11 +3550,11 @@
 "에 나타날 것인가?"
 
 #. Tag: para
-#: basic_mapping.xml:1872 basic_mapping.xml:1961
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
 #, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>update</literal>: 매핑된 컬럼들이 SQL <literal>UPDATE</literal>들 속"
@@ -3520,24 +3564,24 @@
 "에 나타날 것인가?"
 
 #. Tag: para
-#: basic_mapping.xml:1884
-#, no-c-format
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>false</literal>): 인스턴스 "
 "변수가 처음으로 액세스될 때 이 컴포넌트가 lazily(느리게) 페치되어야 하는지 여"
 "부를 지정한다 (빌드 시 바이트코드 수단을 필요로 한다)."
 
 #. Tag: para
-#: basic_mapping.xml:1891
-#, no-c-format
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
@@ -3546,18 +3590,18 @@
 "발생할 것인지 여부를 결정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1899 basic_mapping.xml:1975
-#, no-c-format
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "<literal>unique</literal> (옵션 - 디폴트는 <literal>false</literal>): 유일 컨"
 "스트레인트가 컴포넌트의 모든 매핑된 컬럼들에 대해 존재하는지 여부를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3567,7 +3611,7 @@
 "테이블 컬럼들로 매핑시킨다."
 
 #. Tag: para
-#: basic_mapping.xml:1913
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3579,32 +3623,33 @@
 "요소를 허용한다."
 
 #. Tag: para
-#: basic_mapping.xml:1919
-#, no-c-format
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr ""
 "<literal>&lt;dynamic-component&gt;</literal> 요소는 컴포넌트로서 매핑될"
 "<literal>Map</literal>을 허용한다. 여기서 프로퍼티 이름들은 map의 키들을 참조"
 "한다. <xref linkend=\"components-dynamic\"/>을 보라."
 
 #. Tag: title
-#: basic_mapping.xml:1928
-#, no-c-format
-msgid "properties"
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr "properties"
 
 #. Tag: para
-#: basic_mapping.xml:1930
-#, no-c-format
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "<literal>&lt;properties&gt;</literal> 요소는 클래스의 프로퍼티들의 명명된, 논"
 "리적 그룹핑에 대한 정의를 허용한다. 그 구조에 대한 가장 중요한 사용은 그것이 "
@@ -3613,7 +3658,7 @@
 "이다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1946
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3631,22 +3676,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1949
-#, no-c-format
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>name</literal>: 그룹핑의 논리적 이름 - 실제 프로퍼티 이름이 "
 "<emphasis>아니다</emphasis>."
 
 #. Tag: para
-#: basic_mapping.xml:1967
-#, no-c-format
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
@@ -3655,7 +3700,7 @@
 "생할 것인지 여부를 결정한다."
 
 #. Tag: para
-#: basic_mapping.xml:1984
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3665,11 +3710,12 @@
 "질 경우:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1988
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3681,17 +3727,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1990
-#, no-c-format
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "그 때 우리는 프라이머리 키가 아닌, <literal>Person</literal> 테이블의 이 유"
 "일 키를 참조하는 어떤 리거시 데이터 연관을 가질 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1995
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3703,35 +3749,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1997
-#, no-c-format
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr ""
 "우리는 리거시 데이터를 매핑시키는 컨텍스트 바깥에서 이런 종류의 것을 사용하"
 "는 것을 권장하지 않는다."
 
 #. Tag: title
-#: basic_mapping.xml:2005
-#, no-c-format
-msgid "subclass"
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr "subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2007
-#, no-c-format
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 "마지막으로, 다형성 영속성은 루트 영속 클래스에 대한 각각의 서브클래스 선언을 "
 "필요로 한다.(권장되는) table-per-class-hierarchy(테이블 당 클래스 계층구조) "
 "매핑 방도의 경우, <literal>&lt;subclass&gt;</literal> 선언이 사용된다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2020
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3751,10 +3797,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2023 basic_mapping.xml:2081 basic_mapping.xml:2144
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
 #, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>name</literal>: 서브클래스의 전체 수식어가 붙은 클래스 이름.\n"
@@ -3764,21 +3810,21 @@
 "<literal>name</literal>: 서브클래스의 전체 수식어가 붙은 클래스 명."
 
 #. Tag: para
-#: basic_mapping.xml:2028
-#, no-c-format
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>discriminator-value</literal> (옵션 - 디폴트는 클래스 이름): 개개의 "
 "서브클래스들을 구분짓는 값."
 
 #. Tag: para
-#: basic_mapping.xml:2034 basic_mapping.xml:2091 basic_mapping.xml:2154
+#: basic_mapping.xml:2061
 #, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>proxy</literal> (옵션): lazy 초기화 프락시들을 사용하는데 클래스 또"
@@ -3791,11 +3837,11 @@
 "스 또는 인터페이스를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:2040 basic_mapping.xml:2097 basic_mapping.xml:2160
+#: basic_mapping.xml:2067
 #, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>true</literal>): "
@@ -3809,14 +3855,14 @@
 "<literal>lazy=\"false\"</literal> 설정은 lazy 페칭을 사용불가능하게 만든다."
 
 #. Tag: para
-#: basic_mapping.xml:2048
-#, no-c-format
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "각각의 서브클래스는 그것 자신의 영속 프로퍼티들과 서브클래스들을 선언할 것이"
 "다. <literal>&lt;version&gt;</literal> 프로퍼티와 <literal>&lt;id&gt;</"
@@ -3825,34 +3871,34 @@
 "다. none이 지정될 경우, 전체 수식어가 붙은 자바 클래스 이름이 사용된다."
 
 #. Tag: para
-#: basic_mapping.xml:2056 basic_mapping.xml:2114 basic_mapping.xml:2172
-#, no-c-format
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
+#, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr "상속 매핑들에 대한 정보는 <xref linkend=\"inheritance\"/>을 보라."
 
 #. Tag: title
-#: basic_mapping.xml:2063
-#, no-c-format
-msgid "joined-subclass"
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "joined-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2065
-#, no-c-format
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "다른 방법으로 각각의 서브클래스는 그것 자신이 테이블로 매핑될 수 있다(table-"
 "per-subclass 매핑 방도). 상속된 상태는 슈퍼클래스의 테이블과 조인함으로써 검"
 "색된다. 우리는 <literal>&lt;joined-subclass&gt;</literal> 요소를 사용한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2078
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -3878,27 +3924,62 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2086 basic_mapping.xml:2149
-#, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr "<literal>table</literal>: 서브클래스 테이블의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:2105
-#, no-c-format
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (옵션): lazy 초기화 프락시들을 사용하는데 클래스 또"
+"는 인터페이스를 지정한다.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (옵션): 프락시들을 lazy 초기화 시키는데 사용할 클래"
+"스 또는 인터페이스를 지정한다.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (옵션): 프락시들을 lazy 초기화 시키는데 사용할 클래"
+"스 또는 인터페이스를 지정한다."
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (옵션 - 디폴트는 <literal>true</literal>): "
+"<literal>lazy=\"false\"</literal> 설정은 lazy 페칭의 사용을 불가능하게 만든"
+"다.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (옵션 - 디폴트는 <literal>true</literal>): "
+"<literal>lazy=\"false\"</literal> 설정은 lazy 페칭을 사용불가능하게 만든다\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (옵션 - 디폴트는 <literal>true</literal>): "
+"<literal>lazy=\"false\"</literal> 설정은 lazy 페칭을 사용불가능하게 만든다."
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "판별자(discriminator) 컬럼은 이 매핑 방도에 필요하지 않다. 하지만 각각의 서브"
 "클래스는 <literal>&lt;key&gt;</literal> 요소를 사용하여 객체 식별자를 보관하"
 "는 테이블 컬럼을 선언해야 한다. 이 장의 시작 부분에 있는 매핑은 다음과 같이 "
 "다시 작성될 것이다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2112
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3936,24 +4017,24 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2121
-#, no-c-format
-msgid "union-subclass"
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "union-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2123
-#, no-c-format
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "제3의 옵션은 상속 계층구조의 concrete 클래스들 만을 테이블들로 매핑하는 것이"
 "다 (table-per-concrete-class 방도). 여기서 각각의 테이블은 상속된 상태를 포함"
@@ -3965,7 +4046,7 @@
 "매핑을 사용할 필요가 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2141
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -3990,32 +4071,32 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2168
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
 msgstr "이 매핑 방도에는 판별자 컬럼이나 키 컬럼이 필요하지 않다."
 
 #. Tag: title
-#: basic_mapping.xml:2179
-#, no-c-format
-msgid "join"
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "join"
 
 #. Tag: para
-#: basic_mapping.xml:2181
-#, no-c-format
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "<literal>&lt;join&gt;</literal>요소를 사용하면, 테이블들 사이에 1대일 관계가 "
 "존재할 때, 하나의 클래스에 속한 프로퍼티들을 여러 테이블들로 매핑시키는 것이 "
 "가능하다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2195
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -4034,22 +4115,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2199
-#, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal>: 조인된 테이블의 이름."
 
 #. Tag: para
-#: basic_mapping.xml:2216
-#, no-c-format
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -4065,24 +4146,24 @@
 "<literal>&lt;join&gt;</literal>을 검색하는데 사용될 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:2229
-#, no-c-format
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (옵션 - 디폴트는 <literal>false</literal>): 이용 "
 "가능할 경우, Hibernate는 이 조인에 의해 정의된 프로퍼티들을 삽입시키거나 업데"
 "이트하려고 시도하지 않을 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:2236
-#, no-c-format
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optional</literal> (옵션 - 디폴트는 <literal>false</literal>): 이용 "
@@ -4091,17 +4172,17 @@
 "용할 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:2245
-#, no-c-format
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "예를 들어, (모든 프로퍼티들에 대해 value 타입 의미를 유지하면서) 개인의 주소 "
 "정보는 별도의 테이블에 매핑될 수 있다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2250
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -4119,10 +4200,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2252
-#, no-c-format
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4133,19 +4214,19 @@
 "는 것에 유용하다."
 
 #. Tag: title
-#: basic_mapping.xml:2262
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2264
-#, no-c-format
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "우리는 지금까지 몇 번 나타났던 <literal>&lt;key&gt;</literal> 요소를 보았다. "
 "그것은 부모 매핑 요소가 새로운 테이블에 대한 조인을 정의하는 어느 곳에서나 나"
@@ -4153,7 +4234,7 @@
 "프라이머리 키를 참조한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2280
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4167,11 +4248,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2291
-#, no-c-format
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (옵션 - 디폴트는 <literal>noaction</literal>): "
@@ -4179,60 +4260,60 @@
 "록 할 것인지 여부를 지정한다."
 
 #. Tag: para
-#: basic_mapping.xml:2298
-#, no-c-format
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (옵션): foreign key가 원래의 테이블의 프라이"
 "머리 키가 아닌 컬럼들을 참조함을 지정한다. (리거시 데이터에 제공됨.)"
 
 #. Tag: para
-#: basic_mapping.xml:2305
-#, no-c-format
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (옵션): foreign 키 컬럼들이 not null 임를 지정한"
 "다(이것은 foreign 키가 또한 프라이머리 키의 부분일 때마다 함축된다)."
 
 #. Tag: para
-#: basic_mapping.xml:2312
-#, no-c-format
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (옵션): foreign 키가 결코 업데이트되지 않아야 함을 "
 "지정한다(이것은 foreign 키가 또한 프라이머리 키의 부분일 때마다 함축된다)."
 
 #. Tag: para
-#: basic_mapping.xml:2319
-#, no-c-format
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (옵션): foreign 키가 유일 컨스트레인트를 가져야 함"
 "을 지정한다 (이것은 foreign 키가 또한 프라이머리 키의 부분일 때마다 함축된"
 "다)."
 
 #. Tag: para
-#: basic_mapping.xml:2327
-#, no-c-format
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "우리는 delete 퍼포먼스가 중요한 시스템들에 대해 권장하고, 모든 키들은 "
 "<literal>on-delete=\"cascade\"</literal>로 정의되고, Hibernate는 많은 "
@@ -4242,12 +4323,12 @@
 "있어라."
 
 #. Tag: para
-#: basic_mapping.xml:2335
-#, no-c-format
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4258,26 +4339,26 @@
 "emphasis>."
 
 #. Tag: title
-#: basic_mapping.xml:2345
-#, no-c-format
-msgid "column and formula elements"
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "column 요소와 formula 요소"
 
 #. Tag: para
-#: basic_mapping.xml:2346
-#, no-c-format
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "column 속성을 허용하는 임의의 매핑 요소는 대안적으로 하나의 <literal>&lt;"
 "column&gt;</literal> 서브요소를 수용할 것이다. 비슷하게 <literal>&lt;"
 "formula&gt;</literal>는 <literal>formula</literal> 속성에 대한 대안이다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2352
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4295,16 +4376,16 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2354
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2356
-#, no-c-format
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4313,7 +4394,7 @@
 "될 수 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2362
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4324,20 +4405,20 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2367
-#, no-c-format
-msgid "import"
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "import"
 
 #. Tag: para
-#: basic_mapping.xml:2369
-#, no-c-format
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "당신의 어플리케이션이 동일한 이름을 가진 두 개의 영속 클래스들을 갖고, 당신"
 "이 Hibernate 질의들 내에서 전체 수식어가 붙은 (패키지)이름을 지정하는 것을 원"
@@ -4346,13 +4427,13 @@
 "되지 않는 클래스들과 인터페이스들을 임포트 시킬 수(가져오기 할 수) 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2383
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4362,43 +4443,42 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2386
-#, no-c-format
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr ""
 "<literal>class</literal>: 임의의 Java 클래스의 전체 수식어가 붙은 클래스 이"
 "름."
 
 #. Tag: para
-#: basic_mapping.xml:2391
-#, no-c-format
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal> (옵션 - 디폴트는 수식어가 붙지 않은 클래스 이름): "
 "질의 언어 내에서 사용될 이름."
 
 #. Tag: title
-#: basic_mapping.xml:2402
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2404
-#, no-c-format
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "하나 이상의 프로퍼티 매핑 타입이 존재한다. <literal>&lt;any&gt;</literal> 매"
 "핑 요소는 여러 테이블들로부터 클래스들에 대한 하나의 다형성 연관관계를 정의한"
@@ -4410,11 +4490,11 @@
 "에서만 이것을 사용해야 한다."
 
 #. Tag: para
-#: basic_mapping.xml:2414
-#, no-c-format
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4425,7 +4505,7 @@
 "meta-type의 값들로부터 클래스 이름들로의 매핑을 지정해야 한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2421
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4438,7 +4518,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2432
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4459,29 +4539,29 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2435
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>: 프로퍼티 이름."
 
 #. Tag: para
-#: basic_mapping.xml:2440
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>: 식별자 타입."
 
 #. Tag: para
-#: basic_mapping.xml:2445
-#, no-c-format
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal> (옵션 - 디폴트는 <literal>string</literal>): "
 "discriminator 매핑에 허용되는 임의의 타입."
 
 #. Tag: para
-#: basic_mapping.xml:2451
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4491,12 +4571,12 @@
 "cascade 스타일."
 
 #. Tag: para
-#: basic_mapping.xml:2463
-#, no-c-format
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
@@ -4505,39 +4585,37 @@
 "할 것인지 여부를 정의한다."
 
 #. Tag: title
-#: basic_mapping.xml:2478
-#, no-c-format
-msgid "Hibernate Types"
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Hibernate 타입들"
 
 #. Tag: title
-#: basic_mapping.xml:2481
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr "엔티티들과 값들"
 
 #. Tag: para
-#: basic_mapping.xml:2483
+#: basic_mapping.xml:2510
 #, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"영속 서비스에 관한 여러 Java 언어-레벨의 객체들을 이해하기 위해, 우리는 그것"
-"들을 다음 두 개의 그룹들로 분류할 필요가 있다:"
 
 #. Tag: para
-#: basic_mapping.xml:2488
-#, no-c-format
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "<emphasis>entity</emphasis>는 엔티티에 대한 참조들을 보관하는 임의의 다른 객"
@@ -4550,16 +4628,16 @@
 "다. 그것들 또한 버전화 될 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:2499
-#, no-c-format
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4573,20 +4651,20 @@
 "의 엔티티들이나 콜렉션들에 의해 공유될 수 없다."
 
 #. Tag: para
-#: basic_mapping.xml:2510
-#, no-c-format
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "지금까지 우리는 엔티티들을 참조하기 위해 \"영속 클래스\"를 사용해 왔다. 우리"
 "는 그것을 계속 사용할 것이다. 하지만 엄격히 말해, 영속 상태를 가진 모든 사용"
@@ -4600,26 +4678,25 @@
 "composition이나 aggregation은 대개 value 타입으로 변환된다."
 
 #. Tag: para
-#: basic_mapping.xml:2524
-#, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr "우리는 문서를 통해 두 개념들을 다시 고찰할 것이다."
 
 #. Tag: para
-#: basic_mapping.xml:2528
-#, no-c-format
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "도점점은 Java type 시스템(과 엔티티들 및 value 타입들에 대한 개발자의 정의)"
 "를 SQL/데이터베이스 type 타입으로 매핑하는 것이다. 두 시스템들 사이의 다리는 "
@@ -4633,30 +4710,32 @@
 "현할 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:2541
-#, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr ""
 "콜렉션들을 제외한 모든 미리 빌드된 Hibernate 타입들은 null 의미를 지원한다."
 
 #. Tag: title
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr "기본 value 타입들"
 
 #. Tag: para
-#: basic_mapping.xml:2550
+#: basic_mapping.xml:2577
 #, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr ""
 "미리-만들어진 <emphasis>기본 매핑 타입들</emphasis>은 대략 다음과 같이 카테고"
 "리로 분류된다 <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2555
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4666,7 +4745,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2558
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4680,13 +4759,13 @@
 "<literal>java.lang.Boolean</literal>에 대한 모든 대체적인 인코딩들이다."
 
 #. Tag: literal
-#: basic_mapping.xml:2567
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2569
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4696,13 +4775,13 @@
 "Oracle <literal>VARCHAR2</literal>)로의 타입 매핑."
 
 #. Tag: literal
-#: basic_mapping.xml:2576
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2578
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4714,13 +4793,13 @@
 "literal> (또는 등가물)로의 타입 매핑들."
 
 #. Tag: literal
-#: basic_mapping.xml:2586
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2588
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4730,13 +4809,13 @@
 "literal>, <literal>DATE</literal> (또는 등가물)로의 타입 매핑들."
 
 #. Tag: literal
-#: basic_mapping.xml:2596
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2598
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4748,13 +4827,13 @@
 "literal>)로의 타입 매핑들."
 
 #. Tag: literal
-#: basic_mapping.xml:2606
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2608
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4772,13 +4851,13 @@
 "literal>로 매핑된다."
 
 #. Tag: literal
-#: basic_mapping.xml:2620
-#, fuzzy, no-c-format
-msgid "<literal>class</literal>"
-msgstr "<literal>all</literal>은 모든 컬럼들을 체크한다"
+#: basic_mapping.xml:2647
+#, no-c-format
+msgid "class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4790,25 +4869,25 @@
 "는 그것의 전체 수식어가 붙은 이름으로 매핑된다."
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "byte 배열들을 적절한 SQL binary 타입으로 매핑시킨다."
 
 #. Tag: literal
-#: basic_mapping.xml:2638
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2640
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4818,16 +4897,16 @@
 "타입으로 매핑시킨다"
 
 #. Tag: literal
-#: basic_mapping.xml:2647
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2649
-#, no-c-format
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4836,19 +4915,19 @@
 "을 가진 Hibernate 타입 <literal>serializable</literal>을 나타낼 수도 있다."
 
 #. Tag: literal
-#: basic_mapping.xml:2658
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2660
-#, no-c-format
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "<literal>java.sql.Clob</literal>와 <literal>java.sql.Blob</literal> JDBC 클래"
 "스들에 대한 타입 매핑들. 이들 타입들은 몇몇 어플리케이션들에서는 불편하다. 왜"
@@ -4856,7 +4935,7 @@
 "다가 드라이버 지원이 비일관적이고 페치되어야 한다)"
 
 #. Tag: literal
-#: basic_mapping.xml:2670
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -4866,16 +4945,16 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2674
-#, no-c-format
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "대개 가변적인 Java 타입들로 간주되는 것에 대한 타입 매핑들. 여기서 Hibernate"
 "는 불변적인 Java 타입들에 대해서만 적절한 어떤 최적화를 행하고, 어플리케이션 "
@@ -4886,19 +4965,20 @@
 "를 그 프로퍼티에 할당해야 한다."
 
 #. Tag: para
-#: basic_mapping.xml:2689
-#, no-c-format
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "엔트리들과 콜렉션들의 유일 식별자들은 <literal>binary</literal>, "
 "<literal>blob</literal> 그리고 <literal>clob</literal>를 제외한 기본 타입 중 "
 "어느 것일 수 있다. (Composite 식별자들이 또한 허용된다. 아래를 보라.)"
 
 #. Tag: para
-#: basic_mapping.xml:2695
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -4912,20 +4992,20 @@
 "다."
 
 #. Tag: title
-#: basic_mapping.xml:2704
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr "맞춤형 value 타입들"
 
 #. Tag: para
-#: basic_mapping.xml:2706
-#, no-c-format
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -4942,14 +5022,14 @@
 "literal>/ <literal>setName()</literal>를 가질 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:2717
-#, no-c-format
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "맞춤형 타입을 구현하려면, <literal>org.hibernate.UserType</literal> 또는 "
 "<literal>org.hibernate.CompositeUserType</literal>을 구현하고 그 타입의 전체 "
@@ -4957,7 +5037,7 @@
 "을 보려면 <literal>org.hibernate.test.DoubleStringType</literal>을 체크하라."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2725
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -4968,7 +5048,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2727
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -4978,7 +5058,7 @@
 "literal> 태그의 사용을 주목하라."
 
 #. Tag: para
-#: basic_mapping.xml:2732
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -4991,10 +5071,10 @@
 "literal> 인터페이스들은 더 많은 특화된 사용들을 위한 지원을 제공한다."
 
 #. Tag: para
-#: basic_mapping.xml:2738
-#, no-c-format
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -5007,7 +5087,7 @@
 "핑 파일들 속에 <literal>&lt;type&gt;</literal> 요소를 사용할 수 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2746
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -5018,7 +5098,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2748
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -5030,14 +5110,14 @@
 "검색할 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:2753
-#, no-c-format
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "만일 당신이 매우 자주 어떤 UserType을 사용할 경우, 그것은 그것에 대한 더 짧"
 "은 이름을 정의하는 것이 유용할 수 있다. <literal>&lt;typedef&gt;</literal> 요"
@@ -5046,7 +5126,7 @@
 "포함할 수도 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2760
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -5056,13 +5136,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2764
+#: basic_mapping.xml:2791
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -5072,18 +5152,17 @@
 "공된 파라미터들을 오버라이드 시키는 것이 가능하다."
 
 #. Tag: para
-#: basic_mapping.xml:2769
-#, no-c-format
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "비록 Hibernate의 풍부한 범위의 미리 만들어진 타입들과 컴포넌트들에 대한 지원"
 "이 당신이 가끔 맞춤형 타입을 사용할 <emphasis>필요가</emphasis> 거의 없을 것"
@@ -5096,19 +5175,19 @@
 "경들에 대해 장차 검증될 것이다."
 
 #. Tag: title
-#: basic_mapping.xml:2785
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "하나의 클래스를 한 번 이상 매핑하기"
 
 #. Tag: para
-#: basic_mapping.xml:2786
-#, no-c-format
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -5120,7 +5199,7 @@
 "으로 하여금 엔티티 이름을 지정하도록 한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2794
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -5143,30 +5222,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2796
-#, no-c-format
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "연관들은 이제 <literal>class</literal> 대신에 <literal>entity-name</literal>"
 "을 사용하여 어떻게 지정되는지를 주목하라."
 
 #. Tag: title
-#: basic_mapping.xml:2804
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL 인용부호 표시된 식별자들"
 
 #. Tag: para
-#: basic_mapping.xml:2805
-#, no-c-format
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "당신은 매핑 문서 내에서 테이블 또는 컬럼 이름을 역인용기호(`)들 속에 넣어서 "
 "생성된 SQL에서 식별자를 인용부호 처리하도록 Hibernate에게 강제할 수도 있다. "
@@ -5175,7 +5254,7 @@
 "MySQL의 경우에는 역인용부호(`))."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2812
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5187,36 +5266,36 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "Metadata 대안들"
 
 #. Tag: para
-#: basic_mapping.xml:2820
-#, no-c-format
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XML은 모든 사람들을 위한 것이 아니지만, Hibernate에서 O/R 매핑 메타데이터를 "
 "정의하는 몇몇 대안적인 방법들이 존재한다."
 
 #. Tag: title
-#: basic_mapping.xml:2825
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "XDoclet 마크업 사용하기"
 
 #. Tag: para
-#: basic_mapping.xml:2827
-#, no-c-format
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "많은 Hibernate 사용자들은 XDoclet <literal>@hibernate.tags</literal>를 사용하"
 "여 소스 코드 속에 직접 매핑 정보를 삽입시키는 것을 선호한다. 우리는 이 문서에"
@@ -5225,7 +5304,7 @@
 "literal> 클래스에 관한 다음 예제를 포함한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2834
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5335,30 +5414,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2836
-#, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr "XDoclet과 ibernate에 관한 추가 예제들은 Hibernate 웹 사이트를 보라."
 
 #. Tag: title
-#: basic_mapping.xml:2843
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "JDK 5.0 Annotations 사용하기"
 
 #. Tag: para
-#: basic_mapping.xml:2845
-#, no-c-format
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "JDK 5.0은 언어 레벨에서 XDoclet-스타일의 주석들, type-safe와 컴파일 시 체킹"
@@ -5372,13 +5451,13 @@
 "(JSR-220)과 Hibernate3 metadata 양자가 지원된다."
 
 #. Tag: para
-#: basic_mapping.xml:2856
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr "다음은 EJB 엔티티 빈으로서 주석이 붙은 POJO 클래스에 관한 예제이다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2860
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5406,34 +5485,33 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2862
-#, no-c-format
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "JDK 5.0 Annotations(그리고 JSR-220)에 대한 지원은 여전히 작업이 진행 중이고 "
 "완성되지 않았음을 노트하라. 상세한 것은 Hibernate Anotations를 참조하라."
 
 #. Tag: title
-#: basic_mapping.xml:2871
-#, no-c-format
-msgid "Generated Properties"
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "산출되는 프로퍼티들"
 
 #. Tag: para
-#: basic_mapping.xml:2872
-#, no-c-format
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "산출되는 프로퍼티들은 데이터베이스에 의해 산출되는 그것들의 값들을 갖는 프로"
 "퍼티들이다. 전형적으로, Hibernate 어플리케이션들은 데이터베이스가 값들을 생성"
@@ -5444,13 +5522,13 @@
 "로 직후에 산출되는 값들을 검색하기 위해 하나의 select 명령을 내린다."
 
 #. Tag: para
-#: basic_mapping.xml:2881
-#, no-c-format
+#: basic_mapping.xml:2911
+#, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "generated로 마크된 프로퍼티들은 부가적으로 inser 가능하지 않아야 하고 update "
@@ -5461,25 +5539,25 @@
 "단순 프로퍼티들</xref> 만이 generated로 마크될 수 있다."
 
 #. Tag: para
-#: basic_mapping.xml:2888
-#, no-c-format
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr ""
 "<literal>never</literal> (디폴트) - 는 주어진 프로퍼티 값이 데이터베이스 내"
 "에 생성되지 않을 것임을 의미한다."
 
 #. Tag: para
-#: basic_mapping.xml:2892
-#, no-c-format
+#: basic_mapping.xml:2922
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - 는 주어진 프로퍼티 값이 insert 시에 생성되지만, "
 "차후의 업데이트들에서 다시 생성되지 않을 것임을 기술한다. 생성-날짜와 같은 것"
@@ -5489,32 +5567,33 @@
 "라도, 이 옵션은 거기서 이용 불가능함을 노트하라..."
 
 #. Tag: para
-#: basic_mapping.xml:2900
-#, no-c-format
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr ""
 "<literal>always</literal> - 는 프로퍼티 값이 insert 시와 update 시 모두에 생"
 "성됨을 기술한다."
 
 #. Tag: title
-#: basic_mapping.xml:2907
-#, no-c-format
-msgid "Auxiliary Database Objects"
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "보조 데이터베이스 객체들"
 
 #. Tag: para
-#: basic_mapping.xml:2908
-#, no-c-format
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Hibernate 매핑 파일들 내에 사용자 스키마를 완전하게 정의하기 위한 능력을 제공"
 "하기 위해서, Hibernate의 스키마 방출 도구들과 함께 임의적인 데이터베이스 객체"
@@ -5525,17 +5604,17 @@
 "을 정의하는 두 가지 모드들이 본질적으로 존재한다..."
 
 #. Tag: para
-#: basic_mapping.xml:2917
-#, no-c-format
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr ""
 "첫 번째 모드는 매핑 파일 바깥에서 CREATE 및 DROP 명령들을 명시적으로 나열하"
 "는 것이다:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2921
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5548,19 +5627,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2922
-#, no-c-format
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "두번째 모드는 CREATE 및 DROP 명령들을 생성시키는 방법을 알고 있는 하나의 맞"
 "춤 클래스를 제공하는 것이다. 이 맞춤 클래스는 <literal>org.hibernate.mapping."
 "AuxiliaryDatabaseObject</literal> 인터페이스를 구현해야 한다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2927
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5572,32 +5651,64 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2928
-#, no-c-format
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr ""
 "덧붙여 이들 데이터베이스 객체들은 어떤 dialect들이 사용될 때 그것들이 단지 적"
 "용될 수 있도록 선택적으로 변동될 수 있다."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
-#~ msgid "class"
-#~ msgstr "class"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr "<literal>type</literal> (옵션): Hibernate 타입을 나타내는 이름."
 
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade</literal> (옵션): 어느 오퍼레이션들이 부모 객체로부터 연"
+#~ "관된 객체로 케스케이드 될 것인지를 지정한다."
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
+#~ "literal>): 이 프로퍼티에 대한 업데이트들이 optimistic lock의 획득을 필요"
+#~ "로 하는지 아닌지 여부를 지정한다. 달리 말해 이 프로퍼티가 dirty일 때 "
+#~ "version 증가가 발생해야 할 경우인지를 결정한다."
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "영속 서비스에 관한 여러 Java 언어-레벨의 객체들을 이해하기 위해, 우리는 그"
+#~ "것들을 다음 두 개의 그룹들로 분류할 필요가 있다:"
+
+#, fuzzy
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>all</literal>은 모든 컬럼들을 체크한다"
+
 #~ msgid "id"
 #~ msgstr "id"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: batch.xml:5
+#: batch.xml:29
 #, no-c-format
 msgid "Batch processing"
 msgstr "Batch 처리"
 
 #. Tag: para
-#: batch.xml:7
-#, no-c-format
+#: batch.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "Hibernate를 사용하여 데이터베이스 내에서 100 000 개의 행들을 삽입시키는 본래"
 "의 접근법은 다음과 같다:"
 
 #. Tag: programlisting
-#: batch.xml:12
+#: batch.xml:36
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -41,26 +41,26 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:14
-#, no-c-format
+#: batch.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "이것은 50 000번째 행 가까운 곳에서 <literal>OutOfMemoryException</literal>으"
 "로 떨어질 것이다. 그것은 Hibernate가 session-level 캐시 속에 모든 새로이 삽입"
 "된 <literal>Customer</literal> 인스턴스들을 캐시시키기 때문이다."
 
 #. Tag: para
-#: batch.xml:20
-#, no-c-format
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "이 장에서 우리는 이 문제를 피하는 방법을 당신에게 보여줄 것이다. 하지만 먼저 "
 "당신이 배치 처리를 행하는 중이라면, 당신이 적당한 퍼포먼스를 성취하려고 할 경"
@@ -68,40 +68,40 @@
 "치 사이즈를 적당한 숫자(10-50)로 설정하라:"
 
 #. Tag: programlisting
-#: batch.xml:27
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:29
-#, no-c-format
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "만일 당신이 <literal>identiy</literal> 식별자 생성자를 사용할 경우 Hibernate"
 "가 JDBC 레벨에서 투명하게 insert 배치작업을 사용불가능하게 한다는 점을 노트하"
 "라."
 
 #. Tag: para
-#: batch.xml:34
-#, no-c-format
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr ""
 "당신은 또한 second-level 캐시를 가진 상호작용이 완전하게 불가능한 프로세스 내"
 "에서 이런 종류의 작업을 행하고 싶어할 수도 있다:"
 
 #. Tag: programlisting
-#: batch.xml:39
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:41
+#: batch.xml:66
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -113,25 +113,25 @@
 "를 설정할 수 있기 때문이다."
 
 #. Tag: title
-#: batch.xml:47
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr "Batch inserts"
 
 #. Tag: para
-#: batch.xml:49
-#, no-c-format
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "새로운 객체들을 영속화 시킬 때, 당신은 first-level 캐시의 사이즈를 제어하기 "
 "위해 세션을 정기적으로 <literal>flush()</literal> 시키고 나서 <literal>clear"
 "()</literal> 시켜야 한다."
 
 #. Tag: programlisting
-#: batch.xml:55
+#: batch.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -152,25 +152,25 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:60
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr "Batch updates"
 
 #. Tag: para
-#: batch.xml:62
-#, no-c-format
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "데이터 검색과 업데이트의 경우 동일한 개념들이 적용된다. 게다가 당신은 많은 데"
 "이터 행들을 반환하는 질의들에 대해 서버-측 커서들의 장점을 취하는데 "
 "<literal>scroll()</literal>을 사용할 필요가 있다."
 
 #. Tag: programlisting
-#: batch.xml:68
+#: batch.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -195,28 +195,28 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:73
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr "StatelessSession 인터페이스"
 
 #. Tag: para
-#: batch.xml:74
-#, no-c-format
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "다른 방법으로 Hibernate는 분리된(detached) 객체들의 형식으로 데이터베이스로 "
 "그리고 데이터베이스로부터 데이터를 스트리밍하는데 사용될 수 있는 하나의 명령 "
@@ -233,7 +233,7 @@
 "(abstraction)이다."
 
 #. Tag: programlisting
-#: batch.xml:89
+#: batch.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -252,29 +252,28 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:91
-#, no-c-format
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr ""
 "이 코드 예제에서, 질의에 의해 반환된 <literal>Customer</literal> 인스턴스들"
 "은 곧바고 분리된다(detached). 그것들은 임의의 영속 컨텍스트와 결코 연관되지 "
 "않는다."
 
 #. Tag: para
-#: batch.xml:97
-#, no-c-format
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "<literal>StatelessSession</literal> 인터페이스에 의해 정의된 <literal>insert"
 "(), update()</literal> 그리고 <literal>delete()</literal> 연산들은 직접적인 "
@@ -285,24 +284,24 @@
 "들과는 매우 다른 의미들을 갖는다."
 
 #. Tag: title
-#: batch.xml:110
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr "DML-스타일 연산들"
 
 #. Tag: para
-#: batch.xml:112
-#, no-c-format
+#: batch.xml:137
+#, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr ""
 "이미 논의했듯이, 자동적이고 투명한 객체/관계형 매핑은 객체 상태에 대한 관리"
 "에 관계된다. 이것은 객체 상태가 메모리 내에서 이용 가능함을 의미하므로, (SQL "
@@ -314,31 +313,37 @@
 "실행을 위한 메소드들을 제공한다."
 
 #. Tag: para
-#: batch.xml:122
-#, no-c-format
+#: batch.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "<literal>UPDATE</literal>와 <literal>DELETE</literal> 문장들에 대한 유사 구문"
 "은 다음과 같다: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
 "where_conditions)?</literal>. 노트할 몇 가지:"
 
 #. Tag: para
-#: batch.xml:130
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "from-절에서, FROM 키워드는 옵션이다"
 
 #. Tag: para
-#: batch.xml:135
-#, no-c-format
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr ""
 "from-절 내에 한 개의 명명된 엔티티가 오직 존재할 수 있다; 그것은 선택적으로 "
 "alias될 수 있다. 만일 엔티티 이름이 alias되면, 그때 임의의 프로퍼티 참조들은 "
@@ -346,31 +351,31 @@
 "임의의 프로퍼티 참조들에 대해 수식되는 것은 규칙에 어긋난다."
 
 #. Tag: para
-#: batch.xml:143
-#, no-c-format
+#: batch.xml:170
+#, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "<xref linkend=\"queryhql-joins-forms\">join들</xref>은 (함축적이든 명시적이"
 "든) 대량 HQL 질의 속에 지정될 수 없다. 서브-질의들이 where-절에 사용될 수 있"
 "다; 서브질의들 그 자신들은 조인들을 포함할 수 있다."
 
 #. Tag: para
-#: batch.xml:150
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr "where-절 또한 옵션이다."
 
 #. Tag: para
-#: batch.xml:156
-#, no-c-format
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "하나의 예제로서, 한 개의 HQL <literal>UPDATE</literal>를 실행하기 위해, "
 "<literal>Query.executeUpdate()</literal> 메소드(이 메소드는 JDBC의 "
@@ -378,7 +383,7 @@
 "사용하라:"
 
 #. Tag: programlisting
-#: batch.xml:162
+#: batch.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -397,16 +402,16 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:164
-#, no-c-format
+#: batch.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -420,7 +425,7 @@
 "드 뒤에 <literal>VERSIONED</literal> 키워드를 추가시켜서 성취된다."
 
 #. Tag: programlisting
-#: batch.xml:174
+#: batch.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -436,19 +441,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:176
-#, no-c-format
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "맞춤형 version 타입들(<literal>org.hibernate.usertype.UserVersionType</"
 "literal>)은 <literal>update versioned</literal> 문장과 함께 사용하는 것이 허"
 "용되지 않음을 노트하라."
 
 #. Tag: para
-#: batch.xml:181
+#: batch.xml:208
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -458,7 +463,7 @@
 "executeUpdate()</literal>를 사용하라:"
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:213
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -474,19 +479,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
-#, no-c-format
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "<literal>Query.executeUpdate()</literal> 메소드에 의해 반환되는 "
 "<literal>int</literal> 값은 그 오퍼레이션에 의해 영향받은 엔티티들의 개수를 "
@@ -500,7 +505,7 @@
 "다."
 
 #. Tag: para
-#: batch.xml:199
+#: batch.xml:226
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -513,7 +518,7 @@
 "EntityName properties_list select_statement</literal>. 노트할 몇 가지:"
 
 #. Tag: para
-#: batch.xml:207
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -523,14 +528,14 @@
 "VALUES ... 형식은 지원되지 않는다."
 
 #. Tag: para
-#: batch.xml:210
-#, no-c-format
+#: batch.xml:237
+#, fuzzy, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 "properties_list는 SQL <literal>INSERT</literal> 내에서 <literal>column "
@@ -541,15 +546,15 @@
 "다형적이지 않다."
 
 #. Tag: para
-#: batch.xml:220
-#, no-c-format
+#: batch.xml:247
+#, fuzzy, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
@@ -566,22 +571,22 @@
 "literal>으로 정의된 프로퍼티 사이에 불일치 쟁점들을 일으킨다."
 
 #. Tag: para
-#: batch.xml:232
-#, no-c-format
+#: batch.xml:259
+#, fuzzy, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 "id 프로퍼티의 경우, insert 문장은 당신에게 두 개의 옵션을 준다. 당신은 "
 "properties_list 내에 id 프로퍼티를 명시적으로 지정할 수 있거나(그것의 값이 대"
@@ -597,15 +602,15 @@
 "에 사용될 수 없는 <literal>org.hibernate.id.TableHiLoGenerator</literal>이다."
 
 #. Tag: para
-#: batch.xml:247
-#, no-c-format
+#: batch.xml:274
+#, fuzzy, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 "<literal>version</literal> 또는 <literal>timestamp</literal>로서 매핑된 프로"
 "퍼티들의 경우에, insert 문장은 당신에게 두 개의 옵션들을 준다. 당신은 "
@@ -615,13 +620,15 @@
 "<literal>seed value</literal> 값이 사용되는 경우)."
 
 #. Tag: para
-#: batch.xml:257
-#, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+#: batch.xml:284
+#, fuzzy, no-c-format
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr "예제 HQL <literal>INSERT</literal> 문장 실행:"
 
 #. Tag: programlisting
-#: batch.xml:261
+#: batch.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: best_practices.xml:5
+#: best_practices.xml:29
 #, no-c-format
 msgid "Best Practices"
 msgstr "최상의 실전 경험들"
 
 #. Tag: term
-#: best_practices.xml:9
-#, no-c-format
+#: best_practices.xml:33
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "fine-grained 클래스들을 작성하고 <literal>&lt;component&gt;</literal>를 사용"
 "하여 그것들을 매핑하라."
 
 #. Tag: para
-#: best_practices.xml:11
+#: best_practices.xml:35
 #, no-c-format
 msgid ""
 "Use an <literal>Address</literal> class to encapsulate <literal>street</"
@@ -41,31 +41,31 @@
 "화 시킨다."
 
 #. Tag: term
-#: best_practices.xml:19
-#, no-c-format
-msgid "Declare identifier properties on persistent classes."
+#: best_practices.xml:43
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "영속 클래스들에 대해 식별자 프로퍼티들을 선언하라."
 
 #. Tag: para
-#: best_practices.xml:21
-#, no-c-format
+#: best_practices.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "Hibernate는 식별자 프로퍼티들을 옵션으로 만든다. 왜 우리가 그것들을 사용해야 "
 "하는가에 대한 모든 종류의 이유들이 존재한다. 우리는 식별자들이 '합성"
 "(synthetic)'이 되는(비지니스 의미 없이 생성되는) 것을 권장한다."
 
 #. Tag: term
-#: best_practices.xml:29
-#, no-c-format
-msgid "Identify natural keys."
+#: best_practices.xml:53
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "고유 키들을 식별하라."
 
 #. Tag: para
-#: best_practices.xml:31
+#: best_practices.xml:55
 #, no-c-format
 msgid ""
 "Identify natural keys for all entities, and map them using <literal>&lt;"
@@ -79,85 +79,85 @@
 "라."
 
 #. Tag: term
-#: best_practices.xml:39
-#, no-c-format
-msgid "Place each class mapping in its own file."
+#: best_practices.xml:63
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "각각의 클래스 매핑을 그것 자신의 파일 내에 위치지워라."
 
 #. Tag: para
-#: best_practices.xml:41
-#, no-c-format
+#: best_practices.xml:65
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "하나의 한덩어리 매핑 문서를 사용하지 말라. <literal>com/eg/Foo.hbm.xml</"
 "literal> 파일 속에 <literal>com.eg.Foo</literal>를 매핑하라. 이것은 팀 환경에"
 "서 특히 좋은 의미를 준다."
 
 #. Tag: term
-#: best_practices.xml:49
-#, no-c-format
-msgid "Load mappings as resources."
+#: best_practices.xml:73
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "매핑들을 리소스들로서 로드시켜라."
 
 #. Tag: para
-#: best_practices.xml:51
+#: best_practices.xml:75
 #, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr "그것들이 매핑하는 클래스들에 따라서 매핑들을 배치하라"
 
 #. Tag: term
-#: best_practices.xml:57
-#, no-c-format
-msgid "Consider externalising query strings."
+#: best_practices.xml:81
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "질의 문자열들을 객관화 시키는 것을 고려하라."
 
 #. Tag: para
-#: best_practices.xml:59
-#, no-c-format
+#: best_practices.xml:83
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "당신의 질의들이 ANSI 표준이 아닌 SQL 함수들을 호출하는 경우는 좋은 실전연습이"
 "다. 질의 문자열들을 매핑 파일들에다가 외부화 시키는 것은 어플리케이션을 보다 "
 "이식성 있도록 만들어줄 것이다."
 
 #. Tag: term
-#: best_practices.xml:67
+#: best_practices.xml:91
 #, no-c-format
 msgid "Use bind variables."
 msgstr "바인드 변수들을 사용하라."
 
 #. Tag: para
-#: best_practices.xml:69
-#, no-c-format
+#: best_practices.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "JDBC에서처럼, 상수 아닌 값들을 \"?\"로 대체시켜라. 질의 속에 상수 아닌 값을 "
 "바인드 시키는데 문자열 처리를 결코 사용하지 말라! 더 좋게는 질의들 속에 명명"
 "된 파라미터들을 사용하는 것을 고려하라."
 
 #. Tag: term
-#: best_practices.xml:77
-#, no-c-format
-msgid "Don't manage your own JDBC connections."
+#: best_practices.xml:101
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "당신 자신의 JDBC 커넥션들을 관리하지 말라."
 
 #. Tag: para
-#: best_practices.xml:79
-#, no-c-format
+#: best_practices.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "Hibernate는 어플리케이션으로 하여금 JDBC 커넥션들을 관리하도록 한다. 이 접근"
 "법은 마지막 수단으로서 고려되어야 한다. 만일 당신이 미리 만들어진 커넥션 프로"
@@ -166,20 +166,20 @@
 "라."
 
 #. Tag: term
-#: best_practices.xml:87
-#, no-c-format
-msgid "Consider using a custom type."
+#: best_practices.xml:111
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "맞춤형 타입 사용을 고려하라."
 
 #. Tag: para
-#: best_practices.xml:89
-#, no-c-format
+#: best_practices.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "당신이 자바 타입을 갖고 있고, 어떤 라이브러리로부터 말하고, 그것이 영속화 될 "
 "필요가 있지만 그것을 컴포넌트로서 매핑시키는데 필요한 accessor들을 제공할 필"
@@ -188,22 +188,22 @@
 "을 구현하는 것으로부터 어플리케이션 코드를 자유롭게 해준다."
 
 #. Tag: term
-#: best_practices.xml:98
-#, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+#: best_practices.xml:122
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "병목 지점들에서 수작업으로 코딩된 JDBC를 사용하라."
 
 #. Tag: para
-#: best_practices.xml:100
-#, no-c-format
+#: best_practices.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "시스템의 퍼포먼스가 중대한 영역들에서, 몇몇 종류의 오퍼레이션들은 직접적인 "
 "JDBC에서 이득을 본다. 그러나 당신이 어떤 것이 병목인지를 <emphasis>알기</"
@@ -214,19 +214,19 @@
 "히 사용할 수 있다"
 
 #. Tag: term
-#: best_practices.xml:110
-#, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+#: best_practices.xml:134
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "<literal>Session</literal> flushing을 이해하라."
 
 #. Tag: para
-#: best_practices.xml:112
-#, no-c-format
+#: best_practices.xml:136
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "시간이 지남에 따라 Session은 그것의 영속 상태를 데이터베이스와 동기화 시킨"
@@ -236,21 +236,21 @@
 "소화 시킬 수 있다."
 
 #. Tag: term
-#: best_practices.xml:121
-#, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+#: best_practices.xml:145
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr ""
 "3-tier 아키텍처에서, <literal>saveOrUpdate()</literal> 사용을 고려하라."
 
 #. Tag: para
-#: best_practices.xml:123
-#, no-c-format
+#: best_practices.xml:147
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "servlet / session 빈 아키텍처를 사용할 때, 당신은 sesson bean 내에 로드된 영"
 "속 객체들을 서블릿/JSP 계층으로/으로부터 전달할/받을 수 있다. 각각의 요청을 "
@@ -259,27 +259,27 @@
 "</literal>를 사용하라."
 
 #. Tag: term
-#: best_practices.xml:132
-#, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#: best_practices.xml:156
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr ""
 "2-tier 아키텍처에서, 수명이 긴 영속 컨텍스트들을 사용하는 것을 고려하라."
 
 #. Tag: para
-#: best_practices.xml:134
-#, no-c-format
+#: best_practices.xml:158
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "데이터베이스 트랜잭션들은 최상의 가용성을 위해 가능한 한 짧아야 한다. 하지만 "
@@ -295,20 +295,20 @@
 "이다."
 
 #. Tag: term
-#: best_practices.xml:148
-#, no-c-format
-msgid "Don't treat exceptions as recoverable."
+#: best_practices.xml:172
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "예외상황들을 복구가능한 것으로서 다루지 말라."
 
 #. Tag: para
-#: best_practices.xml:150
-#, no-c-format
+#: best_practices.xml:174
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -321,22 +321,22 @@
 "get()</literal> 또는 하나의 질의를 사용하라."
 
 #. Tag: term
-#: best_practices.xml:160
-#, no-c-format
-msgid "Prefer lazy fetching for associations."
+#: best_practices.xml:184
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "연관들에 대한 lazy 페칭을 선호하라."
 
 #. Tag: para
-#: best_practices.xml:162
-#, no-c-format
+#: best_practices.xml:186
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "eager 페칭을 관대하게 사용하라. second-level 캐시 내에 완전하게 보관되지 않"
 "을 것 같은 클래스들에 대한 대붑분의 연관들에 대해 프락시들과 lazy 콜렉션들을 "
@@ -346,19 +346,19 @@
 "절할 때, 하나의 <literal>left join fetch</literal>를 가진 질의를 사용하라."
 
 #. Tag: term
-#: best_practices.xml:172
-#, no-c-format
+#: best_practices.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "페치되지 않은 데이터 문제점들을 피하기 위해 <emphasis>뷰 내에 열려진 세션"
 "(open session in view)</emphasis> 패턴 또는 하나의 정리된 <emphasis>어셈블리 "
 "단계(assembly phase)</emphasis>를 사용하라."
 
 #. Tag: para
-#: best_practices.xml:177
-#, no-c-format
+#: best_practices.xml:201
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -366,12 +366,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernate는 개발자들이 <emphasis>Data Transfer Objects</emphasis> (DTO)를 지"
 "루하게 작성하는 것으로부터 자유롭게 해준다. 전통적인 EJB 아키텍처에서, DTO는 "
@@ -387,21 +387,21 @@
 "다."
 
 #. Tag: term
-#: best_practices.xml:191
-#, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+#: best_practices.xml:215
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "Hibernate에서 당신의 비지니스 로직을 추상화 시키는 것을 고려하라."
 
 #. Tag: para
-#: best_practices.xml:193
-#, no-c-format
+#: best_practices.xml:217
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "(Hibernate) 데이터 액세스 코드를 인터페이스 이면에 은폐시켜라. "
 "<emphasis>DAO</emphasis>와 <emphasis>Thread Local Session</emphasis> 패턴들"
@@ -411,21 +411,21 @@
 "을 가진 어플리케이션에 대해서는 적절하지 않다!)"
 
 #. Tag: term
-#: best_practices.xml:203
-#, no-c-format
-msgid "Don't use exotic association mappings."
+#: best_practices.xml:227
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "신종의 연관 매핑을 사용하지 말라."
 
 #. Tag: para
-#: best_practices.xml:205
-#, no-c-format
+#: best_practices.xml:229
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "실제의 many-to-many 연관들에 대한 좋은 쓰임새들은 드물다. 대부분의 시간 동안 "
 "당신은 \"연결 테이블\" 내에 저장된 추가적인 정보를 필요로 한다. 이 경우에, 매"
@@ -435,13 +435,13 @@
 "를 당신 스스로 질문하라."
 
 #. Tag: term
-#: best_practices.xml:215
-#, no-c-format
-msgid "Prefer bidirectional associations."
+#: best_practices.xml:239
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "양방향 연관들을 선호하라."
 
 #. Tag: para
-#: best_practices.xml:217
+#: best_practices.xml:241
 #, no-c-format
 msgid ""
 "Unidirectional associations are more difficult to query. In a large "

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: collection_mapping.xml:5
-#, no-c-format
-msgid "Collection Mapping"
-msgstr "콜렉션 매핑"
+#: collection_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Collection mapping"
+msgstr "콜렉션 매핑들"
 
 #. Tag: title
-#: collection_mapping.xml:8
+#: collection_mapping.xml:32
 #, no-c-format
 msgid "Persistent collections"
 msgstr "영속 콜렉션들"
 
 #. Tag: para
-#: collection_mapping.xml:10
-#, no-c-format
+#: collection_mapping.xml:34
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "예를 들어 Hibernate는 영속 콜렉션-값을 가진 필드들이 인터페이스 타입으로서 선"
 "언될 것을 필요로 한다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:15
+#: collection_mapping.xml:39
 #, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
@@ -48,15 +48,15 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:17
-#, no-c-format
+#: collection_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "실제 인터페이스는 <literal>java.util.Set</literal>, <literal>java.util."
 "Collection</literal>, <literal>java.util.List</literal>, <literal>java.util."
@@ -66,16 +66,16 @@
 "UserCollectionType</literal>에 대한 구현을 작성해야 함을 의미한다.)"
 
 #. Tag: para
-#: collection_mapping.xml:26
-#, no-c-format
+#: collection_mapping.xml:50
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "우리가 <literal>HashSet</literal>의 인스턴스를 가진 인스턴스 변수를 초기화 시"
 "켰던 방법을 주목하라. 이것은 새로이 초기화 된(비-영속) 인스턴스들을 가진 콜렉"
@@ -86,7 +86,7 @@
 "하라:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:36
+#: collection_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -101,13 +101,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:38
-#, no-c-format
+#: collection_mapping.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "Hibernate에 의해 도입된 영속 콜렉션들은 인터페이스 타입에 따라 "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
@@ -115,16 +115,16 @@
 "이 행위한다."
 
 #. Tag: para
-#: collection_mapping.xml:45
-#, no-c-format
+#: collection_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "콜렉션 인스턴스들은 value 타입들을 가진 통상의 특징을 갖는다. 그것들은 영속 "
@@ -136,12 +136,12 @@
 "Hibernate는 null 콜렉션 참조와 공백의 콜렉션 사이를 구별 짓지 않는다."
 
 #. Tag: para
-#: collection_mapping.xml:56
-#, no-c-format
+#: collection_mapping.xml:80
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "당신은 이것의 어떤 것에 대해 너무 많이 걱정하지 않아도 될 것이다. 당신이 통상"
 "의 자바 콜렉션들을 사용하는 것과 동일한 방법으로 영속 콜렉션들을 사용하라. 단"
@@ -149,25 +149,38 @@
 "됨)."
 
 #. Tag: title
-#: collection_mapping.xml:65
+#: collection_mapping.xml:89
 #, no-c-format
 msgid "Collection mappings"
 msgstr "콜렉션 매핑들"
 
 #. Tag: para
-#: collection_mapping.xml:67
-#, no-c-format
+#: collection_mapping.xml:92
+#, fuzzy, no-c-format
 msgid ""
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
+msgstr ""
+"많은 공통된 관계형 모형들을 다루는, 콜렉션들에 대해 생성될 수 있는 매핑들의 "
+"영역이 꽤 존재한다. 여러가지 매핑 선언들이 데이터베이스 테이블들로 변환되는 "
+"방법을 당신이 느끼려면 스키마 생성 도구로 실험할 것을 우리는 제안한다."
+
+#. Tag: para
+#: collection_mapping.xml:99
+#, fuzzy, no-c-format
+msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "콜렉션을 매핑하는데 사용되는 Hiberante 매핑 요소는 인터페이스의 타입에 의존한"
 "다. 예를 들어<literal>&lt;set&gt;</literal> 요소는 <literal>Set</literal> 타"
 "입의 매핑 프로퍼티들에 사용된다"
 
 #. Tag: programlisting
-#: collection_mapping.xml:73
+#: collection_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Product\">\n"
@@ -180,7 +193,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:75
+#: collection_mapping.xml:107
 #, no-c-format
 msgid ""
 "Apart from <literal>&lt;set&gt;</literal>, there is also <literal>&lt;"
@@ -195,7 +208,7 @@
 "요소들이 존재한다. <literal>&lt;map&gt;</literal> 요소가 대표적이다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:100
+#: collection_mapping.xml:132
 #, no-c-format
 msgid ""
 "<![CDATA[<map\n"
@@ -224,39 +237,40 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:103
-#, no-c-format
-msgid "<literal>name</literal> the collection property name"
+#: collection_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr "<literal>name</literal> 콜렉션 프로퍼티 이름"
 
 #. Tag: para
-#: collection_mapping.xml:108
-#, no-c-format
+#: collection_mapping.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (옵션 - 디폴트는 프로퍼티 이름) 콜렉션 테이블의 이름"
 "(one-to-many 연관관계들에 대해서는 사용되지 않음)"
 
 #. Tag: para
-#: collection_mapping.xml:114
-#, no-c-format
+#: collection_mapping.xml:146
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (옵션) 루트 요소 상에 선언된 스키마를 오버라이드 시"
 "키는 테이블 스키마의 이름"
 
 #. Tag: para
-#: collection_mapping.xml:120
-#, no-c-format
+#: collection_mapping.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (옵션 - 디폴트는 <literal>true</literal>)는 lazy 페칭"
 "을 사용 불가능하도록 하고 그 연관이 항상 eagerly 페치됨을 지정하는데 , 또는 "
@@ -264,66 +278,68 @@
 "용 가능하도록 하는데(매우 큰 콜렉션들에 적당함) 사용될 수 있다"
 
 #. Tag: para
-#: collection_mapping.xml:129
-#, no-c-format
+#: collection_mapping.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (옵션 - 디폴트는 <literal>false</literal>) 이 콜렉"
 "션을 양방향 연관관계의 \"inverse\" 끝(end)으로 표시한다"
 
 #. Tag: para
-#: collection_mapping.xml:135
-#, no-c-format
+#: collection_mapping.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (옵션 - 디폴트는 <literal>none</literal>) 오퍼레이"
 "션들이 자식 엔티티들에 대해 케스케이드하는 것을 이용 가능하게 한다"
 
 #. Tag: para
-#: collection_mapping.xml:141
-#, no-c-format
+#: collection_mapping.xml:173
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal> (옵션) <literal>natural</literal> 정렬 순서로 정렬된"
 "(sorted) 콜렉션 또는 주어진 comparator 클래스를 지정한다"
 
 #. Tag: para
-#: collection_mapping.xml:147
-#, no-c-format
+#: collection_mapping.xml:179
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (옵션, JDK1.4에서만) <literal>asc</literal> 또는 "
 "<literal>desc</literal> 옵션과 함께 <literal>Map</literal>, <literal>Set</"
 "literal> 또는 bag의 반복 순서를 정의하는 테이블 컬럼(또는 컬럼들)을 지정한다"
 
 #. Tag: para
-#: collection_mapping.xml:154
-#, no-c-format
+#: collection_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (옵션) 콜렉션을 검색하거나 제거할 때 사용될 임의적"
 "인 SQL <literal>WHERE</literal> 조건을 지정한다 (콜렉션이 오직 이용 가능한 데"
 "이터의 부분집합 만을 포함할 경우에 유용하다)"
 
 #. Tag: para
-#: collection_mapping.xml:161
-#, no-c-format
+#: collection_mapping.xml:193
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal> (옵션, 디폴트는 <literal>select</literal>) outer-"
@@ -331,34 +347,34 @@
 "선택하라."
 
 #. Tag: para
-#: collection_mapping.xml:168
-#, no-c-format
+#: collection_mapping.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (옵션, 디폴트는 <literal>1</literal>) 이 콜렉션"
 "의 lazily fetching 인스턴스에 대해 \"배치 사이즈\"를 지정하라."
 
 #. Tag: para
-#: collection_mapping.xml:174
-#, no-c-format
+#: collection_mapping.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal> (옵션 - 디폴트는 <literal>property</literal>): "
 "Hibernate가 콜렉션 프로퍼티 값에 접근하는데 사용할 방도."
 
 #. Tag: para
-#: collection_mapping.xml:180
-#, no-c-format
+#: collection_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>optimistic-lock</literal> (옵션 - 디폴트는 <literal>true</"
 "literal>): 콜렉션의 상태에 대한 변경들이 소유하는 엔티티의 버전의 증가로 귀결"
@@ -366,30 +382,31 @@
 "하는 것이 종종 합당하다.)"
 
 #. Tag: para
-#: collection_mapping.xml:188
-#, no-c-format
+#: collection_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable</literal> (옵션 - 디폴트는 <literal>true</literal>): "
 "<literal>false</literal> 값은 콜렉션의 요소들이 결코 변경되지 않음을 지정한"
 "다. (몇몇 경우들에서 마이너 퍼포먼스 최적화)."
 
 #. Tag: title
-#: collection_mapping.xml:198
+#: collection_mapping.xml:230
 #, no-c-format
 msgid "Collection foreign keys"
 msgstr "콜렉션 foreign 키들"
 
 #. Tag: para
-#: collection_mapping.xml:200
-#, no-c-format
+#: collection_mapping.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -399,12 +416,12 @@
 "<literal>&lt;key&gt;</literal> 요소에 의해 매핑된다."
 
 #. Tag: para
-#: collection_mapping.xml:208
-#, no-c-format
+#: collection_mapping.xml:240
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "foreign 키 컬럼에 대한 null 허용 가능 컨스트레인트가 존재할 수 있다. 대부분"
@@ -413,28 +430,28 @@
 "\"true\"</literal>를 지정할 필요가 있을 수 있다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:215
+#: collection_mapping.xml:247
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:217
-#, no-c-format
+#: collection_mapping.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 "foreign 키 컨스트레인트는 <literal>ON DELETE CASCADE</literal>를 사용할 수도 "
 "있다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:221
+#: collection_mapping.xml:253
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" on-delete=\"cascade\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:223
+#: collection_mapping.xml:255
 #, no-c-format
 msgid ""
 "See the previous chapter for a full definition of the <literal>&lt;key&gt;</"
@@ -442,22 +459,22 @@
 msgstr "<literal>&lt;key&gt;</literal> 요소에 대한 전체 정의는 앞 장을 보라."
 
 #. Tag: title
-#: collection_mapping.xml:231
+#: collection_mapping.xml:263
 #, no-c-format
 msgid "Collection elements"
 msgstr "콜렉션 요소들"
 
 #. Tag: para
-#: collection_mapping.xml:233
-#, no-c-format
+#: collection_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "콜렉션들은 모든 기본 타입들, 컴포넌트들, 그리고 물론 다른 엔티티들에 대한 참"
 "조들을 포함하여 거의 대부분의 어떤 다른 Hibernate 타입을 포함할 수도 있다. 이"
@@ -467,7 +484,7 @@
 "들 사이의 \"링크\" 만이 그 콜렉션에 의해 소유된 상태로 간주된다."
 
 #. Tag: para
-#: collection_mapping.xml:242
+#: collection_mapping.xml:274
 #, no-c-format
 msgid ""
 "The contained type is referred to as the <emphasis>collection element type</"
@@ -485,26 +502,26 @@
 "데 사용된다."
 
 #. Tag: title
-#: collection_mapping.xml:254
+#: collection_mapping.xml:286
 #, no-c-format
 msgid "Indexed collections"
 msgstr "인덱싱 된 콜렉션들"
 
 #. Tag: para
-#: collection_mapping.xml:256
-#, no-c-format
+#: collection_mapping.xml:288
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "set 과 bag 의미들을 가진 것들을 제외하면, 모든 콜렉션 매핑들은 콜렉션 테이블 "
 "내에 <emphasis>인덱스 컬럼</emphasis>- 배열 인덱스, 또는 <literal>List</"
@@ -518,7 +535,7 @@
 "(디폴트로 0에서 시작하는 번호가 붙여짐)."
 
 #. Tag: sect2
-#: collection_mapping.xml:267
+#: collection_mapping.xml:299
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -526,10 +543,10 @@
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -540,11 +557,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -554,24 +571,24 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:348
-#, no-c-format
+#: collection_mapping.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "만일 당신의 테이블이 인덱스 컬럼을 가지 않고, 당신이 여전히 프로퍼티 타입으로"
 "서 <literal>List</literal>를 사용하고자 원할 경우, 당신은 그 프로퍼티를 "
@@ -579,32 +596,19 @@
 "베이스로부터 검색될 때 그것은 그것의 순서를 보유하지 않지만, 그것은 선택적으"
 "로 정렬(sorting)되거나 ordering될 수도 있다."
 
-#. Tag: para
-#: collection_mapping.xml:357
-#, no-c-format
-msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
-msgstr ""
-"많은 공통된 관계형 모형들을 다루는, 콜렉션들에 대해 생성될 수 있는 매핑들의 "
-"영역이 꽤 존재한다. 여러가지 매핑 선언들이 데이터베이스 테이블들로 변환되는 "
-"방법을 당신이 느끼려면 스키마 생성 도구로 실험할 것을 우리는 제안한다."
-
 #. Tag: title
-#: collection_mapping.xml:364
+#: collection_mapping.xml:390
 #, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "값들을 가진 콜렉션들과 many-to-many 연관들"
 
 #. Tag: para
-#: collection_mapping.xml:366
-#, no-c-format
+#: collection_mapping.xml:392
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr ""
 "어떤 값들을 가진 콜렉션 또는 many-to-many 연관은 foreign 키 컬럼이나 컬럼들, "
@@ -612,17 +616,17 @@
 "들이나 컬럼들을 가진 전용 <emphasis>콜렉션 테이블</emphasis>을 필요로 한다."
 
 #. Tag: para
-#: collection_mapping.xml:373
-#, no-c-format
+#: collection_mapping.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr ""
 "값들을 가진 콜렉션의 경우, 우리는 <literal>&lt;element&gt;</literal> 태그를 "
 "사용한다."
 
 #. Tag: sect2
-#: collection_mapping.xml:375
+#: collection_mapping.xml:401
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"element1b\" coords=\"2 50\"/> <area "
@@ -638,11 +642,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -663,43 +667,49 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:480
+#: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
-msgstr "몇몇 예제들, 먼저 문자열들을 가진 set:"
+msgid "Here are some examples."
+msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:484
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -709,17 +719,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:486
-#, no-c-format
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "(<literal>order-by</literal> 속성에 의해 결정되는 반복 순서를 가진) 정수들을 "
 "포함하는 bag :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:491
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -731,13 +741,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:493
-#, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr "엔티티들을 가진 배열 - 이 경우에, many to many 연관 :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:497
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -750,13 +760,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:499
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "날짜들에 대한 문자열 인덱스들을 가진 map :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:503
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -770,13 +780,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:505
-#, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr "컴포넌트들의 리스트(다음 장에서 논의됨):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:509
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -792,51 +802,51 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:514
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr "One-to-many 연관들"
 
 #. Tag: para
-#: collection_mapping.xml:516
-#, no-c-format
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr ""
 "<emphasis>one to many 연관</emphasis>은 중재하는 콜렉션 테이블 없이 foreign "
 "키를 통해 두 개의 클래스들의 테이블들을 연결시킨다. 이 매핑은 통상의 자바 콜"
 "렉션들의 어떤 의미를 상실한다:"
 
 #. Tag: para
-#: collection_mapping.xml:524
-#, no-c-format
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr ""
 "포함된 엔티티 클래스의 인스턴스는 그 콜렉션의 하나 이상의 인스턴스에 속하지 "
 "않을 수 있다"
 
 #. Tag: para
-#: collection_mapping.xml:530
-#, no-c-format
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "포함된 엔티티 클래스의 인스턴스는 콜렉션 인덱스의 하나 이상의 값에서 나타나"
 "지 않을 수 있다"
 
 #. Tag: para
-#: collection_mapping.xml:537
-#, no-c-format
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr ""
 "<literal>Product</literal>로부터 <literal>Part</literal>로의 연관은 foreign "
 "키 컬럼과 <literal>Part</literal> 테이블에 대한 인덱스 컬럼의 존재를 필요로 "
@@ -844,7 +854,7 @@
 "을 나타낸다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:550
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -857,18 +867,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:553
-#, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+#: collection_mapping.xml:582
+#, fuzzy, no-c-format
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr "<literal>class</literal> (필수): 연관된 클래스의 이름."
 
 #. Tag: para
-#: collection_mapping.xml:558
-#, no-c-format
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (옵션 - 디폴트는 <literal>exception</literal>): "
@@ -876,10 +886,10 @@
 "<literal>ignore</literal>는 누락된 한 행을 한 개의 연관으로 다룰 것이다."
 
 #. Tag: para
-#: collection_mapping.xml:565
+#: collection_mapping.xml:594
 #, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -890,28 +900,27 @@
 "로서, 연관된 클래스의 엔티티 이름."
 
 #. Tag: para
-#: collection_mapping.xml:573
-#, no-c-format
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "<literal>&lt;one-to-many&gt;</literal> 요소는 어떤 컬럼들을 선언하는데 필요하"
 "지 않음을 주목하라. 어딘가에 <literal>table</literal> 이름을 지정하는 것도 필"
 "수적이지 않다."
 
 #. Tag: para
-#: collection_mapping.xml:579
-#, no-c-format
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>매우 중요한 노트</emphasis>: 만일 <literal>&lt;one-to-many&gt;</"
 "literal> 연관의 foreign 키 컬럼이 <literal>NOT NULL</literal>로 선언될 경우, "
@@ -921,19 +930,19 @@
 "들에 대한 논의는 이 장의 뒷부분을 보라."
 
 #. Tag: para
-#: collection_mapping.xml:588
-#, no-c-format
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "이 예제는 name으로 <literal>Part</literal> 엔티티들을 가진 map을 보여준다(여"
 "기서 <literal>partName</literal>은 <literal>Part</literal>의 영속 프로퍼티이"
 "다). formula-기반 index의 사용을 주목하라."
 
 #. Tag: programlisting
-#: collection_mapping.xml:594
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -945,19 +954,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:600
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "개선된 콜렉션 매핑들"
 
 #. Tag: title
-#: collection_mapping.xml:603
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr "Sorted 콜렉션들"
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -969,7 +978,7 @@
 "나의 comparator를 지정해야 한다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:610
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -987,7 +996,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:612
+#: collection_mapping.xml:643
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -999,7 +1008,7 @@
 "구현하는 클래스의 이름이다."
 
 #. Tag: para
-#: collection_mapping.xml:618
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -1009,15 +1018,15 @@
 "util.TreeMap</literal>처럼 행동한다."
 
 #. Tag: para
-#: collection_mapping.xml:623
-#, no-c-format
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "만일 당신이 데이터베이스 그 자체가 콜렉션 요소들을 순서지우도록(order)원할 경"
 "우 <literal>set</literal>, <literal>bag</literal> 또는<literal>map</literal> "
@@ -1027,7 +1036,7 @@
 "가 아닌, SQL 질의 내에서 순서지움(ordering)을 수행한다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:632
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1043,28 +1052,34 @@
 "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:634
-#, no-c-format
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "<literal>order-by</literal> 속성의 값은 HQL 순서지움(ordering)이 아니라 SQL "
 "순서지움(ordering)임을 노트하라!"
 
 #. Tag: para
-#: collection_mapping.xml:639
-#, no-c-format
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "연관들은 콜렉션 <literal>filter()</literal>를 사용하여 실행 시에 어떤 임의의 "
 "criteria(기준)을 사용하여 정렬(sort)될 수도 있다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:644
+#: collection_mapping.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1072,13 +1087,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:649
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "양방향 연관들"
 
 #. Tag: para
-#: collection_mapping.xml:651
+#: collection_mapping.xml:685
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1089,37 +1104,36 @@
 "을 허용한다. 두 가지 종류의 양방향 연관들이 지원된다: <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:658
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr "one-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:660
-#, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "한쪽 끝에 set 또는 bag 값을 갖고, 다른 쪽 긑에 단일 값을 가진 연관"
 
 #. Tag: term
-#: collection_mapping.xml:666
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr "many-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:668
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "양 끝에서 set 또는 bag 값을 가진 연관"
 
 #. Tag: para
-#: collection_mapping.xml:677
-#, no-c-format
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "당신은 동일한 두 개의 many-to-many 연관들을 동일한 데이터베이스 테이블로 간단"
 "하게 매핑하고 한 쪽 끝을 <emphasis>inverse</emphasis>(당신의 선택은 하나이지"
@@ -1127,17 +1141,18 @@
 "many 연관을 지정할 수도 있다."
 
 #. Tag: para
-#: collection_mapping.xml:684
-#, no-c-format
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "다음은 양방향 many-to-many 연관에 관한 예제이다; 각각의 카테고리는 많은 아이"
 "템들을 가질 수 있고 각각의 아이템은 많은 카테고리들 속에 있을 수 있다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:689
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1162,14 +1177,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:691
-#, no-c-format
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "연관의 inverse 끝(end)에 대해서만 행해진 변경들은 영속화 되지 <emphasis>않는"
 "다</emphasis>. 이것은 Hibernate가 모든 양방향 연관에 대해 메모리 내에 두 개"
@@ -1178,7 +1193,7 @@
 "many 관계를 생성시키는 방법에 대해 생각하면 이것은 이해하기가 더 쉽다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:699
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1193,7 +1208,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:701
+#: collection_mapping.xml:735
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1201,10 +1216,10 @@
 msgstr "non-inverse 측은 메모리 내 표상을 데이터베이스로 저장하는데 사용된다."
 
 #. Tag: para
-#: collection_mapping.xml:705
-#, no-c-format
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1213,7 +1228,7 @@
 "literal>로 선언함으로써 하나의 양방향 연관을 정의할 수도 있다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:711
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1236,31 +1251,31 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:713
-#, no-c-format
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "연관의 한쪽 끝을 <literal>inverse=\"true\"</literal>로 매핑하는 것은 cascade"
 "들을 가진 오퍼레이션에 영향을 주지 않으며, 이것들은 orthogonal(직교) 개념들이"
 "다!"
 
 #. Tag: title
-#: collection_mapping.xml:721
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "인덱싱된 콜렉션들을 가진 양방향 연관들"
 
 #. Tag: para
-#: collection_mapping.xml:722
-#, no-c-format
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "한쪽 끝이 하나의 <literal>&lt;list&gt;</literal> 또는 <literal>&lt;map&gt;</"
 "literal>으로서 표현되는 양방향 연관은 특별한 검토를 필요로 한다. 만일 인덱스 "
@@ -1269,7 +1284,7 @@
 "있다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:729
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1296,14 +1311,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
-#, no-c-format
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "그러나 만일 child 클래스 상에 그런 프로퍼티가 존재하지 않을 경우, 우리는 그 "
 "연관을 진정하게 양방향으로 간주할 수 없다 (다른 쪽 끝에서 이용가능하지 않은 "
@@ -1312,7 +1327,7 @@
 "핑을 사용할 수 있다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:738
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1340,34 +1355,33 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:740
-#, no-c-format
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "이 매핑에서 그 연관의 콜렉션 값을 가진 끝이 foreign 키에 대한 업데이트 책임"
 "이 있음을 노트하라."
 
 #. Tag: title
-#: collection_mapping.xml:748
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr "Ternary associations(세겹 연관들)"
 
 #. Tag: para
-#: collection_mapping.xml:750
-#, no-c-format
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "세 겹의 연관을 매핑하는 세 가지 가능한 접근법들이 존재한다. 하나의 접근법은 "
 "그것의 인덱스로서 연관관계를 가진 <literal>Map</literal>을 사용하는 것이다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1378,7 +1392,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:757
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1389,43 +1403,42 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:759
-#, no-c-format
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "두 번째 접근법은 그 연관을 엔티티 클래스로서 단순하게 리모델링 하는 것이다. "
 "이것은 우리가 가장 공통적으로 사용하는 접근법이다."
 
 #. Tag: para
-#: collection_mapping.xml:764
-#, no-c-format
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr ""
 "마지막 대안은 우리가 나중에 논의하게 될 composite 요소들을 사용하는 것이다."
 
 #. Tag: literal
-#: collection_mapping.xml:771
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "<literal>&lt;idbag&gt;</literal> 사용하기"
 
 #. Tag: para
-#: collection_mapping.xml:773
-#, no-c-format
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "만일 당신이 composite 키들이 나쁜 것이고 엔티티들이 합성 식별자들(대용 키들, "
 "surrogate keys)을 가져야 한다는 우리의 견해를 전적으로 수용할 경우, 당신은 우"
@@ -1438,18 +1451,18 @@
 "는 것을 당신에게 허용해주는 특징을 제공한다."
 
 #. Tag: para
-#: collection_mapping.xml:784
-#, no-c-format
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> 요소는 bag 의미를 가진 <literal>List</"
 "literal>(또는 <literal>Collection</literal>)을 매핑하도록 당신에게 허용해준"
 "다."
 
 #. Tag: programlisting
-#: collection_mapping.xml:789
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1462,13 +1475,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:791
-#, no-c-format
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "당신이 볼 수 있듯이, <literal>&lt;idbag&gt;</literal>은 마치 엔티티 클래스인"
 "양 synthetic id generator(합성 id 생성기)를 갖는다! 다른 대용 키는 각각의 콜"
@@ -1476,13 +1489,13 @@
 "즘을 제공하지 않는다."
 
 #. Tag: para
-#: collection_mapping.xml:798
-#, no-c-format
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal>의 업데이트 퍼포먼스는 정규 <literal>&lt;"
 "bag&gt;</literal> 보다 훨씬 좋다는 점을 노트하라! Hibernate는 마치 list, "
@@ -1490,7 +1503,7 @@
 "로 업데이트 하거나 삭제시킬 수 있다."
 
 #. Tag: para
-#: collection_mapping.xml:805
+#: collection_mapping.xml:837
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1501,21 +1514,26 @@
 "idbag&gt;</literal> 콜렉션 식별자들에 대해 지원되지 않는다."
 
 #. Tag: title
-#: collection_mapping.xml:829
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr "콜렉션 예제들"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "콜렉션 예제들"
+
+#. Tag: para
+#: collection_mapping.xml:867
 #, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
-msgstr "앞의 절들은 꽤 혼동스럽다. 따라서 예제를 살펴보자. 다음 클래스:"
+"The following class has a collection of <literal>Child</literal> instances:"
+msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:836
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1537,18 +1555,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:838
-#, no-c-format
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "는 <literal>Child</literal> 인스턴스들을 가진 하나의 콜렉션을 갖고 있다. 만"
 "일 각각의 자식이 최소한 한 개의 부모를 가질 경우, 대부분의 고유한 매핑은 one-"
 "to-many 연관이다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:844
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1574,13 +1592,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:846
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "이것은 다음 테이블 정의들로 매핑된다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:850
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1590,7 +1608,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:852
+#: collection_mapping.xml:887
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1600,7 +1618,7 @@
 "사용하라:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:857
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1628,13 +1646,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:859
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "<literal>NOT NULL</literal> 컨스트레인트를 주목하라:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:863
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1646,19 +1664,19 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:865
-#, no-c-format
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "대안적으로, 만일 당신이 이 연관관계가 단방향이어야 함을 절대적으로 역설할 경"
 "우, 당신은 <literal>&lt;key&gt;</literal> 매핑 상에 <literal>NOT NULL</"
 "literal> 컨스트레인트를 선언할 수 있다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:871
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1684,17 +1702,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:873
-#, no-c-format
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr ""
 "반면에, 만일 자식이 여러 부모들을 가질 수 있을 경우, many-to-many 연관이 적절"
 "하다:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:878
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1720,13 +1738,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:880
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr "테이블 정의들:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:884
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1741,26 +1759,35 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:886
-#, no-c-format
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "부모/자식 관계 매핑을 연습하는 더 많은 예제들과 전체 리허설은 <xref linkend="
 "\"example-parentchild\"/>를 보라."
 
 #. Tag: para
-#: collection_mapping.xml:891
-#, no-c-format
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr ""
 "비록 더 많은 신종 연관 매핑들이 가능할지라도, 우리는 다음 장에서 모든 가능성"
 "들을 분류할 것이다."
 
+#~ msgid "Collection Mapping"
+#~ msgstr "콜렉션 매핑"
+
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr "몇몇 예제들, 먼저 문자열들을 가진 set:"
+
 #~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr "앞의 절들은 꽤 혼동스럽다. 따라서 예제를 살펴보자. 다음 클래스:"
+
+#~ msgid ""
 #~ "<literal>column_name</literal> (required): The name of the column holding "
 #~ "the collection index values."
 #~ msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: component_mapping.xml:5
+#: component_mapping.xml:29
 #, no-c-format
 msgid "Component Mapping"
 msgstr "Component 매핑"
 
 #. Tag: para
-#: component_mapping.xml:7
-#, no-c-format
+#: component_mapping.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "<emphasis>component</emphasis>의 개념은 Hibernate에서 다른 용도로 몇몇 다른 "
 "컨텍스트들 내에서 재사용된다."
 
 #. Tag: title
-#: component_mapping.xml:13
+#: component_mapping.xml:37
 #, no-c-format
 msgid "Dependent objects"
 msgstr "종속 객체들"
 
 #. Tag: para
-#: component_mapping.xml:15
-#, no-c-format
+#: component_mapping.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "하나의 컴포넌트는 엔티티 참조가 아닌, value 타입으로서 영속화 되는 하나의 포"
 "함된 객체이다. \"컴포넌트\" 용어는 (아키텍처 수준의 컴포넌트들이 아닌) "
@@ -47,7 +47,7 @@
 "은 다음과 같이 개인을 모형화 시킬 수도 있다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:21
+#: component_mapping.xml:45
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:23
+#: component_mapping.xml:47
 #, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
@@ -107,13 +107,13 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:25
-#, no-c-format
+#: component_mapping.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "이제 <literal>Name</literal>은 <literal>Person</literal>의 컴포넌트로서 영속"
 "화 될 수도 있다. <literal>Name</literal>이 그것의 영속 프로퍼티들에 대한 "
@@ -121,13 +121,13 @@
 "퍼티들을 선언하는 것을 필요로 하지 않음을 주목하라."
 
 #. Tag: para
-#: component_mapping.xml:32
-#, no-c-format
-msgid "Our Hibernate mapping would look like:"
+#: component_mapping.xml:56
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "우리의 Hibernate 매핑은 다음과 같을 것이다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:36
+#: component_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -145,7 +145,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:38
+#: component_mapping.xml:62
 #, no-c-format
 msgid ""
 "The person table would have the columns <literal>pid</literal>, "
@@ -157,16 +157,16 @@
 "literal> 컬럼들을 가질 것이다."
 
 #. Tag: para
-#: component_mapping.xml:46
-#, no-c-format
+#: component_mapping.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "모든 값(value) 타입들처럼, 컴포넌트들은 공유된 참조들을 지원하지 않는다. 달"
 "리 말해, 두 명의 개인들은 동일한 이름을 가질 수 있지만, 두 개의 person 객체들"
@@ -176,13 +176,13 @@
 "체 컴포넌트가 null이라고 가정할 것이다. 이것은 대부분의 용도에 맞을 것이다."
 
 #. Tag: para
-#: component_mapping.xml:55
-#, no-c-format
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "컴포넌트의 프로퍼티들은 임의의 Hibernate 타입일 수 있다(콜렉션들, many-to-"
 "one 연관들, 다른 컴포넌트들, 기타). 내포된 컴포넌트들은 신종의 사용례로 간주"
@@ -190,7 +190,7 @@
 "을 지원하도록 고안되어있다."
 
 #. Tag: para
-#: component_mapping.xml:62
+#: component_mapping.xml:85
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -202,7 +202,7 @@
 "서브요소를 허용한다."
 
 #. Tag: programlisting
-#: component_mapping.xml:68
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -221,19 +221,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:73
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "종속 객체들을 가진 콜렉션들"
 
 #. Tag: para
-#: component_mapping.xml:75
-#, no-c-format
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "컴포넌트들을 가진 콜렉션들이 지원된다(예를 들면 <literal>Name</literal> 타입"
 "을 가진 배열). <literal>&lt;element&gt;</literal> 태그를 <literal>&lt;"
@@ -241,7 +241,7 @@
 "언하라."
 
 #. Tag: programlisting
-#: component_mapping.xml:82
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -255,29 +255,28 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:84
-#, no-c-format
+#: component_mapping.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "노트: 만일 당신이 composite 요소를 가진 하나의 <literal>Set</literal>를 정의"
 "할 경우, <literal>equals()</literal>와 <literal>hashCode()</literal>를 정확하"
 "게 구현하는 것이 매우 중요하다."
 
 #. Tag: para
-#: component_mapping.xml:90
-#, no-c-format
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "Composite 요소들은 컴포넌트들을 포함하지만 콜렉션들을 포함하지 않는다. 만일 "
 "당신의 composite 요소 자체가 컴포넌트들을 포함할 경우, <literal>&lt;nested-"
@@ -288,17 +287,16 @@
 "들이 동일할지라도, 관계형 모형과 영속화 의미들은 여전히 약간 다르다."
 
 #. Tag: para
-#: component_mapping.xml:102
-#, no-c-format
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "당신이 하나의 <literal>&lt;set&gt;</literal>을 사용 중이라면, 하나의 "
 "composite 요소 매핑은 null 가능한 프로퍼티들을 지원하지 않음을 노트하길 바란"
@@ -311,14 +309,14 @@
 "야 한다."
 
 #. Tag: para
-#: component_mapping.xml:113
-#, no-c-format
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -331,7 +329,7 @@
 "티들이다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:123
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -350,14 +348,14 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:125
-#, no-c-format
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "물론, 양방향 연관 네비게이션의 경우, 다른 측 상에 있는 purchase에 대한 참조"
 "가 존재할 수 없다. 컴포넌트들이 값(value) 타입들이고 공유된 참조들을 허용하"
@@ -366,13 +364,13 @@
 "literal>에 의해 참조될 수 없다."
 
 #. Tag: para
-#: component_mapping.xml:133
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "심지어 세겹의(또는 네 겹의, 기타) 연관들이 가능하다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:135
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -388,27 +386,27 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
-#, no-c-format
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr ""
 "composite 요소들은 다른 엔티티들에 대한 연관들과 동일한 구문을 사용하여 질의"
 "들 내에 나타날 수도 있다."
 
 #. Tag: title
-#: component_mapping.xml:145
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "Map 인덱스들로서 컴포넌트들"
 
 #. Tag: para
-#: component_mapping.xml:147
-#, no-c-format
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -418,64 +416,70 @@
 "literal>를 정확하게 오버라이드 시키도록 하라."
 
 #. Tag: title
-#: component_mapping.xml:156
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr "composite 식별자들로서 컴포넌트들"
 
 #. Tag: para
-#: component_mapping.xml:158
-#, no-c-format
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "당신은 하나의 컴포넌트를 하나의 엔티티 클래스에 대한 하나의 식별자로서 사용"
 "할 수도 있다. 당신의 컴포넌트 클래스는 어떤 사양들을 충족시켜야 한다:"
 
 #. Tag: para
-#: component_mapping.xml:165
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "그것은 <literal>java.io.Serializable</literal>을 구현해야 한다."
 
 #. Tag: para
-#: component_mapping.xml:170
-#, no-c-format
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "그것은 composite 키 등가(equality)에 대한 데이터베이스 개념과 일치되게, "
 "<literal>equals()</literal>와 <literal>hashCode()</literal>를 다시 구현해야 "
 "한다."
 
-#. Tag: emphasis
-#: component_mapping.xml:179
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "노트: Hibernate3에서, 두 번째 사양은 Hibernate의 절대적으로 엄격한 사양이 아"
 "니다. 그러나 아무튼 그것을 행하라."
 
 #. Tag: para
-#: component_mapping.xml:183
-#, no-c-format
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "당신은 compsite 키들을 생성시키는데 <literal>IdentifierGenerator</literal>를 "
 "사용할 수 없다. 대신에 어플리케이션은 그것 자신의 식별자들을 할당해야 한다."
 
 #. Tag: para
-#: component_mapping.xml:188
-#, no-c-format
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -487,36 +491,36 @@
 "를 갖는다."
 
 #. Tag: programlisting
-#: component_mapping.xml:196
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:198
-#, no-c-format
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "이제 <literal>OrderLine</literal> 테이블을 참조하는 임의의 foreign 키들이 또"
 "한 compsite이다. 당신은 다른 클래스들에 대한 당신의 매핑들 속에 이것을 선언해"
@@ -524,7 +528,7 @@
 "될 것이다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:204
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -536,17 +540,17 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:206
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(<literal>&lt;column&gt;</literal> 태그가 모든 곳에서 <literal>column</"
-"literal> 속성에 대한 대안임을 노트하라.)"
 
 #. Tag: para
-#: component_mapping.xml:211
+#: component_mapping.xml:244
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -556,7 +560,7 @@
 "한 composite foreign 키를 사용한다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:216
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -570,7 +574,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:218
+#: component_mapping.xml:251
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -580,7 +584,7 @@
 "될 것이다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:223
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -593,17 +597,15 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:225
-#, no-c-format
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 "(통상적으로 <literal>&lt;one-to-many&gt;</literal> 요소는 컬럼들을 선언하지 "
 "않는다.)"
 
 #. Tag: para
-#: component_mapping.xml:229
+#: component_mapping.xml:262
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -613,7 +615,7 @@
 "또한 하나의 composite foreign 키를 갖는다."
 
 #. Tag: programlisting
-#: component_mapping.xml:234
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -634,19 +636,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:239
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr "동적인 컴포넌트들"
 
 #. Tag: para
-#: component_mapping.xml:241
-#, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr "당신은 <literal>Map</literal> 타입의 프로퍼티를 매핑시킬 수도 있다:"
 
 #. Tag: programlisting
-#: component_mapping.xml:245
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -657,16 +659,16 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:247
-#, no-c-format
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "<literal>&lt;dynamic-component&gt;</literal> 매핑의 의미는 <literal>&lt;"
 "component&gt;</literal>와 동일하다. 이런 종류의 매핑의 장점은 배치 시에 단지 "
@@ -674,3 +676,10 @@
 "핑 문서에 대한 런타임 처리는 또한 DOM 파서를 사용하여 가능하다. 더 좋게는 당"
 "신이 <literal>Configuration</literal> 객체를 통해 Hibernate의 구성-시 메타모"
 "형에 접근할 수 있다(그리고 변경시킬 수 있다)"
+
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(<literal>&lt;column&gt;</literal> 태그가 모든 곳에서 <literal>column</"
+#~ "literal> 속성에 대한 대안임을 노트하라.)"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: configuration.xml:5
+#: configuration.xml:29
 #, no-c-format
 msgid "Configuration"
 msgstr "구성"
 
 #. Tag: para
-#: configuration.xml:7
-#, no-c-format
+#: configuration.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "Hibernate가 많은 다른 환경들에서 동작하도록 설계되어 있으므로, 많은 개수의 구"
 "성 파라미터들이 존재한다. 다행히 대부분은 유의미한 디폴트 값들이고 Hibernate"
@@ -34,20 +34,20 @@
 "classpath 경로 속에 그 파일을 집어넣고 그것을 커스트마이징하기만 해야 한다."
 
 #. Tag: title
-#: configuration.xml:16
+#: configuration.xml:40
 #, no-c-format
 msgid "Programmatic configuration"
 msgstr "프로그램 상의 구성"
 
 #. Tag: para
-#: configuration.xml:18
-#, no-c-format
+#: configuration.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"An instance of <literal>org.hibernate.cfg.Configuration</literal> represents "
-"an entire set of mappings of an application's Java types to an SQL database. "
-"The <literal>Configuration</literal> is used to build an (immutable) "
-"<literal>SessionFactory</literal>. The mappings are compiled from various "
-"XML mapping files."
+"An instance of <classname>org.hibernate.cfg.Configuration</classname> "
+"represents an entire set of mappings of an application's Java types to an "
+"SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
+"interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "<literal>org.hibernate.cfg.Configuration</literal>의 인스턴스는 어플리케이션"
 "의 Java 타입들을 SQL 데이터베이스 타입으로의 전체 매핑 집합을 표현한다. "
@@ -55,12 +55,13 @@
 "를 빌드하는데 사용된다. 매핑들은 여러 XML 매핑 파일들로부터 컴파일 된다."
 
 #. Tag: para
-#: configuration.xml:26
-#, no-c-format
+#: configuration.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"You may obtain a <literal>Configuration</literal> instance by instantiating "
-"it directly and specifying XML mapping documents. If the mapping files are "
-"in the classpath, use <literal>addResource()</literal>:"
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"instance by instantiating it directly and specifying XML mapping documents. "
+"If the mapping files are in the classpath, use <literal>addResource()</"
+"literal>. For example:"
 msgstr ""
 "당신은 <literal>Configuration</literal> 인스턴스를 초기화 시키고 XML 매핑 문"
 "서들을 지정함으로써 <literal>Configuration</literal> 인스턴스를 얻을 수 있"
@@ -68,7 +69,7 @@
 "literal>를 사용하라:"
 
 #. Tag: programlisting
-#: configuration.xml:32
+#: configuration.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -77,17 +78,17 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:34
-#, no-c-format
+#: configuration.xml:57
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "(때때로 더 나은) 다른 방법은 매핑된 클래스를 지정하는 것이고, Hibernate로 하"
 "여금 당신을 위해 매핑 문서를 찾도록 하라:"
 
 #. Tag: programlisting
-#: configuration.xml:39
+#: configuration.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -96,12 +97,12 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:41
-#, no-c-format
+#: configuration.xml:64
+#, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <literal>/org/hibernate/"
-"auction/Item.hbm.xml</literal> and <literal>/org/hibernate/auction/Bid.hbm."
-"xml</literal> in the classpath. This approach eliminates any hardcoded "
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
+"auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
+"xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
 msgstr ""
 "그때 Hibernate는 classpath 내에서 <literal>/org/hibernate/auction/Item.hbm."
@@ -110,17 +111,17 @@
 "제거한다."
 
 #. Tag: para
-#: configuration.xml:48
-#, no-c-format
+#: configuration.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Configuration</literal> also allows you to specify configuration "
-"properties:"
+"A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
+"specify configuration properties. For example:"
 msgstr ""
 "<literal>Configuration</literal>은 또한 구성 프로퍼티들을 지정하는 것을 허용"
 "해준다:"
 
 #. Tag: programlisting
-#: configuration.xml:53
+#: configuration.xml:75
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -134,37 +135,37 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:55
-#, no-c-format
+#: configuration.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr ""
 "이것은 컨피그레이션 프로퍼티들을 Hibernate에 전달하는 유일한 방법이 아니다. "
 "여러 가지 옵션들은 다음을 포함한다:"
 
 #. Tag: para
-#: configuration.xml:62
-#, no-c-format
+#: configuration.xml:84
+#, fuzzy, no-c-format
 msgid ""
-"Pass an instance of <literal>java.util.Properties</literal> to "
+"Pass an instance of <classname>java.util.Properties</classname> to "
 "<literal>Configuration.setProperties()</literal>."
 msgstr ""
 "<literal>java.util.Properties</literal>의 인스턴스를 <literal>Configuration."
 "setProperties()</literal>에 전달한다 ."
 
 #. Tag: para
-#: configuration.xml:68
-#, no-c-format
+#: configuration.xml:90
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>hibernate.properties</literal> in a root directory of the "
-"classpath."
+"Place a file named <filename>hibernate.properties</filename> in a root "
+"directory of the classpath."
 msgstr ""
 "classpath의 루트 디렉토리에 <literal>hibernate.properties</literal>를 위치지"
 "운다."
 
 #. Tag: para
-#: configuration.xml:74
+#: configuration.xml:95
 #, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
@@ -174,114 +175,116 @@
 "literal> 프로퍼티들을 설정한다."
 
 #. Tag: para
-#: configuration.xml:80
-#, no-c-format
+#: configuration.xml:100
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "<literal>hibernate.cfg.xml</literal>에 <literal>&lt;property&gt;</literal> 요"
 "소들을 포함한다 (나중에 논의됨)."
 
 #. Tag: para
-#: configuration.xml:87
+#: configuration.xml:107
 #, no-c-format
 msgid ""
-"<literal>hibernate.properties</literal> is the easiest approach if you want "
-"to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
-"당신이 빠르게 시작하고 원할 경우 <literal>hibernate.properties</literal>는 가"
-"장 쉬운 접근법이다."
 
 #. Tag: para
-#: configuration.xml:92
-#, no-c-format
+#: configuration.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Configuration</literal> is intended as a startup-time object, "
-"to be discarded once a <literal>SessionFactory</literal> is created."
+"The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
+"startup-time object that will be discarded once a <literal>SessionFactory</"
+"literal> is created."
 msgstr ""
 "<literal>Configuration</literal>은 시작 시(startup-time) 객체로서 일단 "
 "<literal>SessionFactory</literal>가 생성되면 폐기되게끔 예정되어 있다."
 
 #. Tag: title
-#: configuration.xml:100
+#: configuration.xml:119
 #, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "SessionFactory 얻기"
 
 #. Tag: para
-#: configuration.xml:102
-#, no-c-format
+#: configuration.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"When all mappings have been parsed by the <literal>Configuration</literal>, "
-"the application must obtain a factory for <literal>Session</literal> "
-"instances. This factory is intended to be shared by all application threads:"
+"When all mappings have been parsed by the <classname>org.hibernate.cfg."
+"Configuration</classname>, the application must obtain a factory for "
+"<interfacename>org.hibernate.Session</interfacename> instances. This factory "
+"is intended to be shared by all application threads:"
 msgstr ""
 "모든 매핑들이 <literal>Configuration</literal>에 의해 파싱되었을 때, 어플리케"
 "이션은 <literal>Session</literal> 인스턴스들에 대한 팩토리를 얻어야 한다. 이 "
 "팩토리는 모든 어플리케이션 쓰레드들에 의해 공유되도록 고안되었다:"
 
 #. Tag: programlisting
-#: configuration.xml:108
+#: configuration.xml:127
 #, no-c-format
 msgid "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:110
-#, no-c-format
+#: configuration.xml:129
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does allow your application to instantiate more than one "
-"<literal>SessionFactory</literal>. This is useful if you are using more than "
-"one database."
+"<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful "
+"if you are using more than one database."
 msgstr ""
 "하지만 Hibernate는 당신의 어플리케이션이 하나 이상의 "
 "<literal>SessionFactory</literal>를 초기화 시키는 것을 허용한다. 이것은 당신"
 "이 하나 이상의 데이터베이스를 사용하는 경우에 유용하다."
 
 #. Tag: title
-#: configuration.xml:119
+#: configuration.xml:138
 #, no-c-format
 msgid "JDBC connections"
 msgstr "JDBC 커넥션들"
 
 #. Tag: para
-#: configuration.xml:121
-#, no-c-format
+#: configuration.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <literal>SessionFactory</literal> create and "
-"pool JDBC connections for you. If you take this approach, opening a "
-"<literal>Session</literal> is as simple as:"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
+"interfacename> create and pool JDBC connections for you. If you take this "
+"approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
+"as simple as:"
 msgstr ""
 "대개 당신은 <literal>SessionFactory</literal>로 하여금 당신을 위한 JDBC 커넥"
 "션들을 생성시키고 풀링시키는 것을 원한다. 만일 당신이 이 접근법을 취할 경우, "
 "한 개의 <literal>Session</literal>을 여는 것은 다음과 같이 간단하다:"
 
 #. Tag: programlisting
-#: configuration.xml:127
+#: configuration.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:129
-#, no-c-format
+#: configuration.xml:148
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "당신이 데이터베이스에 대한 접근을 요청하는 어떤 것을 행하자 마자, 한 개의 "
 "JDBC 커넥션이 그 풀로부터 얻어질 것이다."
 
 #. Tag: para
-#: configuration.xml:134
-#, no-c-format
+#: configuration.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <literal>org.hibernate.cfg.Environment</literal>. We will now describe "
-"the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "이것이 동작하도록 하기 위해서, 우리는 몇몇 JDBC 커넥션 프로퍼티들을 Hibernate"
 "에 전달할 필요가 있다. 모든 Hibernate 프로퍼티 이름들과 의미론들은 "
@@ -289,109 +292,109 @@
 "우리는 이제 JDBC 커넥션 구성을 위한 가장 중요한 설정들을 설명할 것이다."
 
 #. Tag: para
-#: configuration.xml:141
-#, no-c-format
+#: configuration.xml:159
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <literal>java.sql."
-"DriverManager</literal> if you set the following properties:"
+"Hibernate will obtain and pool connections using <classname>java.sql."
+"DriverManager</classname> if you set the following properties:"
 msgstr ""
 "만일 당신이 다음 프로퍼티들을 설정할 경우 Hibernate는 <literal>java.sql."
 "DriverManager</literal>를 사용하여 커넥션들을 얻을 것이다(그리고 풀링시킬 것"
 "이다):"
 
 #. Tag: title
-#: configuration.xml:147
+#: configuration.xml:165
 #, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Hibernate JDBC 프로퍼티들"
 
 #. Tag: entry
-#: configuration.xml:153 configuration.xml:241 configuration.xml:338
-#: configuration.xml:529 configuration.xml:725 configuration.xml:832
-#: configuration.xml:920
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353
+#: configuration.xml:548 configuration.xml:743 configuration.xml:850
+#: configuration.xml:938
 #, no-c-format
 msgid "Property name"
 msgstr "프로퍼티 이름"
 
 #. Tag: entry
-#: configuration.xml:154 configuration.xml:242 configuration.xml:339
-#: configuration.xml:530 configuration.xml:726 configuration.xml:833
-#: configuration.xml:921
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354
+#: configuration.xml:549 configuration.xml:744 configuration.xml:851
+#: configuration.xml:939
 #, no-c-format
 msgid "Purpose"
 msgstr "용도"
 
-#. Tag: literal
-#: configuration.xml:160
+#. Tag: property
+#: configuration.xml:178
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: emphasis
-#: configuration.xml:163
+#: configuration.xml:181
 #, no-c-format
 msgid "JDBC driver class"
 msgstr "jdbc 드라이버 클래스"
 
-#. Tag: literal
-#: configuration.xml:168
+#. Tag: property
+#: configuration.xml:186
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: emphasis
-#: configuration.xml:171
+#: configuration.xml:189
 #, no-c-format
 msgid "JDBC URL"
 msgstr "jdbc URL"
 
-#. Tag: literal
-#: configuration.xml:176 configuration.xml:272
+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: emphasis
-#: configuration.xml:179
+#: configuration.xml:197
 #, no-c-format
 msgid "database user"
 msgstr "데이터베이스 사용자"
 
-#. Tag: literal
-#: configuration.xml:184 configuration.xml:280
+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: emphasis
-#: configuration.xml:187
+#: configuration.xml:205
 #, no-c-format
 msgid "database user password"
 msgstr "데이터베이스 사용자 패스워드"
 
-#. Tag: literal
-#: configuration.xml:192
+#. Tag: property
+#: configuration.xml:210
 #, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr "hibernate.connection.pool_size"
 
 #. Tag: emphasis
-#: configuration.xml:195
+#: configuration.xml:213
 #, no-c-format
 msgid "maximum number of pooled connections"
 msgstr "풀링된 커넥션들의 최대 개수"
 
 #. Tag: para
-#: configuration.xml:202
-#, no-c-format
+#: configuration.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
-"replace the <literal>hibernate.connection.pool_size</literal> property with "
-"connection pool specific settings. This will turn off Hibernate's internal "
-"pool. For example, you might like to use C3P0."
+"replace the <property>hibernate.connection.pool_size</property> property "
+"with connection pool specific settings. This will turn off Hibernate's "
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "하지만 Hibernate 자신의 커넥션 풀링 알고리즘은 아주 기본적이다. 그것은 당신"
 "이 시작하는 것을 도와주려고 의도되었고 <emphasis>제품 시스템 용도 또는 퍼포먼"
@@ -401,15 +404,16 @@
 "부 pool을 오프시킬 것이다. 예를 들어 당신은 C3P0를 사용할 수도 있다."
 
 #. Tag: para
-#: configuration.xml:212
-#, no-c-format
+#: configuration.xml:230
+#, fuzzy, no-c-format
 msgid ""
 "C3P0 is an open source JDBC connection pool distributed along with Hibernate "
-"in the <literal>lib</literal> directory. Hibernate will use its "
-"<literal>C3P0ConnectionProvider</literal> for connection pooling if you set "
-"<literal>hibernate.c3p0.*</literal> properties. If you'd like to use Proxool "
-"refer to the packaged <literal>hibernate.properties</literal> and the "
-"Hibernate web site for more information."
+"in the <filename>lib</filename> directory. Hibernate will use its "
+"<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
+"connection pooling if you set <property>hibernate.c3p0.*</property> "
+"properties. If you would like to use Proxool, refer to the packaged "
+"<filename>hibernate.properties</filename> and the Hibernate web site for "
+"more information."
 msgstr ""
 "C3P0는 <literal>lib</literal> 디펙토리 속에 Hibernate에 배포된 오픈 소스 "
 "JDBC 커넥션 풀이다. 당신이 <literal>hibernate.c3p0.*</literal> 프로퍼티들을 "
@@ -419,16 +423,17 @@
 "literal>를 참조하고 추가 정보는 Hibernate 웹 사이트를 참조하라."
 
 #. Tag: para
-#: configuration.xml:221
-#, no-c-format
+#: configuration.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Here is an example <literal>hibernate.properties</literal> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr ""
 "다음은 C3P0에 대한 사용하는 예제 <literal>hibernate.properties</literal> 파일"
 "이다:"
 
 #. Tag: programlisting
-#: configuration.xml:225
+#: configuration.xml:242
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
@@ -443,13 +448,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:227
-#, no-c-format
+#: configuration.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<literal>Datasource</literal> registered in JNDI. You'll need to set at "
-"least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "어플리케이션 서버 내부의 용도로, 당신은 JNDI로 등록된 어플리케이션 서버 "
 "<literal>Datasource</literal>로부터 커넥션을 얻기 위해 항상 Hibernate를 구성"
@@ -457,43 +462,43 @@
 "있을 것이다."
 
 #. Tag: title
-#: configuration.xml:235
+#: configuration.xml:251
 #, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Hibernate Datasource Properties"
 
-#. Tag: literal
-#: configuration.xml:248
+#. Tag: property
+#: configuration.xml:264
 #, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr "hibernate.connection.datasource"
 
 #. Tag: emphasis
-#: configuration.xml:251
+#: configuration.xml:267
 #, no-c-format
 msgid "datasource JNDI name"
 msgstr "데이터소스 JNDI 이름"
 
-#. Tag: literal
-#: configuration.xml:256
+#. Tag: property
+#: configuration.xml:272
 #, no-c-format
 msgid "hibernate.jndi.url"
 msgstr "hibernate.jndi.url"
 
 #. Tag: entry
-#: configuration.xml:258
+#: configuration.xml:274
 #, fuzzy, no-c-format
 msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr "JNDI 프로바이더의 URL"
 
-#. Tag: literal
-#: configuration.xml:264
+#. Tag: property
+#: configuration.xml:280
 #, no-c-format
 msgid "hibernate.jndi.class"
 msgstr "hibernate.jndi.class"
 
 #. Tag: entry
-#: configuration.xml:266
+#: configuration.xml:282
 #, no-c-format
 msgid ""
 "<emphasis>class of the JNDI <literal>InitialContextFactory</literal></"
@@ -501,29 +506,29 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:274
+#: configuration.xml:290
 #, no-c-format
 msgid "<emphasis>database user</emphasis> (optional)"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:282
+#: configuration.xml:298
 #, no-c-format
 msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:290
-#, no-c-format
+#: configuration.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example <literal>hibernate.properties</literal> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "다음은 어플리케이션 서버 제공 JNDI 데이터소스용 예제 <literal>hibernate."
 "properties</literal> 파일이다:"
 
 #. Tag: programlisting
-#: configuration.xml:295
+#: configuration.xml:311
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
@@ -535,7 +540,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:297
+#: configuration.xml:313
 #, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
@@ -545,13 +550,13 @@
 "의해 관리되는 트랜잭션들에 자동적으로 참여할 것이다."
 
 #. Tag: para
-#: configuration.xml:302
-#, no-c-format
+#: configuration.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
-"\"<literal>hibernate.connection</literal>\" to the property name. For "
-"example, you may specify a <literal>charSet</literal> using "
-"<literal>hibernate.connection.charSet</literal>."
+"Arbitrary connection properties can be given by prepending "
+"\"<literal>hibernate.connection</literal>\" to the connection property name. "
+"For example, you can specify a <property>charSet</property> connection "
+"property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "임의의 커넥션 프로퍼티들은 프로퍼티 이름 앞에 \"<literal>hibernate."
 "connnection</literal>\"을 첨가하여 부여될 수 있다. 예를 들어 당신은 "
@@ -559,13 +564,14 @@
 "literal>을 지정할 수도 있다."
 
 #. Tag: para
-#: configuration.xml:308
-#, no-c-format
+#: configuration.xml:324
+#, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
-"implementing the interface <literal>org.hibernate.connection."
-"ConnectionProvider</literal>. You may select a custom implementation by "
-"setting <literal>hibernate.connection.provider_class</literal>."
+"You can define your own plugin strategy for obtaining JDBC connections by "
+"implementing the interface <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>, and specifying your custom "
+"implementation via the <property>hibernate.connection.provider_class</"
+"property> property."
 msgstr ""
 "당신은 <literal>org.hibernate.connection.ConnectionProvider</literal> 인터페"
 "이스를 구현함으로써 JDBC 커넥션들을 얻는 당신 자신의 플러그인 방도를 정의할수"
@@ -573,29 +579,29 @@
 "하여 맞춤형 구현을 선택할 수도 있다."
 
 #. Tag: title
-#: configuration.xml:317
+#: configuration.xml:333
 #, no-c-format
 msgid "Optional configuration properties"
 msgstr "선택적인 구성 프로퍼티들"
 
 #. Tag: para
-#: configuration.xml:319
-#, no-c-format
+#: configuration.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "실행 시에 Hibernate의 행위를 제어하는 많은 다른 프로퍼티들이 존재한다. 모든 "
 "것이 옵션이지만 합당한 디폴트 값들을 갖는다."
 
-#. Tag: para
-#: configuration.xml:324
-#, no-c-format
+#. Tag: warning
+#: configuration.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <literal>hibernate.properties</literal>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>경고: 이들 프로퍼티들 중 몇몇은 \"system-level\" 전용이다.</"
 "emphasis> 시스템 레벨 프로퍼티들은 오직 <literal>java -Dproperty=value</"
@@ -604,45 +610,55 @@
 "emphasis>."
 
 #. Tag: title
-#: configuration.xml:332
+#: configuration.xml:347
 #, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Hibernate 구성 프로퍼티들"
 
-#. Tag: literal
-#: configuration.xml:345
+#. Tag: property
+#: configuration.xml:360
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: configuration.xml:347
+#: configuration.xml:362
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a Hibernate <literal>Dialect</literal> which allows "
-"Hibernate to generate SQL optimized for a particular relational database."
+"The classname of a Hibernate <classname>org.hibernate.dialect.Dialect</"
+"classname> which allows Hibernate to generate SQL optimized for a particular "
+"relational database."
 msgstr ""
 "특정 관계형 데이터베이스에 최적화 된 SQL을 생성시키는 것을 Hibernate에게 허용"
 "해주는 Hibernate <placeholder-1/>의 클래스명. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:351
+#: configuration.xml:365
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:359
+#. Tag: para
+#: configuration.xml:369
 #, no-c-format
+msgid ""
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
+msgstr ""
+
+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr "hibernate.show_sql"
 
 #. Tag: entry
-#: configuration.xml:361
+#: configuration.xml:380
 #, fuzzy, no-c-format
 msgid ""
 "Write all SQL statements to console. This is an alternative to setting the "
@@ -653,39 +669,39 @@
 "<placeholder-2/>로 설정하는 것에 대한 하나의 다른 방법이다. <placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:365 configuration.xml:377 configuration.xml:471
-#: configuration.xml:484 configuration.xml:497 configuration.xml:510
-#: configuration.xml:564 configuration.xml:591 configuration.xml:605
-#: configuration.xml:660 configuration.xml:888 configuration.xml:903
-#: configuration.xml:993
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490
+#: configuration.xml:503 configuration.xml:516 configuration.xml:529
+#: configuration.xml:583 configuration.xml:610 configuration.xml:623
+#: configuration.xml:678 configuration.xml:906 configuration.xml:921
+#: configuration.xml:1011
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:373
+#. Tag: property
+#: configuration.xml:392
 #, no-c-format
 msgid "hibernate.format_sql"
 msgstr "hibernate.format_sql"
 
 #. Tag: entry
-#: configuration.xml:375
+#: configuration.xml:394
 #, fuzzy, no-c-format
 msgid "Pretty print the SQL in the log and console."
 msgstr "로그와 콘솔 속에 SQL을 깔끔하게 프린트한다. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:385
+#. Tag: property
+#: configuration.xml:404
 #, no-c-format
 msgid "hibernate.default_schema"
 msgstr "hibernate.default_schema"
 
 #. Tag: entry
-#: configuration.xml:387
+#: configuration.xml:406
 #, fuzzy, no-c-format
 msgid ""
 "Qualify unqualified table names with the given schema/tablespace in "
@@ -695,74 +711,75 @@
 "한다. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:390
+#: configuration.xml:409
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:398
+#. Tag: property
+#: configuration.xml:417
 #, no-c-format
 msgid "hibernate.default_catalog"
 msgstr "hibernate.default_catalog"
 
 #. Tag: entry
-#: configuration.xml:400
+#: configuration.xml:419
 #, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 "주어진 SQL 내에 주어진 카타록으로서 수식이 없는 테이블이름들을 수식한다. "
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:403
+#: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:411
+#. Tag: property
+#: configuration.xml:430
 #, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr "hibernate.session_factory_name"
 
 #. Tag: entry
-#: configuration.xml:413
+#: configuration.xml:432
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>SessionFactory</literal> will be automatically bound to this "
-"name in JNDI after it has been created."
+"The <interfacename>org.hibernate.SessionFactory</interfacename> will be "
+"automatically bound to this name in JNDI after it has been created."
 msgstr ""
 "<placeholder-1/>는 그것이 생성된 후에 JNDI 내에서 이 이름에 자동적으로 바인"
 "드 될 것이다. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:416 configuration.xml:859
+#: configuration.xml:435 configuration.xml:877
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:424
+#. Tag: property
+#: configuration.xml:443
 #, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr "hibernate.max_fetch_depth"
 
 #. Tag: entry
-#: configuration.xml:426
+#: configuration.xml:445
 #, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -771,56 +788,56 @@
 "을 사용불가능하게 만든다. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:430
-#, no-c-format
+#: configuration.xml:449
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>0</literal>과 <literal>3</"
 "literal> 사이의 값들이권장된다"
 
-#. Tag: literal
-#: configuration.xml:439
+#. Tag: property
+#: configuration.xml:458
 #, no-c-format
 msgid "hibernate.default_batch_fetch_size"
 msgstr "hibernate.default_batch_fetch_size"
 
 #. Tag: entry
-#: configuration.xml:441
+#: configuration.xml:460
 #, fuzzy, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr ""
 "연관들의 Hibernate 배치 페칭에 대한 디폴트 크기를 설정한다. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:443
-#, no-c-format
+#: configuration.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis> 권장되는 값들은 <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 
-#. Tag: literal
-#: configuration.xml:452
+#. Tag: property
+#: configuration.xml:471
 #, no-c-format
 msgid "hibernate.default_entity_mode"
 msgstr "hibernate.default_entity_mode"
 
 #. Tag: entry
-#: configuration.xml:454
+#: configuration.xml:473
 #, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "이 <placeholder-1/>로부터 열려진 모든 세션들에 대해 엔티티 표현을 디폴트 모드"
 "로 설정한다 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:457
+#: configuration.xml:476
 #, no-c-format
 msgid ""
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
@@ -829,17 +846,17 @@
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
 "literal>"
 
-#. Tag: literal
-#: configuration.xml:465
+#. Tag: property
+#: configuration.xml:484
 #, no-c-format
 msgid "hibernate.order_updates"
 msgstr "hibernate.order_updates"
 
 #. Tag: entry
-#: configuration.xml:467
+#: configuration.xml:486
 #, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
@@ -847,14 +864,14 @@
 "(ordering)지워지도록 Hibernate에게 강제시킨다. 이것은 고도의 동시성 시스템들"
 "에서 더 적은 트랜잭션 데드락(deadlock)들로 귀결될 것이다 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:479
+#. Tag: property
+#: configuration.xml:498
 #, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr "hibernate.generate_statistics"
 
 #. Tag: entry
-#: configuration.xml:481
+#: configuration.xml:500
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, Hibernate will collect statistics useful for performance tuning."
@@ -862,14 +879,14 @@
 "이용 가능하게 되면, Hibernate는 퍼포먼스 튜닝에 유용한 통계들을 수집할 것이"
 "다. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:492
+#. Tag: property
+#: configuration.xml:511
 #, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr "hibernate.use_identifer_rollback"
 
 #. Tag: entry
-#: configuration.xml:494
+#: configuration.xml:513
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, generated identifier properties will be reset to default values "
@@ -878,14 +895,14 @@
 "이용 가능하게 되면, 객체가 삭제될 때 생성된 식별자 프로퍼티들은 디폴트 값들"
 "로 재설정될 것이다. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:505
+#. Tag: property
+#: configuration.xml:524
 #, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr "hibernate.use_sql_comments"
 
 #. Tag: entry
-#: configuration.xml:507
+#: configuration.xml:526
 #, fuzzy, no-c-format
 msgid ""
 "If turned on, Hibernate will generate comments inside the SQL, for easier "
@@ -895,19 +912,19 @@
 "성시킬 것이다. 디폴트는 <placeholder-1/>. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:521
+#: configuration.xml:540
 #, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "Hibernate JDBC 및 커넥션 프로퍼티들"
 
-#. Tag: literal
-#: configuration.xml:536
+#. Tag: property
+#: configuration.xml:555
 #, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr "hibernate.jdbc.fetch_size"
 
 #. Tag: entry
-#: configuration.xml:538
+#: configuration.xml:557
 #, fuzzy, no-c-format
 msgid ""
 "A non-zero value determines the JDBC fetch size (calls <literal>Statement."
@@ -915,14 +932,14 @@
 msgstr ""
 "0 아닌 값은 JDBC fetch 사이즈를 결정한다(<placeholder-1/>을 호출한다 )."
 
-#. Tag: literal
-#: configuration.xml:545
+#. Tag: property
+#: configuration.xml:564
 #, no-c-format
 msgid "hibernate.jdbc.batch_size"
 msgstr "hibernate.jdbc.batch_size"
 
 #. Tag: entry
-#: configuration.xml:547
+#: configuration.xml:566
 #, fuzzy, no-c-format
 msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr ""
@@ -930,28 +947,28 @@
 "다. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:549
-#, no-c-format
+#: configuration.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>5</literal>와 <literal>30</"
 "literal> 사이의 값들이 권장된다"
 
-#. Tag: literal
-#: configuration.xml:557
+#. Tag: property
+#: configuration.xml:576
 #, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr "hibernate.jdbc.batch_versioned_data"
 
 #. Tag: entry
-#: configuration.xml:559
+#: configuration.xml:578
 #, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "당신의 JDBC 드라이버가 <placeholder-1/>로부터 정확한 행 카운트들을 반환할 경"
@@ -960,80 +977,81 @@
 "치화된(batched) DML을 사용할 것이다. 디폴트는 <placeholder-3/>. <placeholder-"
 "4/>"
 
-#. Tag: literal
-#: configuration.xml:572
+#. Tag: property
+#: configuration.xml:591
 #, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr "hibernate.jdbc.factory_class"
 
 #. Tag: entry
-#: configuration.xml:574
+#: configuration.xml:593
 #, fuzzy, no-c-format
 msgid ""
-"Select a custom <literal>Batcher</literal>. Most applications will not need "
-"this configuration property."
+"Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfacename>. "
+"Most applications will not need this configuration property."
 msgstr ""
 "맞춤형 <placeholder-1/>를 선택한다. 대부분의 어플리케이션들은 이 구성 프로퍼"
 "티를 필요로 하지 않을 것이다. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:577
+#: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:585
+#. Tag: property
+#: configuration.xml:604
 #, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr "hibernate.jdbc.use_scrollable_resultset"
 
 #. Tag: entry
-#: configuration.xml:587
+#: configuration.xml:606
 #, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "Hibernate에 의한 JDBC2 스크롤 가능한 결과셋들의 사용을 가능하게 해준다. 이 프"
 "로퍼티는 사용자가 제공한 JDBC커넥션들을 사용할 때에만 필수적이고, 그 밖의 경"
 "우 Hibernate는 커넥션 메타데이터를 사용한다. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:599
+#. Tag: property
+#: configuration.xml:618
 #, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr "hibernate.jdbc.use_streams_for_binary"
 
 #. Tag: entry
-#: configuration.xml:601
+#: configuration.xml:620
 #, fuzzy, no-c-format
 msgid ""
 "Use streams when writing/reading <literal>binary</literal> or "
-"<literal>serializable</literal> types to/from JDBC (system-level property)."
+"<literal>serializable</literal> types to/from JDBC. <emphasis>*system-level "
+"property*</emphasis>"
 msgstr ""
 "FUZZY! <placeholder-1/> 또는 <placeholder-2/> 타입들을 읽어들일 때 스트림들"
 "을 사용한다(시스템-레벨 프로퍼티). <placeholder-3/>"
 
-#. Tag: literal
-#: configuration.xml:613
+#. Tag: property
+#: configuration.xml:631
 #, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr "hibernate.jdbc.use_get_generated_keys"
 
 #. Tag: entry
-#: configuration.xml:615
+#: configuration.xml:633
 #, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "insert 후에 고유하게 생성된 키들을 검색하는데 JDBC3 <placeholder-1/>의 사용"
@@ -1043,100 +1061,101 @@
 "라. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:621 configuration.xml:751 configuration.xml:763
-#: configuration.xml:777 configuration.xml:815
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781
+#: configuration.xml:795 configuration.xml:833
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:629
+#. Tag: property
+#: configuration.xml:647
 #, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr "hibernate.connection.provider_class"
 
 #. Tag: entry
-#: configuration.xml:631
+#: configuration.xml:649
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a custom <literal>ConnectionProvider</literal> which "
-"provides JDBC connections to Hibernate."
+"The classname of a custom <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename> which provides JDBC connections to "
+"Hibernate."
 msgstr ""
 "Hibernate에 JDBC 커넥션들을 제공하는 맞춤형 <placeholder-1/>의 클래스명. "
 "<placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:634
+#: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:642
+#. Tag: property
+#: configuration.xml:660
 #, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr "hibernate.connection.isolation"
 
 #. Tag: entry
-#: configuration.xml:644
+#: configuration.xml:662
 #, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <literal>java.sql."
-"Connection</literal> for meaningful values but note that most databases do "
-"not support all isolation levels."
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
+"databases do not support all isolation levels and some define additional, "
+"non-standard isolations."
 msgstr ""
 "JDBC transaction isolation 레벨을 설정한다. 의미있는 값들로 <placeholder-1/>"
 "을 체크하지만 대부분의 데이터베이스들이 모든 격리(isolate) 레벨들을 지원하지 "
 "않음을 노트하라. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:648
+#: configuration.xml:666
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:656
+#. Tag: property
+#: configuration.xml:674
 #, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr "hibernate.connection.autocommit"
 
 #. Tag: entry
-#: configuration.xml:658
+#: configuration.xml:676
 #, fuzzy, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "JDBC 풀링된 커넥션들에 대해 자동커밋을 이용 가능하도록 한다(권장되지 않음). "
 "<placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:668
+#. Tag: property
+#: configuration.xml:686
 #, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr "hibernate.connection.release_mode"
 
 #. Tag: entry
-#: configuration.xml:670
+#: configuration.xml:688
 #, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "Hibernate가 JDBC 커넥션들을 해제하게 될 시점을 지정한다. 디폴트로 한 개의 "
 "JDBC 커넥션은 그 세션이 명시적으로 닫히거나 연결해제되기 전까지 보관된다. 어"
@@ -1148,11 +1167,11 @@
 "5/>를 선택할 것이다. <placeholder-6/><placeholder-7/>"
 
 #. Tag: para
-#: configuration.xml:681
+#: configuration.xml:699
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">eg.</emphasis><literal>auto</literal> (디폴트) | "
@@ -1160,11 +1179,11 @@
 "<literal>after_statement</literal>"
 
 #. Tag: para
-#: configuration.xml:686
+#: configuration.xml:704
 #, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -1179,15 +1198,15 @@
 "session\"/>를 보라."
 
 #. Tag: entry
-#: configuration.xml:697
+#: configuration.xml:715
 #, no-c-format
 msgid ""
-"<literal>hibernate.connection.</literal><emphasis>&lt;propertyName&gt;</"
+"<property>hibernate.connection.</property><emphasis>&lt;propertyName&gt;</"
 "emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:700
+#: configuration.xml:718
 #, no-c-format
 msgid ""
 "Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to "
@@ -1195,14 +1214,14 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:706
+#: configuration.xml:724
 #, no-c-format
 msgid ""
-"<literal>hibernate.jndi.</literal><emphasis>&lt;propertyName&gt;</emphasis>"
+"<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;</emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:709
+#: configuration.xml:727
 #, no-c-format
 msgid ""
 "Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI "
@@ -1210,44 +1229,44 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:719
+#: configuration.xml:737
 #, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Hibernate Cache 프로퍼티들"
 
 #. Tag: literal
-#: configuration.xml:732
+#: configuration.xml:750
 #, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr "hibernate.cache.provider_class"
 
 #. Tag: entry
-#: configuration.xml:734
+#: configuration.xml:752
 #, fuzzy, no-c-format
 msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr "맞춤형 <placeholder-1/>의 클래스명. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:736
+#: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:744
+#: configuration.xml:762
 #, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr "hibernate.cache.use_minimal_puts"
 
 #. Tag: entry
-#: configuration.xml:746
+#: configuration.xml:764
 #, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1257,31 +1276,31 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:759
+#: configuration.xml:777
 #, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr "hibernate.cache.use_query_cache"
 
 #. Tag: entry
-#: configuration.xml:761
+#: configuration.xml:779
 #, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 "질의 캐시를 가능하게 만든다. 개별 질의들은 여전히 캐시 가능한 것으로 설정되어"
 "야 한다. <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:771
+#: configuration.xml:789
 #, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr "hibernate.cache.use_second_level_cache"
 
 #. Tag: entry
-#: configuration.xml:773
+#: configuration.xml:791
 #, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1290,13 +1309,13 @@
 "<placeholder-2/>"
 
 #. Tag: literal
-#: configuration.xml:785
+#: configuration.xml:803
 #, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr "hibernate.cache.query_cache_factory"
 
 #. Tag: entry
-#: configuration.xml:787
+#: configuration.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a custom <literal>QueryCache</literal> interface, defaults "
@@ -1306,43 +1325,43 @@
 "<placeholder-2/>. <placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:790
+#: configuration.xml:808
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:798
+#: configuration.xml:816
 #, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr "hibernate.cache.region_prefix"
 
 #. Tag: entry
-#: configuration.xml:800
+#: configuration.xml:818
 #, fuzzy, no-c-format
 msgid "A prefix to use for second-level cache region names."
 msgstr "second-level 캐시 영역 이름들에 사용할 접두어. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:802
+#: configuration.xml:820
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:810
+#: configuration.xml:828
 #, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr "hibernate.cache.use_structured_entries"
 
 #. Tag: entry
-#: configuration.xml:812
+#: configuration.xml:830
 #, fuzzy, no-c-format
 msgid ""
 "Forces Hibernate to store data in the second-level cache in a more human-"
@@ -1352,19 +1371,19 @@
 "Hibernate에게 강제시킨다.. <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:826
+#: configuration.xml:844
 #, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Hibernate 트랜잭션 프로퍼티들"
 
 #. Tag: literal
-#: configuration.xml:839
+#: configuration.xml:857
 #, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr "hibernate.transaction.factory_class"
 
 #. Tag: entry
-#: configuration.xml:841
+#: configuration.xml:859
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a <literal>TransactionFactory</literal> to use with "
@@ -1375,23 +1394,23 @@
 "트는 <placeholder-3/>). <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:845
+#: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:853
+#: configuration.xml:871
 #, no-c-format
 msgid "jta.UserTransaction"
 msgstr "jta.UserTransaction"
 
 #. Tag: entry
-#: configuration.xml:855
+#: configuration.xml:873
 #, fuzzy, no-c-format
 msgid ""
 "A JNDI name used by <literal>JTATransactionFactory</literal> to obtain the "
@@ -1401,40 +1420,40 @@
 "의해 사용되는 JNDI 이름. <placeholder-3/>"
 
 #. Tag: literal
-#: configuration.xml:867
+#: configuration.xml:885
 #, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr "hibernate.transaction.manager_lookup_class"
 
 #. Tag: entry
-#: configuration.xml:869
+#: configuration.xml:887
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "<placeholder-1/>의 클래스명- JVM 레벨의 캐싱이 이용 가능할 때 또는 JTA 환경에"
 "서 hilo generator를 사용할 때 필요하다. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:873
+#: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:881
+#: configuration.xml:899
 #, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr "hibernate.transaction.flush_before_completion"
 
 #. Tag: entry
-#: configuration.xml:883
+#: configuration.xml:901
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically flushed during the before "
@@ -1448,17 +1467,17 @@
 "1/>"
 
 #. Tag: literal
-#: configuration.xml:896
+#: configuration.xml:914
 #, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr "hibernate.transaction.auto_close_session"
 
 #. Tag: entry
-#: configuration.xml:898
+#: configuration.xml:916
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -1466,22 +1485,22 @@
 "질 것이다. (CMT에 대해 Hibernate를 사용할 때 매우 유용하다.) <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:914
+#: configuration.xml:932
 #, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "여러가지 프로퍼티들"
 
 #. Tag: literal
-#: configuration.xml:927
+#: configuration.xml:945
 #, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr "hibernate.current_session_context_class"
 
 #. Tag: entry
-#: configuration.xml:929
+#: configuration.xml:947
 #, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -1490,10 +1509,10 @@
 "session\"/>를 보라. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:934
+#: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -1502,22 +1521,22 @@
 "Class</literal>"
 
 #. Tag: literal
-#: configuration.xml:943
+#: configuration.xml:961
 #, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr "hibernate.query.factory_class"
 
 #. Tag: entry
-#: configuration.xml:945
+#: configuration.xml:963
 #, fuzzy, no-c-format
 msgid "Chooses the HQL parser implementation."
 msgstr "Chooses the HQL 파서 구현을 선택한다. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:947
+#: configuration.xml:965
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -1526,42 +1545,42 @@
 "ClassicQueryTranslatorFactory</literal>"
 
 #. Tag: literal
-#: configuration.xml:956
+#: configuration.xml:974
 #, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr "hibernate.query.substitutions"
 
 #. Tag: entry
-#: configuration.xml:958
+#: configuration.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "Hibernate 질의들 내의 토큰들로부터 SQL 토큰들로의 매핑 (예를 들어 토큰들은 함"
 "수 이름 또는 리터럴 이름일 수 있다). <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:961
+#: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "<emphasis role=\"strong\">예.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:969
+#: configuration.xml:987
 #, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr "hibernate.hbm2ddl.auto"
 
 #. Tag: entry
-#: configuration.xml:971
+#: configuration.xml:989
 #, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -1571,10 +1590,10 @@
 "적으로 닫혀질 때 데이터베이스 스키마가 드롭될 것이다. <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:977
+#: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
@@ -1583,19 +1602,19 @@
 "drop</literal>"
 
 #. Tag: literal
-#: configuration.xml:986
+#: configuration.xml:1004
 #, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr "hibernate.cglib.use_reflection_optimizer"
 
 #. Tag: entry
-#: configuration.xml:988
+#: configuration.xml:1006
 #, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "런타임 reflection 대신에 CGLIB의 사용을 가능하도록 만든다(시스템 레벨 프로퍼"
 "티). Reflection은 문제가 발생할 시에 때때로 유용할 수 있고, 당신이 optimizer"
@@ -1603,20 +1622,20 @@
 "<placeholder-1/> 속에 이 프로퍼티를 설정할수 없다. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:1004
+#: configuration.xml:1022
 #, no-c-format
 msgid "SQL Dialects"
 msgstr "SQL Dialects"
 
 #. Tag: para
-#: configuration.xml:1006
-#, no-c-format
+#: configuration.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "당신은 항상 당신의 데이터베이스를 위해 <literal>hibernate.dialect</literal> "
 "프로퍼티를 정확한 <literal>org.hibernate.dialect.Dialect</literal> 서브클래스"
@@ -1625,304 +1644,316 @@
 "몇몇에 대해 의미있는 디폴트들을 사용할 것이다."
 
 #. Tag: title
-#: configuration.xml:1014
+#: configuration.xml:1032
 #, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 
 #. Tag: entry
-#: configuration.xml:1022
+#: configuration.xml:1040
 #, no-c-format
 msgid "RDBMS"
 msgstr "RDBMS"
 
 #. Tag: entry
-#: configuration.xml:1023
+#: configuration.xml:1041
 #, no-c-format
 msgid "Dialect"
 msgstr "Dialect"
 
 #. Tag: entry
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "<entry>DB2</entry>"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr "org.hibernate.dialect.DB2Dialect"
 
 #. Tag: entry
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "DB2 AS/400"
 msgstr "DB2 AS/400"
 
 #. Tag: literal
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr "org.hibernate.dialect.DB2400Dialect"
 
 #. Tag: entry
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "DB2 OS390"
 msgstr "DB2 OS390"
 
 #. Tag: literal
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr "org.hibernate.dialect.DB2390Dialect"
 
 #. Tag: entry
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "PostgreSQL"
 msgstr "PostgreSQL"
 
 #. Tag: literal
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr "org.hibernate.dialect.PostgreSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "MySQL"
 msgstr "MySQL"
 
 #. Tag: literal
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr "org.hibernate.dialect.MySQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "MySQL with InnoDB"
 msgstr "MySQL with InnoDB"
 
 #. Tag: literal
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr "org.hibernate.dialect.MySQLInnoDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "MySQL with MyISAM"
 msgstr "MySQL with MyISAM"
 
 #. Tag: literal
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr "org.hibernate.dialect.MySQLMyISAMDialect"
 
 #. Tag: entry
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "Oracle (any version)"
 msgstr "Oracle (any version)"
 
 #. Tag: literal
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr "org.hibernate.dialect.OracleDialect"
 
 #. Tag: entry
-#: configuration.xml:1052
-#, no-c-format
-msgid "Oracle 9i/10g"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
-#: configuration.xml:1052
-#, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
-#: configuration.xml:1055
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1055
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1100
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "Outer Join Fetching"
 
 #. Tag: para
-#: configuration.xml:1102
-#, no-c-format
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "만일 당신의 데이터베이스가 ANSI, Oracle, 또는 Sybase 스타일의 outer join들을 "
 "지원할 경우, <emphasis>outer join fetching</emphasis>은 (데이터베이스 그 자체"
@@ -1933,13 +1964,13 @@
 "<literal>SELECT</literal> 속에서 검색되게끔 허용해준다."
 
 #. Tag: para
-#: configuration.xml:1111
-#, no-c-format
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "Outer join fetching은 hibernate.max_fetch_depth 프로퍼티를 <literal>0</"
@@ -1949,23 +1980,23 @@
 "outer join fetching을 사용 가능하도록 만든다."
 
 #. Tag: para
-#: configuration.xml:1119
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr "추가 정보는 <xref linkend=\"performance-fetching\"/>를 보라."
 
 #. Tag: title
-#: configuration.xml:1126
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr "Binary Streams"
 
 #. Tag: para
-#: configuration.xml:1128
-#, no-c-format
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -1977,82 +2008,83 @@
 "능하게 해야 할 것이다. <emphasis>이것은 오직 시스템 레벨 설정이다.</emphasis>"
 
 #. Tag: title
-#: configuration.xml:1139
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "Second-level 캐시와 query 캐시"
 
 #. Tag: para
-#: configuration.xml:1141
-#, no-c-format
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "<literal>hibernate.cache</literal> 접두어가 붙은 프로퍼티들은 Hibernate에 대"
 "해 프로세스 또는 클러스터 범위의 두 번째 레벨 캐시 시스템을 사용하는 것을 허"
 "용해준다. 상세한 것은 <xref linkend=\"performance-cache\"/>를 보라."
 
 #. Tag: title
-#: configuration.xml:1151
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "Query Language 치환"
 
 #. Tag: para
-#: configuration.xml:1153
-#, no-c-format
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "당신은 <literal>hibernate.query.substitutions</literal>을 사용하여 새로운 "
 "Hibernate 질의 토큰들을 정의할 수 있다. 예를 들어:"
 
 #. Tag: programlisting
-#: configuration.xml:1158
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions true=1, false=0"
 
 #. Tag: para
-#: configuration.xml:1160
-#, no-c-format
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "은<literal>true</literal>와 <literal>false</literal> 토큰들이 생성된 SQL 내에"
 "서 정수 리터럴들로 번역되도록 강제할 것이다."
 
 #. Tag: programlisting
-#: configuration.xml:1165
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1167
-#, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
 "은 SQL <literal>LOWER</literal> function 함수 이름을 변경하는 것을 당신에게 "
 "허용해 줄 것이다"
 
 #. Tag: title
-#: configuration.xml:1174
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Hibernate 통계"
 
 #. Tag: para
-#: configuration.xml:1176
-#, no-c-format
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -2064,43 +2096,34 @@
 "Javadoc를 읽어라."
 
 #. Tag: title
-#: configuration.xml:1188
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr "로깅"
 
 #. Tag: para
-#: configuration.xml:1190
+#: configuration.xml:1211
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr ""
-"Hibernate는 Apache commons-logging를 사용하여 다양한 이벤트들을 로그시킨다."
-
-#. Tag: para
-#: configuration.xml:1194
-#, no-c-format
 msgid ""
-"The commons-logging service will direct output to either Apache Log4j (if "
-"you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
-"logging (if running under JDK1.4 or above). You may download Log4j from "
-"<literal>http://jakarta.apache.org</literal>. To use Log4j you will need to "
-"place a <literal>log4j.properties</literal> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
+"Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
+"can direct your logging output to several logging frameworks (NOP, Simple, "
+"log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
-"commons-logging 서비스는 (만일 당신이 classpath 내에 <literal>log4j.jar</"
-"literal>를 포함할 경우) Apache Log4j로 또는 (JDK1.4 이상의 버전에서 실행될 경"
-"우) JDK 1.4 로깅으로 직접 출력할 것이다. 당신은 <literal>http://jakarta."
-"apache.org</literal>에서 Log4j를 다운로드 할 수 있다. Log4j를 사용하기 위해, "
-"당신은 <literal>log4j.properties</literal> 파일을 당신의 classpath 내에 위치"
-"지울 필요가 있을 것이고, 예제 properties 파일은 Hibernate의 <literal>src/</"
-"literal> 디렉토리 내에 배포되어 있다."
 
 #. Tag: para
-#: configuration.xml:1204
-#, no-c-format
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -2112,67 +2135,67 @@
 "다음에 있다:"
 
 #. Tag: title
-#: configuration.xml:1213
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Hibernate 로그 카테고리들"
 
 #. Tag: entry
-#: configuration.xml:1219
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr "카테고리"
 
 #. Tag: entry
-#: configuration.xml:1220
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr "기능"
 
 #. Tag: literal
-#: configuration.xml:1225
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1226
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr "SQL DML 문장들이 실행될 때 그것들 모두를 로그 시킨다"
 
 #. Tag: literal
-#: configuration.xml:1229
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1230
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "모든 JDBC 파라미터들을 로그시킨다"
 
 #. Tag: literal
-#: configuration.xml:1233
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr "SQL DDL 문장들이 실행될 때 그것들 모두를 로그 시킨다"
 
 #. Tag: literal
-#: configuration.xml:1237
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1256
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2182,80 +2205,81 @@
 "그 시킨다"
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "모든 second-level 캐시 액티비티를 로그시킨다"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "트랜잭션 관련 액티비티를 로그 시킨다"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "모든 JDBC 리소스 취득을 로그 시킨다"
 
 #. Tag: literal
-#: configuration.xml:1256
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast.AST"
 
 #. Tag: entry
-#: configuration.xml:1257
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr "질의 파싱 동안에 HQL AST와 SQL AST를 로그시킨다"
 
 #. Tag: literal
-#: configuration.xml:1262
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "모든 JAAS 허가 요청들을 로그시킨다"
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1267
-#, no-c-format
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr "모든 것을 로그시킨다(많은 정보이지만, 문제해결에 매우 유용하다)"
 
 #. Tag: para
-#: configuration.xml:1276
+#: configuration.xml:1294
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2269,13 +2293,13 @@
 "티를 이용가능하게 하여 작업해야 할 것이다."
 
 #. Tag: title
-#: configuration.xml:1286
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "<literal>NamingStrategy</literal> 구현하기"
 
 #. Tag: para
-#: configuration.xml:1288
+#: configuration.xml:1306
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2286,10 +2310,10 @@
 "용해준다."
 
 #. Tag: para
-#: configuration.xml:1293
-#, no-c-format
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -2304,17 +2328,17 @@
 "주 작은 작품이다."
 
 #. Tag: para
-#: configuration.xml:1302
-#, no-c-format
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "당신은 매핑들을 추가하기 이전에 <literal>Configuration.setNamingStrategy()</"
 "literal>를 호출함으로써 다른 방도를 지정할 수 있다:"
 
 #. Tag: programlisting
-#: configuration.xml:1307
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2325,7 +2349,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1309
+#: configuration.xml:1327
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2335,13 +2359,13 @@
 "션들에 대한 유용한 시작점일 수 있는 미리 빌드된 방도이다."
 
 #. Tag: title
-#: configuration.xml:1317
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr "XML 구성 파일"
 
 #. Tag: para
-#: configuration.xml:1319
+#: configuration.xml:1337
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -2355,17 +2379,17 @@
 "로퍼티들을 중복정의하는데 사용될 수 있다."
 
 #. Tag: para
-#: configuration.xml:1326
-#, no-c-format
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "XML 구성 파일은 디폴트로 당신의 <literal>CLASSPATH</literal>의 루트에 존재하"
 "는 것이 기대된다. 다음은 예제이다:"
 
 #. Tag: programlisting
-#: configuration.xml:1331
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -2409,15 +2433,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1333
-#, no-c-format
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "당신이 볼 수 있듯이, 이 접근법의 장점은 구성에 대한 매핑 파일 이름들을 구체"
 "화 시키는 것이다. <literal>hibernate.cfg.xml</literal>은 또한 당신이 "
@@ -2427,13 +2451,13 @@
 "것임을 노트하라."
 
 #. Tag: para
-#: configuration.xml:1342
-#, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr "Hibernate 구성으로, Hibernate를 시작하는 것은 다음과 같이 간단하다"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1364
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -2441,13 +2465,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
-#, no-c-format
-msgid "You can pick a different XML configuration file using"
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "당신은 다음을 사용하여 다른 XML 구성 파일을 찾아낼 수 있다"
 
 #. Tag: programlisting
-#: configuration.xml:1352
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2456,28 +2480,28 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1357
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "J2EE 어플리케이션 서버 통합"
 
 #. Tag: para
-#: configuration.xml:1359
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr "Hibernate는 J2EE 인프라스트럭처에 대한 다음 통합 점들을 갖고 있다:"
 
 #. Tag: para
-#: configuration.xml:1365
-#, no-c-format
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate는 컨테이너에 의"
@@ -2489,7 +2513,7 @@
 "Hibernate <literal>Transaction</literal> API를 사용하고자 원할 수도 있다."
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1398
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -2499,15 +2523,15 @@
 "<literal>SessionFactory</literal>를 JNDI에 바인드 시킬 수 있다."
 
 #. Tag: para
-#: configuration.xml:1389
-#, no-c-format
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>JTA Session 바인딩</emphasis>: Hibernate <literal>Session</literal>"
@@ -2519,16 +2543,16 @@
 "UserTransaction))이다."
 
 #. Tag: para
-#: configuration.xml:1402
-#, no-c-format
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>JMX 배치</emphasis>: 만일 당신이 JMX 가용성이 있는 어플리케이션 서"
 "버(예를 들면 JBoss AS)를 갖고 있다면, 당신은 Hibernate를 하나의 managed MBean"
@@ -2539,7 +2563,7 @@
 "Hibernate가 시작되기 전에 이용 가능해야 한다)."
 
 #. Tag: para
-#: configuration.xml:1413
+#: configuration.xml:1431
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -2552,18 +2576,18 @@
 "될 수도 있다."
 
 #. Tag: title
-#: configuration.xml:1420
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "트랜잭션 방도 구성"
 
 #. Tag: para
-#: configuration.xml:1422
-#, no-c-format
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -2576,7 +2600,7 @@
 "<literal>UserTransaction</literal>을 호출하고자 원할 수 있다."
 
 #. Tag: para
-#: configuration.xml:1430
+#: configuration.xml:1448
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -2594,73 +2618,73 @@
 "다."
 
 #. Tag: para
-#: configuration.xml:1437
-#, no-c-format
-msgid "There are three standard (built-in) choices:"
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "세 개의 표준(미리 만들어진) 선택들이 존재한다:"
 
 #. Tag: literal
-#: configuration.xml:1443
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "org.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr "데이터베이스 (JDBC) 트랜잭션들에게 위임시킨다(디폴트)"
 
 #. Tag: literal
-#: configuration.xml:1449
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1451
-#, no-c-format
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "기존의 트랜잭션이 이 컨텍스트(예를 들면 EJB session bean 메소드) 내에서 진행 "
 "중일 경우에 container-managed transaction에게 위임시키고, 그 밖의 경우 새로"
 "운 트랜잭션이 시작되고 bean-managed transaction이 사용된다."
 
 #. Tag: literal
-#: configuration.xml:1459
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1461
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "container-managed JTA 트랜잭션들에게 위임시킨다"
 
 #. Tag: para
-#: configuration.xml:1466
-#, no-c-format
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr ""
 "당신은 또한 당신 자신의 트랜잭션 방도들(예를 들면 CORBA 트랜잭션 서비스)을 정"
 "의할 수도 있다."
 
 #. Tag: para
-#: configuration.xml:1471
-#, no-c-format
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Hibernate에 있는 몇몇 특징들(예를 들면. second level 캐시, JTA를 가진 컨텍스"
 "트 상의 세션들, 기타.)은 관리되는 환경에서 JTA <literal>TransactionManager</"
@@ -2669,157 +2693,157 @@
 "한다. 왜냐하면 J2EE가 한 개의 메커니즘을 표준화 시키고 있지 않기 때문이다:"
 
 #. Tag: title
-#: configuration.xml:1479
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "JTA TransactionManagers"
 
 #. Tag: entry
-#: configuration.xml:1485
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "트랜잭션 팩토리"
 
 #. Tag: entry
-#: configuration.xml:1486
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr "어플리케이션 서버"
 
 #. Tag: literal
-#: configuration.xml:1491
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1492
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1495
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1496
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1499
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1503
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1507
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1508
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1511
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1512
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1515
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1516
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1519
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1520
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1523
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1524
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1527
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1528
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1537
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "JNDI-bound <literal>SessionFactory</literal>"
 
 #. Tag: para
-#: configuration.xml:1539
-#, no-c-format
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "하나의 JNDI 바인드된 Hibernate <literal>SessionFactory</literal>는 그 팩토리"
 "에 대한 룩업과 새로운 <literal>Session</literal>들의 생성을 단순화 시킬 수 있"
@@ -2827,15 +2851,15 @@
 "단순하게 둘 다 동일한 레지스트리를 사용한다는 점을 노트하라!"
 
 #. Tag: para
-#: configuration.xml:1546
-#, no-c-format
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "만일 당신이 <literal>SessionFactory</literal>를 하나의 JNDI namespace에 바인"
 "드 시키고자 원할 경우, <literal>hibernate.session_factory_name</literal> 프로"
@@ -2846,7 +2870,7 @@
 "다.)"
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1572
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -2861,14 +2885,15 @@
 "될 것이다."
 
 #. Tag: para
-#: configuration.xml:1561
-#, no-c-format
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "Hibernate는 당신이 <literal>cfg.buildSessionFactory()</literal>를 호출한 후"
 "에 <literal>SessionFactory</literal>를 JNDI 내에 자동적으로 위치지울 것이다. "
@@ -2877,22 +2902,23 @@
 "떤 시작 코드 (또는 유틸리티 클래스) 내에서 이것을 호출할 것임을 의미한다."
 
 #. Tag: para
-#: configuration.xml:1568
-#, no-c-format
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "만일 당신이 하나의 JNDI <literal>SessionFactory</literal>를 사용할 경우, 하나"
 "의 EJB 또는 어떤 다른 클래스는 JNDI 룩업을 사용하여 <literal>SessionFactory</"
 "literal>를 얻을 수 있다."
 
 #. Tag: para
-#: configuration.xml:1573
-#, no-c-format
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -2908,33 +2934,34 @@
 "임을 노트하라&mdash; 1장을 보라."
 
 #. Tag: title
-#: configuration.xml:1585
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "Current Session context management with JTA"
 
 #. Tag: para
-#: configuration.xml:1587
-#, no-c-format
+#: configuration.xml:1605
+#, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <link linkend=\"architecture-current-session\">current "
-"sessions</link>. Using the <literal>\"jta\"</literal> session context, if "
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
 "there is no Hibernate <literal>Session</literal> associated with the current "
 "JTA transaction, one will be started and associated with that JTA "
 "transaction the first time you call <literal>sessionFactory.getCurrentSession"
 "()</literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "당신 자신의 <literal>ThreadLocal</literal> 유틸리티를 작동시키는 대신에, 우리"
 "는 또한 Hibernate <literal>Session</literal>를 얻기 위해 "
@@ -2974,20 +3001,20 @@
 "의 경우에 선언적인 트랜잭션 경계설정이 선호된다."
 
 #. Tag: title
-#: configuration.xml:1610
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr "JMX 배치"
 
 #. Tag: para
-#: configuration.xml:1612
-#, no-c-format
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "<literal>cfg.buildSessionFactory()</literal> 줄은 여전히 JNDI에 붙은 하나의 "
 "<literal>SessionFactory</literal>를 얻기 위해 어딘가에서 실행되어야 한다. 당"
@@ -2996,12 +3023,12 @@
 "<emphasis>managed service</emphasis>로서 배치할 수 있다."
 
 #. Tag: para
-#: configuration.xml:1620
-#, no-c-format
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "Hibernate는 JBoss AS와 같은 JMX 가용성들을 가진 어플리케이션 서버 상의 배치"
@@ -3010,7 +3037,7 @@
 "<literal>jboss-service.xml</literal> 예제이다:"
 
 #. Tag: programlisting
-#: configuration.xml:1627
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3061,15 +3088,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1629
-#, no-c-format
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
@@ -3083,6 +3110,35 @@
 "위해 메인 서비스 아카이브 속에 이 EJB JAR 파일을 포함시킬 수도 있다. JMX 서비"
 "스와 EJB 배치에 관한 추가 정보는 JBoss AS 문서를 참조하라."
 
+#~ msgid ""
+#~ "<literal>hibernate.properties</literal> is the easiest approach if you "
+#~ "want to get started quickly."
+#~ msgstr ""
+#~ "당신이 빠르게 시작하고 원할 경우 <literal>hibernate.properties</literal>"
+#~ "는 가장 쉬운 접근법이다."
+
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr ""
+#~ "Hibernate는 Apache commons-logging를 사용하여 다양한 이벤트들을 로그시킨"
+#~ "다."
+
+#~ msgid ""
+#~ "The commons-logging service will direct output to either Apache Log4j (if "
+#~ "you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
+#~ "logging (if running under JDK1.4 or above). You may download Log4j from "
+#~ "<literal>http://jakarta.apache.org</literal>. To use Log4j you will need "
+#~ "to place a <literal>log4j.properties</literal> file in your classpath, an "
+#~ "example properties file is distributed with Hibernate in the <literal>src/"
+#~ "</literal> directory."
+#~ msgstr ""
+#~ "commons-logging 서비스는 (만일 당신이 classpath 내에 <literal>log4j.jar</"
+#~ "literal>를 포함할 경우) Apache Log4j로 또는 (JDK1.4 이상의 버전에서 실행"
+#~ "될 경우) JDK 1.4 로깅으로 직접 출력할 것이다. 당신은 <literal>http://"
+#~ "jakarta.apache.org</literal>에서 Log4j를 다운로드 할 수 있다. Log4j를 사용"
+#~ "하기 위해, 당신은 <literal>log4j.properties</literal> 파일을 당신의 "
+#~ "classpath 내에 위치지울 필요가 있을 것이고, 예제 properties 파일은 "
+#~ "Hibernate의 <literal>src/</literal> 디렉토리 내에 배포되어 있다."
+
 #~ msgid "<placeholder-1/> (optional)"
 #~ msgstr "<placeholder-1/> (옵션)"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:5
+#: events.xml:29
 #, no-c-format
 msgid "Interceptors and events"
 msgstr "인터셉터들과 이벤트들"
 
 #. Tag: para
-#: events.xml:7
-#, no-c-format
+#: events.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "어플리케이션이 Hibernate 내부에서 발생하는 어떤 이벤트들에 대해 반응하는 것"
 "에 흔히 유용하다. 이것은 어떤 종류의 일반적인 기능, 그리고 Hibernate의 확장 "
 "기능의 구현을 허용해준다."
 
 #. Tag: title
-#: events.xml:14
+#: events.xml:38
 #, no-c-format
 msgid "Interceptors"
 msgstr "인터셉터들"
 
 #. Tag: para
-#: events.xml:16
-#, no-c-format
+#: events.xml:40
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -58,17 +58,17 @@
 "literal> 프로퍼티를 업데이트 한다."
 
 #. Tag: para
-#: events.xml:27
-#, no-c-format
+#: events.xml:51
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "당신은 <literal>Interceptor</literal>를 직접 구현해야 하거나 (더 좋게는) "
 "<literal>EmptyInterceptor</literal>를 확장(extend)해야 한다."
 
 #. Tag: programlisting
-#: events.xml:32
+#: events.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
@@ -157,17 +157,17 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:34
-#, no-c-format
+#: events.xml:58
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "인터셉터들은 다음 두 개의 특징들로 나타난다: <literal>Session</literal>-영역"
 "화 그리고 <literal>SessionFactory</literal>-영역화."
 
 #. Tag: para
-#: events.xml:39
+#: events.xml:63
 #, no-c-format
 msgid ""
 "A <literal>Session</literal>-scoped interceptor is specified when a session "
@@ -179,23 +179,23 @@
 "openSession() 메소드들 중 하나를 사용하여 열릴 때 지정된다."
 
 #. Tag: programlisting
-#: events.xml:45
+#: events.xml:69
 #, no-c-format
 msgid "<![CDATA[Session session = sf.openSession( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: para
-#: events.xml:47
-#, no-c-format
+#: events.xml:71
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "<literal>SessionFactory</literal>-영역의 인터셉터는 <literal>SessionFactory</"
 "literal>을 빌드하기에 앞서 <literal>Configuration</literal> 객체에 등록된다. "
@@ -207,25 +207,25 @@
 "것이기 때문이다."
 
 #. Tag: programlisting
-#: events.xml:56
+#: events.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: title
-#: events.xml:61
+#: events.xml:85
 #, no-c-format
 msgid "Event system"
 msgstr "이벤트 시스템"
 
 #. Tag: para
-#: events.xml:63
-#, no-c-format
+#: events.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "만일 당신이 당신의 영속 계층에서 특정 이벤트들에 대해 반응해야 한다면, 당신"
 "은 또한 Hibernate3 <emphasis>event</emphasis> 아키텍처를 사용할 수도 있다. 이"
@@ -233,20 +233,20 @@
 "있다."
 
 #. Tag: para
-#: events.xml:69
-#, no-c-format
+#: events.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -266,28 +266,27 @@
 "이 있을 것이다."
 
 #. Tag: para
-#: events.xml:84
-#, no-c-format
+#: events.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "리스너들은 효율적이게끔 싱글톤(singleton)들로 간주되어야 할 것이다; 이것은 그"
 "것들이 요청들 사이에서 공유되고, 따라서 임의의 상태를 인스턴스 변수들로서 저"
 "장하지 말아야 함을 의미한다."
 
 #. Tag: para
-#: events.xml:89
-#, no-c-format
+#: events.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "맞춤형 리스너는 그것이 편의적인 기저 클래스들(또는 리스너들이 이 용도로 final"
@@ -299,7 +298,7 @@
 "다음은 맞춤형 load 이벤트 리스너에 대한 예제이다:"
 
 #. Tag: programlisting
-#: events.xml:99
+#: events.xml:123
 #, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
@@ -316,7 +315,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:101
+#: events.xml:125
 #, no-c-format
 msgid ""
 "You also need a configuration entry telling Hibernate to use the listener in "
@@ -326,7 +325,7 @@
 "주는 구성 엔트리를 필요로 한다:"
 
 #. Tag: programlisting
-#: events.xml:106
+#: events.xml:130
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
@@ -342,13 +341,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:108
-#, no-c-format
-msgid "Instead, you may register it programmatically:"
+#: events.xml:132
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "대신에 당신은 그것을 프로그래밍 방식으로 등록할 수도 있다:"
 
 #. Tag: programlisting
-#: events.xml:112
+#: events.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
@@ -358,14 +357,14 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:114
-#, no-c-format
+#: events.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "선언적으로 등록된 리스너들은 인스턴스들을 공유할 수 없다. 만일 동일한 클래스 "
 "이름이 여러 개의 <literal>&lt;listener/&gt;</literal> 요소들에서 사용될 경"
@@ -374,12 +373,12 @@
 "당신은 프로그래밍 방식의 등록 접근법을 사용해야 한다."
 
 #. Tag: para
-#: events.xml:122
-#, no-c-format
+#: events.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -389,19 +388,19 @@
 "전환시키는 것을 더 쉽게 해준다."
 
 #. Tag: title
-#: events.xml:132
+#: events.xml:156
 #, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Hibernate 선언적인 보안"
 
 #. Tag: para
-#: events.xml:133
-#, no-c-format
+#: events.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "대개 Hibernate 어플리케이션들에서 선언적인 보안은 session facade 계층 내에서 "
 "관리된다. 이제, Hibernate3는 어떤 액션들이 JACC를 통해 퍼미션을 주어지고, "
@@ -409,7 +408,7 @@
 "션 기능이다."
 
 #. Tag: para
-#: events.xml:139
+#: events.xml:163
 #, no-c-format
 msgid ""
 "First, you must configure the appropriate event listeners, to enable the use "
@@ -419,7 +418,7 @@
 "트 리스터들을 구성해야 한다."
 
 #. Tag: programlisting
-#: events.xml:144
+#: events.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
@@ -433,13 +432,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:146
-#, no-c-format
+#: events.xml:170
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "<literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal>는 특정 이벤"
 "트 타입에 대해 정확히 한 개의 리스너가 존재할 때 단지 <literal>&lt;event "
@@ -447,17 +446,17 @@
 "축형임을 노트하라."
 
 #. Tag: para
-#: events.xml:152
-#, no-c-format
+#: events.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "다음으로, 여전히 <literal>hibernate.cfg.xml</literal> 내에서 퍼미션들을 role"
 "들에 바인드 시킨다 :"
 
 #. Tag: programlisting
-#: events.xml:156
+#: events.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[<grant role=\"admin\" entity-name=\"User\" actions=\"insert,update,"
@@ -466,7 +465,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:158
+#: events.xml:182
 #, no-c-format
 msgid "The role names are the roles understood by your JACC provider."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,32 +11,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_mappings.xml:20
+#: example_mappings.xml:29
 #, no-c-format
 msgid "Example: Various Mappings"
 msgstr "예제: 여러 가지 매핑들"
 
 #. Tag: para
-#: example_mappings.xml:22
-#, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr "이 장은 몇몇 보다 복잡한 연관 매핑들을 보여준다."
 
 #. Tag: title
-#: example_mappings.xml:27
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employer/Employee"
 
 #. Tag: para
-#: example_mappings.xml:29
-#, no-c-format
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "<literal>Employer</literal>와 <literal>Employee</literal> 사이의 관계에 대한 "
 "다음 모형은 그 연관를 표현하는 데 실제 엔티티 클래스(<literal>Employment</"
@@ -45,13 +45,13 @@
 "화 시키는데 사용된다."
 
 #. Tag: para
-#: example_mappings.xml:46
-#, no-c-format
-msgid "Heres a possible mapping document:"
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "다음은 가능한 매핑 문서이다:"
 
 #. Tag: programlisting
-#: example_mappings.xml:50
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -107,16 +107,15 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:52
-#, no-c-format
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr ""
 "그리고 다음은 <literal>SchemaExport</literal>에 의해 생성된 테이블 스키마이"
 "다."
 
 #. Tag: programlisting
-#: example_mappings.xml:56
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -157,22 +156,22 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:61
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr "Author/Work"
 
 #. Tag: para
-#: example_mappings.xml:63
-#, no-c-format
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "<literal>Work</literal>, <literal>Author</literal> 그리고 <literal>Person</"
 "literal> 사이의 관계들에 대한 다음 모형을 검토하자. 우리는 <literal>Work</"
@@ -183,14 +182,14 @@
 "것이다."
 
 #. Tag: para
-#: example_mappings.xml:81
+#: example_mappings.xml:91
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr "다음 매핑 문서는 이들 관계들을 정확하게 표현한다:"
 
 #. Tag: programlisting
-#: example_mappings.xml:85
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -247,14 +246,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:87
-#, no-c-format
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "이 매핑에는 네 개의 테이블들이 존재한다. <literal>works</literal>, "
 "<literal>authors</literal>와 <literal>persons</literal>은 각각 작업 데이터, "
@@ -263,7 +262,7 @@
 "literal>에 의해 생성된 테이블 스키마이다."
 
 #. Tag: programlisting
-#: example_mappings.xml:95
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -304,24 +303,24 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:100
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Customer/Order/Product"
 
 #. Tag: para
-#: example_mappings.xml:102
-#, no-c-format
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "이제 <literal>Customer</literal>, <literal>Order</literal>와 "
 "<literal>LineItem</literal> 그리고 <literal>Product</literal> 사이의 관계들"
@@ -334,13 +333,13 @@
 "다."
 
 #. Tag: para
-#: example_mappings.xml:122
-#, no-c-format
-msgid "The mapping document:"
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "매핑 문서:"
 
 #. Tag: programlisting
-#: example_mappings.xml:126
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -383,7 +382,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:128
+#: example_mappings.xml:138
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -398,7 +397,7 @@
 "로서 동작한다."
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -438,37 +437,31 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:140
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "기타 예제 매핑들"
 
 #. Tag: para
-#: example_mappings.xml:142
-#, no-c-format
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "이들 예제들은 모두 Hiberante test suite로부터 취했다. 당신은 거기서 많은 다"
 "른 유용한 예제 매핑들을 발견할 것이다. Hibernate 배포본의 <literal>test</"
 "literal> 폴더를 살펴보라."
 
-#. Tag: para
-#: example_mappings.xml:148
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr "TODO: 이 내용을 둘러싼 말들을 집어넣을 것."
-
 #. Tag: title
-#: example_mappings.xml:151
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "\"형식화된(Typed)\" one-to-one 연관"
 
 #. Tag: programlisting
-#: example_mappings.xml:152
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -500,13 +493,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:156
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr "Composite 키 예제"
 
 #. Tag: programlisting
-#: example_mappings.xml:157
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -625,13 +618,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:161
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr "공유된 합성 키 속성을 가진 Many-to-many"
 
 #. Tag: programlisting
-#: example_mappings.xml:162
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -672,13 +665,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:166
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "내용 기반 판별"
 
 #. Tag: programlisting
-#: example_mappings.xml:167
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -734,13 +727,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:171
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "대체 키들에 대한 연관들"
 
 #. Tag: programlisting
-#: example_mappings.xml:172
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -793,3 +786,6 @@
 "    \n"
 "</class>]]>"
 msgstr ""
+
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "TODO: 이 내용을 둘러싼 말들을 집어넣을 것."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_parentchild.xml:5
+#: example_parentchild.xml:29
 #, no-c-format
 msgid "Example: Parent/Child"
 msgstr "예제: 부모/자식"
 
 #. Tag: para
-#: example_parentchild.xml:7
-#, no-c-format
+#: example_parentchild.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "새로운 사용자들이 Hibernate로 행하고자 시도하는 바로 첫 번째 것들 중 하나는 "
 "부모/자식 타입의 관계를 모형화 시키는 것이다. 이것에 대한 두 가지 다른 접근법"
@@ -50,39 +49,39 @@
 "다!"
 
 #. Tag: title
-#: example_parentchild.xml:21
+#: example_parentchild.xml:45
 #, no-c-format
 msgid "A note about collections"
 msgstr "콜렉션들에 관한 노트"
 
 #. Tag: para
-#: example_parentchild.xml:23
-#, no-c-format
+#: example_parentchild.xml:47
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Hibernate 콜렉션들은 그것들의 소유하고 있는 엔티티의 논리적 부분으로 간주된"
 "다; 결코 포함된 엔티티들의 부분이 아니다. 이것은 중대한 구분점이다! 그것은 다"
 "음은 다음 결과들을 갖는다:"
 
 #. Tag: para
-#: example_parentchild.xml:30
-#, no-c-format
+#: example_parentchild.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr ""
 "콜렉션으로부터 객체를 제거하고/콜렉션에 객체를 추가 시킬 때, 콜렉션 소유자의 "
 "버전 번호가 증가된다."
 
 #. Tag: para
-#: example_parentchild.xml:36
-#, no-c-format
+#: example_parentchild.xml:60
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -93,15 +92,14 @@
 "가시키는 것은 그것의 상태가 즉시 영속화 되도록 강제시킬 것이다."
 
 #. Tag: para
-#: example_parentchild.xml:44
-#, no-c-format
+#: example_parentchild.xml:68
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "반면에, 만일 엔티티가 콜렉션으로부터 제거될 경우(one-to-many 또는 many-to-"
 "many 연관), 그것은 디폴트로 삭제되지 않을 것이다. 이 특징은 완전하게 일관적이"
@@ -110,14 +108,14 @@
 "티가 영속화 되도록 강제시키지 않는다."
 
 #. Tag: para
-#: example_parentchild.xml:54
-#, no-c-format
+#: example_parentchild.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "대신에 콜렉션으로의 엔티티 추가가 두 엔티티들 사이에 단지 하나의 링크를 생성"
 "시키는 반면에, 그것을 제거하는 것은 링크를 제거한다는 점이 디폴트 특징이다. "
@@ -126,13 +124,13 @@
 "있다."
 
 #. Tag: title
-#: example_parentchild.xml:64
+#: example_parentchild.xml:88
 #, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr "양방향 one-to-many"
 
 #. Tag: para
-#: example_parentchild.xml:66
+#: example_parentchild.xml:90
 #, no-c-format
 msgid ""
 "Suppose we start with a simple <literal>&lt;one-to-many&gt;</literal> "
@@ -142,7 +140,7 @@
 "<literal>&lt;one-to-many&gt;</literal> 연관관계로 시작한다고 가정하자."
 
 #. Tag: programlisting
-#: example_parentchild.xml:71
+#: example_parentchild.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -152,13 +150,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:73
-#, no-c-format
-msgid "If we were to execute the following code"
+#: example_parentchild.xml:97
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "우리가 다음 코드를 실행시켰다면"
 
 #. Tag: programlisting
-#: example_parentchild.xml:77
+#: example_parentchild.xml:101
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = .....;\n"
@@ -169,13 +167,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:79
+#: example_parentchild.xml:103
 #, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr "Hibernate는 두 개의 SQL 문장들을 실행할 것이다:"
 
 #. Tag: para
-#: example_parentchild.xml:85
+#: example_parentchild.xml:109
 #, no-c-format
 msgid ""
 "an <literal>INSERT</literal> to create the record for <literal>c</literal>"
@@ -183,7 +181,7 @@
 "<literal>c</literal>에 대한 레코드를 생성시키는 <literal>INSERT</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:88
+#: example_parentchild.xml:112
 #, no-c-format
 msgid ""
 "an <literal>UPDATE</literal> to create the link from <literal>p</literal> to "
@@ -193,11 +191,11 @@
 "<literal>UPDATE</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:95
-#, no-c-format
+#: example_parentchild.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -207,7 +205,7 @@
 "트레인트 위반을 정정할 수 있다:"
 
 #. Tag: programlisting
-#: example_parentchild.xml:101
+#: example_parentchild.xml:125
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -217,19 +215,19 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:103
+#: example_parentchild.xml:127
 #, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr "하지만 이것은 권장되는 해결책이 아니다."
 
 #. Tag: para
-#: example_parentchild.xml:106
-#, no-c-format
+#: example_parentchild.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "이 행위의 기본 원인은 <literal>p</literal>로부터 <literal>c</literal>로의 링"
@@ -239,7 +237,7 @@
 "을 만드는 것이다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:113
+#: example_parentchild.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"parent\" column=\"parent_id\" not-null=\"true\"/"
@@ -247,29 +245,29 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:115
-#, no-c-format
+#: example_parentchild.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(우리는 또한 <literal>parent</literal> 프로퍼티를 <literal>Child</literal> 클"
 "래스에 추가시킬 필요가 있다.)"
 
 #. Tag: para
-#: example_parentchild.xml:119
-#, no-c-format
+#: example_parentchild.xml:143
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "이제 <literal>Child</literal> 엔티티가 링크의 상태를 관리한다는 점을 노트하"
 "고, 우리는 링크를 업데이트 시키지 말도록 콜렉션에게 통보한다. 우리는 "
 "<literal>inverse</literal> 속성을 사용한다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:124
+#: example_parentchild.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
@@ -279,14 +277,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:126
-#, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#: example_parentchild.xml:150
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr ""
 "다음 코드는 새로운 <literal>Child</literal>를 추가시키는데 사용될 것이다"
 
 #. Tag: programlisting
-#: example_parentchild.xml:130
+#: example_parentchild.xml:154
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -298,24 +296,24 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:132
-#, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#: example_parentchild.xml:156
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr ""
 "그리고 이제, 유일하게 한 개의 SQL <literal>INSERT</literal>가 실행될 것이다!"
 
 #. Tag: para
-#: example_parentchild.xml:136
-#, no-c-format
+#: example_parentchild.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "약간 거칠게, 우리는 <literal>Parent</literal>의 <literal>addChild()</"
 "literal> 메소드를 생성시킬 수 있다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:141
+#: example_parentchild.xml:165
 #, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
@@ -325,13 +323,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:143
-#, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#: example_parentchild.xml:167
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr "이제, <literal>Child</literal>를 추가하는 코드는 다음과 같다"
 
 #. Tag: programlisting
-#: example_parentchild.xml:147
+#: example_parentchild.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -342,23 +340,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_parentchild.xml:152
+#: example_parentchild.xml:176
 #, no-c-format
 msgid "Cascading life cycle"
 msgstr "케스케이딩 생명주기"
 
 #. Tag: para
-#: example_parentchild.xml:154
-#, no-c-format
+#: example_parentchild.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "<literal>save()</literal>에 대한 명시적인 호출은 여전히 성가시다. 우리는 케스"
 "케이딩을 사용하여 이것을 얘기할 것이다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:159
+#: example_parentchild.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
@@ -368,13 +366,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:161
-#, no-c-format
-msgid "This simplifies the code above to"
+#: example_parentchild.xml:185
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "다음은 위의 코드를 단순화 시킨다"
 
 #. Tag: programlisting
-#: example_parentchild.xml:165
+#: example_parentchild.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -384,10 +382,10 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:167
-#, no-c-format
+#: example_parentchild.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -396,7 +394,7 @@
 "literal>와 모든 그것의 자식들을 제거시킨다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:172
+#: example_parentchild.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -405,13 +403,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:174
-#, no-c-format
-msgid "However, this code"
+#: example_parentchild.xml:198
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "하지만, 다음 코드"
 
 #. Tag: programlisting
-#: example_parentchild.xml:178
+#: example_parentchild.xml:202
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -422,12 +420,12 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:180
-#, no-c-format
+#: example_parentchild.xml:204
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "는 데이터베이스로부터 <literal>c</literal>를 제거하지 않을 것이다; 그것은 오"
@@ -437,7 +435,7 @@
 "다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:186
+#: example_parentchild.xml:210
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -448,13 +446,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:188
-#, no-c-format
+#: example_parentchild.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "이제 우리의 경우에 <literal>Child</literal>는 그것의 부모 없이는 진정으로 존"
 "재할 수 없다. 따라서 만일 우리가 콜렉션으로부터 하나의 <literal>Child</"
@@ -462,7 +460,7 @@
 "리는 <literal>cascade=\"all-delete-orphan\"</literal>을 사용해야 한다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:194
+#: example_parentchild.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all-delete-orphan"
@@ -473,14 +471,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:196
-#, no-c-format
+#: example_parentchild.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "노트: 비록 콜렉션 매핑이 <literal>inverse=\"true\"</literal>를 지정할 지라"
 "도, 케스케이드들은 여전히 콜렉션 요소들을 반복함으로써 처리된다. 따라서 객체"
@@ -489,27 +487,28 @@
 "</literal>를 호출하는 것으로는 충분하지 않다."
 
 #. Tag: title
-#: example_parentchild.xml:206
+#: example_parentchild.xml:230
 #, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr "케스케이드들과 <literal>unsaved-value</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:208
-#, no-c-format
+#: example_parentchild.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "우리가 하나의 <literal>Session</literal> 속에 <literal>Parent</literal>를 로"
 "드시켰고 UI 액션에서 어떤 변경들을 행했고, <literal>update()</literal>를 호출"
@@ -525,17 +524,17 @@
 "로 지정할 필요가 없다.</emphasis>"
 
 #. Tag: para
-#: example_parentchild.xml:220
-#, no-c-format
+#: example_parentchild.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "다음 코드는 <literal>parent</literal>와 <literal>child</literal>를 업데이트하"
 "고 <literal>newChild</literal>를 삽입시킬 것이다."
 
 #. Tag: programlisting
-#: example_parentchild.xml:225
+#: example_parentchild.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[//parent and child were both loaded in a previous session\n"
@@ -547,17 +546,16 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:227
-#, no-c-format
+#: example_parentchild.xml:251
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "물론 그것은 생성되는 식별자의 경우에는 모두 매우 좋지만, 할당되는 식별자들과 "
 "composite 식별자들에 대해서는 어떠한가? 이것은 보다 어렵다. 왜냐하면 "
@@ -568,32 +566,32 @@
 "존재하는지를 알기 위해 데이터베이스를 질의할 것이다."
 
 #. Tag: title
-#: example_parentchild.xml:260
+#: example_parentchild.xml:284
 #, no-c-format
 msgid "Conclusion"
 msgstr "결론"
 
 #. Tag: para
-#: example_parentchild.xml:262
-#, no-c-format
+#: example_parentchild.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "여기에 숙지할 것이 약간 있고 그것은 처음에는 혼동스러운 것처럼 보일 수 있다. "
 "하지만 실제로 그것은 모두 매우 좋게 동작한다. 대부분의 Hibernate 어플리케이션"
 "들은 많은 장소들에서 부모/자식 패턴을 사용한다."
 
 #. Tag: para
-#: example_parentchild.xml:267
-#, no-c-format
+#: example_parentchild.xml:291
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "우리는 첫 번째 단락에서 대안을 언급했다. 위의 쟁점들 중 어느 것도 정확하게 부"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,31 +11,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_weblog.xml:5
+#: example_weblog.xml:29
 #, no-c-format
 msgid "Example: Weblog Application"
 msgstr "예제: Weblog 어플리케이션"
 
 #. Tag: title
-#: example_weblog.xml:8
+#: example_weblog.xml:32
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "영속 클래스들"
 
 #. Tag: para
-#: example_weblog.xml:10
-#, no-c-format
+#: example_weblog.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "영속 클래스들은 웹로그, 그리고 웹 로그 내에 게시된 항목을 표현한다.그것들은 "
 "표준 부모/자식 관계로 모형화 될 것이지만, 우리는 set 대신에 순서지워진 bag를 "
 "사용할 것이다."
 
 #. Tag: programlisting
-#: example_weblog.xml:16
+#: example_weblog.xml:40
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -69,7 +69,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:18
+#: example_weblog.xml:42
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -118,19 +118,19 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:23
+#: example_weblog.xml:47
 #, no-c-format
 msgid "Hibernate Mappings"
 msgstr "Hibernate 매핑들"
 
 #. Tag: para
-#: example_weblog.xml:25
-#, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+#: example_weblog.xml:49
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "XML 매핑들은 이제 매우 간단해질 것이다."
 
 #. Tag: programlisting
-#: example_weblog.xml:29
+#: example_weblog.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:31
+#: example_weblog.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -224,23 +224,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:36
+#: example_weblog.xml:60
 #, no-c-format
 msgid "Hibernate Code"
 msgstr "Hibernate 코드"
 
 #. Tag: para
-#: example_weblog.xml:38
-#, no-c-format
+#: example_weblog.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr ""
 "다음 클래스는 우리가 Hibernate를 사용하여 이들 클래스들로 행할 수 있는 몇몇 "
 "종류의 것들을 설명한다."
 
 #. Tag: programlisting
-#: example_weblog.xml:43
+#: example_weblog.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,18 +11,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: filters.xml:5
+#: filters.xml:29
 #, no-c-format
 msgid "Filtering data"
 msgstr "데이터 필터링하기"
 
 #. Tag: para
-#: filters.xml:7
-#, no-c-format
+#: filters.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "Hibernate3은 혁신적인 \"가시성(visibility)\" 규칙들로서 데이터를 처리하는 새"
@@ -31,23 +31,23 @@
 "라미터화 된 필터이다."
 
 #. Tag: title
-#: filters.xml:14
+#: filters.xml:38
 #, no-c-format
 msgid "Hibernate filters"
 msgstr "Hibernate 필터들"
 
 #. Tag: para
-#: filters.xml:16
-#, no-c-format
+#: filters.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "Hibernate3은 필터 기준(criteria)을 미리 정의하고 클래스 레벨과 콜렉션 레벨 양"
 "자에서 그들 필터들을 첨부할 능력을 추가시킨다. 필터 기준(criteria)은 클래스 "
@@ -59,7 +59,7 @@
 "화 된다."
 
 #. Tag: para
-#: filters.xml:26
+#: filters.xml:50
 #, no-c-format
 msgid ""
 "In order to use filters, they must first be defined and then attached to the "
@@ -72,7 +72,7 @@
 "literal> 요소 내부에 <literal>&lt;filter-def/&gt;</literal> 요소를 사용하라:"
 
 #. Tag: programlisting
-#: filters.xml:32
+#: filters.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\">\n"
@@ -81,13 +81,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:34
-#, no-c-format
-msgid "Then, this filter can be attached to a class:"
+#: filters.xml:58
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "그때 이 필터는 클래스에 첨가될 수 있다:"
 
 #. Tag: programlisting
-#: filters.xml:38
+#: filters.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"myClass\" ...>\n"
@@ -98,13 +98,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:40
-#, no-c-format
-msgid "or, to a collection:"
+#: filters.xml:64
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "또는 콜렉션에 첨가될 수 있다:"
 
 #. Tag: programlisting
-#: filters.xml:44
+#: filters.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
@@ -114,23 +114,23 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:46
-#, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+#: filters.xml:70
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr "또는 동시에 양자에(또는 각각의 여러번) 첨가될 수 있다."
 
 #. Tag: para
-#: filters.xml:50
-#, no-c-format
+#: filters.xml:74
+#, fuzzy, no-c-format
 msgid ""
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enabledFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "<literal>Session</literal> 상의 메소드들은 다음과 같다: <literal>enableFilter"
 "(String filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
@@ -142,7 +142,7 @@
 "한 필터를 사용하면, 이것은 다음과 같을 것이다:"
 
 #. Tag: programlisting
-#: filters.xml:59
+#: filters.xml:83
 #, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
@@ -150,24 +150,25 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:61
-#, no-c-format
+#: filters.xml:85
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "org.hibernate.Filter 인터페이스 상의 메소드들은 Hibernate에 매우 공통된 "
 "method-chaining을 허용한다는 점을 노트하라."
 
 #. Tag: para
-#: filters.xml:65
-#, no-c-format
+#: filters.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr "유효한 기록 날짜 패턴을 가진 시간 데이터를 사용하는 전체 예제 :"
 
 #. Tag: programlisting
-#: filters.xml:69
+#: filters.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"effectiveDate\">\n"
@@ -205,18 +206,17 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:71
-#, no-c-format
+#: filters.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "그때 당신이 현재 유효한 레코드들을 항상 얻는 것을 확실히 하기 위해, employee "
 "데이터를 검색하기 전에 세션 상에 필터를 간단하게 이용 가능하게 하라:"
 
 #. Tag: programlisting
-#: filters.xml:76
+#: filters.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
@@ -230,26 +230,26 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:78
-#, no-c-format
+#: filters.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "위의 HQL 에서, 심지어 비록 우리가 결과들에 대한 봉급 컨스트레인트를 명시적으"
 "로 언급만 했을지라도, 이용 가능한 필터 때문에 그 질의는 봉급이 백만달러 이상"
 "인 현재 채용중인 직원들만을 반환할 것이다."
 
 #. Tag: para
-#: filters.xml:84
-#, no-c-format
+#: filters.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "노트: 만일 당신이 outer 조인에 대해 필터들을 사용할 계획이라면 (HQL이든 로드 "
 "페칭이든) 조건 표현식의 방향을 주의하라. 이것을 left outer join으로 설정하는 "
@@ -257,14 +257,14 @@
 "첫번째에 파라미터를 위치지워라."
 
 #. Tag: para
-#: filters.xml:91
-#, no-c-format
+#: filters.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr ""
 "필터가 정의된 후에는 그것 자신의 조건에 대해 각각 여러 개의 엔티티들 그리고/"
 "또는 콜렉션들에 첨가될 수 있다. 조건들이 매번 동일할 때 그것은 지루할 수 있"
@@ -272,7 +272,7 @@
 "느것이든 디폴트 조건을 정의하는 것을 허용해준다:"
 
 #. Tag: programlisting
-#: filters.xml:98
+#: filters.xml:122
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
@@ -281,13 +281,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:100
-#, no-c-format
+#: filters.xml:124
+#, fuzzy, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""
 "그때 이 디폴트 조건은 그 필터가 어떤 조건을 지정함이 없이 어떤 것에 첨가될때"
 "마다 사용될 수 있다. 이것은 당신이 특정한 경우에 디폴트 조건을 오버라이드 시"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,43 +11,43 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: inheritance_mapping.xml:5
-#, no-c-format
-msgid "Inheritance Mapping"
+#: inheritance_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "상속 매핑"
 
 #. Tag: title
-#: inheritance_mapping.xml:8
-#, no-c-format
-msgid "The Three Strategies"
+#: inheritance_mapping.xml:32
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "세 가지 방도들"
 
 #. Tag: para
-#: inheritance_mapping.xml:10
+#: inheritance_mapping.xml:34
 #, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr "Hibernate는 세 가지 기본적인 상속 매핑 방도들을 지원한다:"
 
 #. Tag: para
-#: inheritance_mapping.xml:16
+#: inheritance_mapping.xml:40
 #, no-c-format
 msgid "table per class hierarchy"
 msgstr "table per class hierarchy"
 
 #. Tag: para
-#: inheritance_mapping.xml:21
+#: inheritance_mapping.xml:45
 #, fuzzy, no-c-format
 msgid "<para>table per subclass</para>"
 msgstr "table per subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:26
+#: inheritance_mapping.xml:50
 #, no-c-format
 msgid "table per concrete class"
 msgstr "table per concrete class"
 
 #. Tag: para
-#: inheritance_mapping.xml:32
+#: inheritance_mapping.xml:56
 #, no-c-format
 msgid ""
 "In addition, Hibernate supports a fourth, slightly different kind of "
@@ -55,25 +55,25 @@
 msgstr "게다가 Hibernate는 네 번째의 약간 다른 종류의 다형성을 지원한다:"
 
 #. Tag: para
-#: inheritance_mapping.xml:39
+#: inheritance_mapping.xml:63
 #, no-c-format
 msgid "implicit polymorphism"
 msgstr "implicit polymorphism(함축적인 다형성)"
 
 #. Tag: para
-#: inheritance_mapping.xml:45
-#, no-c-format
+#: inheritance_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "동일한 상속 계층구조의 다른 가지들에 대해 다른 매핑 방도들을 사용하는 것이 가"
 "능하고, 그런 다음 전체 계층 구조를 가로질러 다형성을 성취하는데 함축적인 다형"
@@ -86,19 +86,19 @@
 "도와 table per subclass 방도를 함께 혼합시키는 것이 가능하다(아래를 보라)."
 
 #. Tag: para
-#: inheritance_mapping.xml:59
-#, no-c-format
+#: inheritance_mapping.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "별도의 매핑 문서 내에, <literal>hibernate-mapping</literal> 바로 밑에 "
 "<literal>subclass</literal>, <literal>union-subclass</literal>, 그리고 "
@@ -111,7 +111,7 @@
 "여전히 서브클래스들에 앞서 슈퍼클래스들을 정의하는데 여전히 필요하다."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:70
+#: inheritance_mapping.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -124,19 +124,19 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:74
+#: inheritance_mapping.xml:98
 #, no-c-format
 msgid "Table per class hierarchy"
 msgstr "Table per class hierarchy"
 
 #. Tag: para
-#: inheritance_mapping.xml:76
-#, no-c-format
+#: inheritance_mapping.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "우리가 <literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
 "<literal>ChequePayment</literal> 구현자들을 가진 하나의 인터페이스 "
@@ -144,7 +144,7 @@
 "은 다음과 같을 것이다:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:83
+#: inheritance_mapping.xml:107
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -168,31 +168,31 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:85
-#, no-c-format
+#: inheritance_mapping.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "정확히 하나의 테이블이 필요하다. 이 매핑 방도에는 다음의 하나의 큰 제약이 존"
 "재한다: <literal>CCTYPE</literal>과 같이, 서브 클래스들에 의해 선언된 컬럼들"
 "은 <literal>NOT NULL</literal> 컨스트레인트들을 가질 수 없다."
 
 #. Tag: title
-#: inheritance_mapping.xml:94
+#: inheritance_mapping.xml:118
 #, no-c-format
 msgid "Table per subclass"
 msgstr "Table per subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:96
-#, no-c-format
-msgid "A table per subclass mapping would look like:"
+#: inheritance_mapping.xml:120
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "table per subclass 매핑은 다음과 같을 것이다:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:100
+#: inheritance_mapping.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -218,35 +218,35 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:102
-#, no-c-format
+#: inheritance_mapping.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "네 개의 테이블들이 필요하다. 세 개의 서브클래스 테이블들은 슈퍼클래스 테이블"
 "에 대한 프라이머리 키 연관들을 갖는다 (따라서 그 관계형 모형은 실제로 one-to-"
 "one 연관이다)."
 
 #. Tag: title
-#: inheritance_mapping.xml:111
-#, no-c-format
-msgid "Table per subclass, using a discriminator"
+#: inheritance_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "discriminator를 사용하는, table per subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:113
-#, no-c-format
+#: inheritance_mapping.xml:137
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "table-per-subclass에 대한 Hibernate의 구현은 discriminator(판별자) 컬럼을 필"
 "요로 하지 않음을 노트하라. 다른 객체/관계형 매핑기들은 슈퍼클래스 테이블 속"
@@ -258,7 +258,7 @@
 "용을 결합시킬 수도 있다:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:125
+#: inheritance_mapping.xml:149
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -291,7 +291,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:127
+#: inheritance_mapping.xml:151
 #, no-c-format
 msgid ""
 "The optional <literal>fetch=\"select\"</literal> declaration tells Hibernate "
@@ -303,23 +303,23 @@
 "치시키지 않도록 Hibernate에게 알려준다."
 
 #. Tag: title
-#: inheritance_mapping.xml:136
+#: inheritance_mapping.xml:160
 #, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr "table per class hierarchy와 table per subclass를 혼합하기"
 
 #. Tag: para
-#: inheritance_mapping.xml:138
-#, no-c-format
+#: inheritance_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "당신은 이 접근법을 사용하여 table per hierarchy 방도와 table per subclass 방"
 "도를 혼합시킬 수 있다:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:143
+#: inheritance_mapping.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -345,7 +345,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:145
+#: inheritance_mapping.xml:169
 #, no-c-format
 msgid ""
 "For any of these mapping strategies, a polymorphic association to the root "
@@ -357,7 +357,7 @@
 "매핑된다."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:151
+#: inheritance_mapping.xml:175
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"payment\" column=\"PAYMENT_ID\" class=\"Payment"
@@ -365,24 +365,24 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:156
+#: inheritance_mapping.xml:180
 #, no-c-format
 msgid "Table per concrete class"
 msgstr "Table per concrete class"
 
 #. Tag: para
-#: inheritance_mapping.xml:158
-#, no-c-format
+#: inheritance_mapping.xml:182
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "우리가 table per concrete class 방도 매핑에 대해 취할 수 있는 두 가지 방법들"
 "이 존재한다. 첫 번째는 <literal>&lt;union-subclass&gt;</literal>를 사용하는 "
 "것이다."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:163
+#: inheritance_mapping.xml:187
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\">\n"
@@ -405,7 +405,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:165
+#: inheritance_mapping.xml:189
 #, no-c-format
 msgid ""
 "Three tables are involved for the subclasses. Each table defines columns for "
@@ -415,14 +415,14 @@
 "퍼티들을 포함하여, 그 클래스의 모든 프로퍼티들에 대한 컬럼들을 정의한다."
 
 #. Tag: para
-#: inheritance_mapping.xml:170
-#, no-c-format
+#: inheritance_mapping.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "이 접근법의 제약은 만일 하나의 프로퍼티가 슈퍼클래스 상으로 매핑될 경우, 그 "
 "컬럼 이름이 모든 서브클래스 테이블들 상에서 같아야 한다는 점이다.(장래의 "
@@ -431,13 +431,13 @@
 "계층구조의 모든 unioned 서브클래스들을 가로질러 공유되어야 한다."
 
 #. Tag: para
-#: inheritance_mapping.xml:179
-#, no-c-format
+#: inheritance_mapping.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "만일 당신의 슈퍼클래스가 abstract일 경우에, 그것을 <literal>abstract=\"true"
 "\"</literal>로 매핑하라. 물론 만일 그것이 abstract가 아닐 경우, 추가적인 테이"
@@ -445,19 +445,19 @@
 "스들을 소유하는데 필요하다."
 
 #. Tag: title
-#: inheritance_mapping.xml:189
-#, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+#: inheritance_mapping.xml:213
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "함축적인 다형성을 사용하는, table per concrete class"
 
 #. Tag: para
-#: inheritance_mapping.xml:191
+#: inheritance_mapping.xml:215
 #, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr "대안적인 접근법은 함축적인 다형성을 사용하는 것이다:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:195
+#: inheritance_mapping.xml:219
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -486,15 +486,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:197
-#, no-c-format
+#: inheritance_mapping.xml:221
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "어느 곳에서도 우리가 명시적으로 <literal>Payment</literal> 인터페이스를 언급"
 "하지 않음을 주목하라. 또한 <literal>Payment</literal>의 프로퍼티들이 서브클래"
@@ -505,7 +505,7 @@
 "literal>)."
 
 #. Tag: para
-#: inheritance_mapping.xml:207
+#: inheritance_mapping.xml:231
 #, no-c-format
 msgid ""
 "The disadvantage of this approach is that Hibernate does not generate SQL "
@@ -515,7 +515,7 @@
 "<literal>UNION</literal>들을 생성시키는 않는다는 점이다."
 
 #. Tag: para
-#: inheritance_mapping.xml:212
+#: inheritance_mapping.xml:236
 #, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
@@ -525,7 +525,7 @@
 "대개 <literal>&lt;any&gt;</literal>를 사용하여 매핑된다."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:217
+#: inheritance_mapping.xml:241
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"payment\" meta-type=\"string\" id-type=\"long\">\n"
@@ -538,21 +538,20 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:222
+#: inheritance_mapping.xml:246
 #, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr "함축적인 다형성을 다른 상속 매핑들과 혼합하기"
 
 #. Tag: para
-#: inheritance_mapping.xml:224
-#, no-c-format
+#: inheritance_mapping.xml:248
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "이 매핑에 대해 주목할 하나 이상의 것이 존재한다. 서브클래스들이 그것들 자신의"
 "<literal>&lt;class&gt;</literal> 요소 내에 각각 매핑되므로(그리고 "
@@ -561,7 +560,7 @@
 "literal> 인터페이스에 대해 여전히 다형성 질의들을 사용할 수 있다.)"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:232
+#: inheritance_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -594,15 +593,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:234
-#, no-c-format
+#: inheritance_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "다시 한번, 우리는 <literal>Payment</literal>를 명시적으로 언급하지 않는다. 만"
@@ -614,26 +613,25 @@
 "<literal>NonelectronicTransaction</literal>의 인스턴스들을 반환하지 않는다."
 
 #. Tag: title
-#: inheritance_mapping.xml:249
+#: inheritance_mapping.xml:273
 #, no-c-format
 msgid "Limitations"
 msgstr "제약들"
 
 #. Tag: para
-#: inheritance_mapping.xml:251
-#, no-c-format
+#: inheritance_mapping.xml:275
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "table per concrete-class 매핑 방도에 대한 \"함축적인 다형성\" 접근법에는 어"
 "떤 제약들이 존재한다. <literal>&lt;union-subclass&gt;</literal> 매핑들에 대해"
 "서는 다소 덜 제한적인 제약들이 존재한다:"
 
 #. Tag: para
-#: inheritance_mapping.xml:258
+#: inheritance_mapping.xml:282
 #, no-c-format
 msgid ""
 "The following table shows the limitations of table per concrete-class "
@@ -643,140 +641,140 @@
 "고 함축적인 다형성에 대한 제약들을 보여준다."
 
 #. Tag: title
-#: inheritance_mapping.xml:264
+#: inheritance_mapping.xml:288
 #, no-c-format
 msgid "Features of inheritance mappings"
 msgstr "상속 매핑들의 특징들"
 
 #. Tag: entry
-#: inheritance_mapping.xml:276
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "상속 방도"
 
 #. Tag: entry
-#: inheritance_mapping.xml:277
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "다형성 다대일"
 
 #. Tag: entry
-#: inheritance_mapping.xml:278
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "다형성 일대일"
 
 #. Tag: entry
-#: inheritance_mapping.xml:279
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "다형성 일대다"
 
 #. Tag: entry
-#: inheritance_mapping.xml:280
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "다형성 다대다"
 
 #. Tag: entry
-#: inheritance_mapping.xml:281
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:282
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "다형성 질의들"
 
 #. Tag: entry
-#: inheritance_mapping.xml:283
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "다형성 조인들"
 
 #. Tag: entry
-#: inheritance_mapping.xml:284
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "Outer 조인 페칭"
 
 #. Tag: entry
-#: inheritance_mapping.xml:289
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "table per class-hierarchy"
 
 #. Tag: literal
-#: inheritance_mapping.xml:290 inheritance_mapping.xml:301
-#: inheritance_mapping.xml:312
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:291 inheritance_mapping.xml:302
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:292 inheritance_mapping.xml:303
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:293 inheritance_mapping.xml:304
-#: inheritance_mapping.xml:315
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:294 inheritance_mapping.xml:305
-#: inheritance_mapping.xml:316
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:295 inheritance_mapping.xml:306
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
 #. Tag: literal
-#: inheritance_mapping.xml:296 inheritance_mapping.xml:307
-#: inheritance_mapping.xml:318
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:297 inheritance_mapping.xml:308
-#: inheritance_mapping.xml:319
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr "지원됨"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:325
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr "table per subclass"
 
 #. Tag: entry
-#: inheritance_mapping.xml:311
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "table per concrete-class (union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:314
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -784,32 +782,32 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:322
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "table per concrete class (implicit polymorphism)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:323
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:324 inheritance_mapping.xml:325
-#: inheritance_mapping.xml:329 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, no-c-format
 msgid "not supported"
 msgstr "지원되지 않음"
 
 #. Tag: literal
-#: inheritance_mapping.xml:326
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:327
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: performance.xml:5
+#: performance.xml:29
 #, no-c-format
 msgid "Improving performance"
 msgstr "퍼포먼스 개선하기"
 
 #. Tag: title
-#: performance.xml:8
+#: performance.xml:32
 #, no-c-format
 msgid "Fetching strategies"
 msgstr "페칭 방도들"
 
 #. Tag: para
-#: performance.xml:10
-#, no-c-format
+#: performance.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "<emphasis>페칭 방도</emphasis>는 어플리케이션이 연관을 네비게이트할 필요가 있"
 "을 때 Hibernate가 연관된 객체들을 검색하는데 사용하게 될 방도이다.페치 방도들"
@@ -37,16 +37,16 @@
 "<literal>Criteria</literal> 질의에 의해 오버라이드 될 수도 있다."
 
 #. Tag: para
-#: performance.xml:17
+#: performance.xml:41
 #, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr "Hibernate3는 다음 페칭 방도들을 정의한다:"
 
 #. Tag: para
-#: performance.xml:23
-#, no-c-format
+#: performance.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -55,13 +55,13 @@
 "을 검색한다."
 
 #. Tag: para
-#: performance.xml:30
-#, no-c-format
+#: performance.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>Select 페칭</emphasis> - 두 번째 <literal>SELECT</literal>는 연과"
 "된 엔티티 또는 콜렉션을 검색하는데 사용된다. 당신이 <literal>lazy=\"false\"</"
@@ -69,14 +69,14 @@
 "이 두 번째 select는 당신이 그 연관에 실제로 액세스할 때 오직 실행될 것이다."
 
 #. Tag: para
-#: performance.xml:39
-#, no-c-format
+#: performance.xml:63
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>Subselect 페칭</emphasis> - 두 번째 <literal>SELECT</literal>는 이"
 "전 질의 또는 페치에서 검색된 모든 엔티티들에 대해 연관된 콜렉션들을 검색하는"
@@ -85,12 +85,12 @@
 "그 연관에 접근할 때 오직 실행될 것이다."
 
 #. Tag: para
-#: performance.xml:48
-#, no-c-format
+#: performance.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>Batch 페칭</emphasis> - select 페칭을 위한 최적화 방도 - Hibernate"
@@ -99,51 +99,51 @@
 "를 검색한다."
 
 #. Tag: para
-#: performance.xml:57
+#: performance.xml:81
 #, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "Hibernate는 또한 다음 사이를 구별 짓는다:"
 
 #. Tag: para
-#: performance.xml:63
-#, no-c-format
+#: performance.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>즉각적인 페칭</emphasis> - 소유자가 로드될 때, 연관, 콜렉션 또는 속"
 "성이 즉시 페치된다."
 
 #. Tag: para
-#: performance.xml:69
-#, no-c-format
+#: performance.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>Lazy 콜렉션 페칭</emphasis> - 어플리케이션이 그 콜렉션에 대해 하나"
 "의 오퍼레이션을 호출할 때 콜렉션이 페치된다.(이것은 콜렉션들에 대해 디폴트이"
 "다.)"
 
 #. Tag: para
-#: performance.xml:76
-#, no-c-format
+#: performance.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>\"Extra-lazy\" 콜렉션 페칭</emphasis> - 콜렉션의 개별 요소들은 필요"
 "할 때 데이터베이스로부터 접근된다. Hibernate는 절대적으로 필요하지 않은 한 전"
 "체 콜렉션을 메모리 내로 페치하려고 시도하지 않는다(매우 큰 콜렉션에 적합함)"
 
 #. Tag: para
-#: performance.xml:84
-#, no-c-format
+#: performance.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -151,15 +151,15 @@
 "객체에 대해 호출될 때 단일 값 연관이 페치된다."
 
 #. Tag: para
-#: performance.xml:91
-#, no-c-format
+#: performance.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>\"No-proxy\" 페칭</emphasis> - 인스턴스 변수가 접근될 때 단일 값 연"
 "관이 페치된다. 프락시 페칭과 비교할 때, 이 접근법은 다소 덜 lazy하지만(그 연"
@@ -168,10 +168,10 @@
 "코드 수단을 필요로 하며 드물게 필요하다."
 
 #. Tag: para
-#: performance.xml:101
-#, no-c-format
+#: performance.xml:125
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -180,14 +180,15 @@
 "게 필요하다."
 
 #. Tag: para
-#: performance.xml:110
-#, no-c-format
+#: performance.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "우리는 여기서 두 개의 직교하는 개념들을 갖는다: 연관이 페치될 <emphasis>때</"
 "emphasis>, 그리고 그것이 페치되는 <emphasis>방법</emphasis>(사용되는 SQL). 그"
@@ -197,31 +198,30 @@
 "할 수 있다."
 
 #. Tag: title
-#: performance.xml:119
+#: performance.xml:143
 #, no-c-format
 msgid "Working with lazy associations"
 msgstr "lazy 연관들로 작업하기"
 
 #. Tag: para
-#: performance.xml:121
-#, no-c-format
+#: performance.xml:145
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "디폴트로 Hibernate3는 콜렉션들에 대해 lazy select 페칭을 사용하고, 단일 값 연"
 "관들에 대해 lazy 프락시 페칭을 사용한다. 이들 디폴트들은 거의 모든 어플리케이"
 "션들에서 거의 모든 연관들에 대해 유의미하다."
 
 #. Tag: para
-#: performance.xml:127
-#, no-c-format
+#: performance.xml:151
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>노트:</emphasis> 만일 당신이 <literal>hibernate."
 "default_batch_fetch_size</literal>를 설정하는 경우, Hibernate는 lazy 페칭을 "
@@ -229,19 +229,18 @@
 "에서 이용 가능할 수 있다)."
 
 #. Tag: para
-#: performance.xml:134
-#, no-c-format
+#: performance.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "하지만, lazy 페칭은 당신이 알고 있어야 하는 한 가지 문제를 제기한다. 열려진 "
 "Hibernate 세션 컨텍스트 외부에서 lazy 연관에 대한 접근은 예외상황으로 귀결될 "
 "것이다. 예를 들면 :"
 
 #. Tag: programlisting
-#: performance.xml:140
+#: performance.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
@@ -258,14 +257,14 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:142
-#, no-c-format
+#: performance.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "<literal>Session</literal>이 닫혔을 때 permissions 콜렉션이 초기화 되지 않았"
 "으므로, 그 콜렉션은 그것의 상태를 로드시킬 수가 없을 것이다. "
@@ -274,15 +273,15 @@
 "키는 것이다."
 
 #. Tag: para
-#: performance.xml:150
-#, no-c-format
+#: performance.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "다른 방법으로 연관 매핑에 대해 <literal>lazy=\"false\"</literal>를 지정함으로"
 "써, non-lazy 콜렉션 또는 non-lazy 연관을 사용할 수 있다. 하지만 lazy 초기화"
@@ -292,14 +291,14 @@
 "될 것이다!"
 
 #. Tag: para
-#: performance.xml:159
-#, no-c-format
+#: performance.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "다른 한편으로, 우리는 특정 트랜잭션 내에서 select 페칭 대신에 (고유하게 non-"
 "lazy인) join 페칭을 선택하기를 자주 원한다. 우리는 이제 페칭 방도를 맞춤화 시"
@@ -307,13 +306,13 @@
 "단일 값 연관들과 콜렉션들에 대해 동일하다."
 
 #. Tag: title
-#: performance.xml:170
+#: performance.xml:194
 #, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "페치 방도들을 튜닝하기"
 
 #. Tag: para
-#: performance.xml:172
+#: performance.xml:196
 #, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
@@ -323,7 +322,7 @@
 "에서 join 페칭을 사용 가능하게 하기를 원할 수도 있다:"
 
 #. Tag: programlisting
-#: performance.xml:177
+#: performance.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
@@ -334,13 +333,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:179
+#: performance.xml:203
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"mother\" class=\"Cat\" fetch=\"join\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:181
+#: performance.xml:205
 #, no-c-format
 msgid ""
 "The <literal>fetch</literal> strategy defined in the mapping document "
@@ -349,35 +348,35 @@
 "매핑 문서 내에 정의된 <literal>fetch</literal> 방도는 다음에 영향을 준다:"
 
 #. Tag: para
-#: performance.xml:187
+#: performance.xml:211
 #, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr "<literal>get()</literal> 또는 <literal>load()</literal>를 통한 검색"
 
 #. Tag: para
-#: performance.xml:192
+#: performance.xml:216
 #, no-c-format
 msgid "retrieval that happens implicitly when an association is navigated"
 msgstr "연관이 네비게이트될 때 함축적으로 발생하는 검색"
 
 #. Tag: para
-#: performance.xml:197
+#: performance.xml:221
 #, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr "<literal>Criteria</literal> 질의들"
 
 #. Tag: para
-#: performance.xml:202
+#: performance.xml:226
 #, no-c-format
 msgid "HQL queries if <literal>subselect</literal> fetching is used"
 msgstr "<literal>subselect</literal> 페칭이 사용될 경우에 HQL 질의들"
 
 #. Tag: para
-#: performance.xml:208
-#, no-c-format
+#: performance.xml:232
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "당신이 사용하는 페칭 방도가 무엇인가에 상관없이, 정의된 비-lazy 그래프가 메모"
@@ -385,11 +384,11 @@
 "사용되는 몇몇 즉시적인 select들로 귀결될 수 있음을 노트하라."
 
 #. Tag: para
-#: performance.xml:214
-#, no-c-format
+#: performance.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -403,19 +402,19 @@
 "<literal>setFetchMode(FetchMode.JOIN)</literal>을 사용한다."
 
 #. Tag: para
-#: performance.xml:223
-#, no-c-format
+#: performance.xml:247
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "만일 당신이 <literal>get()</literal> 또는 <literal>load()</literal>에 의해 사"
 "용된 페칭 방도를 변경시킬 수 있기를 당신이 원한다고 느낄 경우, 단순하게 "
 "<literal>Criteria</literal> 질의를 사용하라. 예를 들면:"
 
 #. Tag: programlisting
-#: performance.xml:229
+#: performance.xml:253
 #, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
@@ -425,41 +424,41 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:231
-#, no-c-format
+#: performance.xml:255
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(이것은 몇몇 ORM 솔루션들이 \"페치 계획\"이라고 부르는 것에 대한 Hibernate의 "
 "등가물이다.)"
 
 #. Tag: para
-#: performance.xml:235
-#, no-c-format
+#: performance.xml:259
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr ""
 "N+1 개의 select들을 가진 문제점들을 피하는 완전히 다른 방법은 second-level 캐"
 "시를 사용하는 것이다."
 
 #. Tag: title
-#: performance.xml:243
+#: performance.xml:267
 #, no-c-format
 msgid "Single-ended association proxies"
 msgstr "Single-ended 연관 프락시"
 
 #. Tag: para
-#: performance.xml:245
-#, no-c-format
+#: performance.xml:269
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "콜렉션들에 대한 Lazy 페칭은 영속 콜렉션들에 대한 Hibernate 자신의 구현을 사용"
 "하여 구현된다. 하지만 다른 메커니즘은 single-ended 연관들에서 lazy 특징에 필"
@@ -468,10 +467,10 @@
 "기화 프락시들을 구현한다."
 
 #. Tag: para
-#: performance.xml:253
-#, no-c-format
+#: performance.xml:277
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -480,14 +479,14 @@
 "관에 대해 lazy 페칭을 이용 가능하게 하는데 그것들을 사용한다."
 
 #. Tag: para
-#: performance.xml:259
-#, no-c-format
+#: performance.xml:283
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "매핑 파일은 그 클래스에 대한 프락시 인터페이스로서 사용할, <literal>proxy</"
 "literal> 속성을 가진, 인터페이스를 선언할 수도 있다. 디폴트로 Hibernate는 그 "
@@ -496,17 +495,17 @@
 "든 영속 클래스들에 대해 이 생성자를 권장한다!</emphasis>"
 
 #. Tag: para
-#: performance.xml:266
-#, no-c-format
+#: performance.xml:290
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr ""
 "다형성 클래스들에 대해 이 접근법을 확장할 때 의식해야 하는 몇몇 난처함들이 존"
 "재한다. 예를 들면."
 
 #. Tag: programlisting
-#: performance.xml:271
+#: performance.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -518,7 +517,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:273
+#: performance.xml:296
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -530,7 +529,7 @@
 "<literal>DomesticCat</literal>으로 타입캐스트가 가능하지 않을 것이다:"
 
 #. Tag: programlisting
-#: performance.xml:279
+#: performance.xml:302
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -543,13 +542,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:281
-#, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr "두번째로, 프락시 <literal>==</literal>를 파기할 가능성이 있다."
 
 #. Tag: programlisting
-#: performance.xml:285
+#: performance.xml:308
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -561,7 +560,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:287
+#: performance.xml:310
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -573,7 +572,7 @@
 "한 객체들일 것이다:"
 
 #. Tag: programlisting
-#: performance.xml:292
+#: performance.xml:315
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -581,22 +580,22 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:294
-#, no-c-format
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr ""
 "세번째로, 당신은 <literal>final</literal> 클래스 또는 임의의 <literal>final</"
 "literal> 메소드들을 가진 클래스에 대해 CGLIB 프락시를 사용하지 않을 수 있다."
 
 #. Tag: para
-#: performance.xml:299
-#, no-c-format
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "마지막으로, 만일 당신의 영속 객체가 초기화 시에 어떤 리소스들을 필요로 할 경"
@@ -605,13 +604,16 @@
 "브클래스이다."
 
 #. Tag: para
-#: performance.xml:305
-#, no-c-format
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "이들 문제점들은 모두 자바의 단일 상속 모형의 기본적인 제약 때문이다. 만일 당"
 "신이 이들 문제점들을 피하고자 원할 경우 당신의 영속 클래스들은 각각 그것의 비"
@@ -619,7 +621,7 @@
 "이들 인터페이스들을 지정해야 한다. 예를 들면."
 
 #. Tag: programlisting
-#: performance.xml:311
+#: performance.xml:336
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -631,25 +633,19 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:313
-#, no-c-format
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"여기서 <literal>CatImpl</literal>은 <literal>Cat</literal> 인터페이스를 구현"
-"하고 <literal>DomesticCatImpl</literal>은 <literal>DomesticCat</literal> 인터"
-"페이스를 구현한다. 그때 <literal>Cat</literal>과 <literal>DomesticCat</"
-"literal>의 인스턴스들에 대한 프락시들은 <literal>load()</literal> 또는 "
-"<literal>iterate()</literal>에 의해 반환될 수 있다. (<literal>list()</"
-"literal>가 대개 프락시들을 반환하지 않음을 노트하라.)"
+"첫 번째로, 심지어 기본 인스턴스가 <literal>DomesticCat</literal>의 인스턴스"
+"인 경우조차도, <literal>Cat</literal>의 인스턴스들은 결코 "
+"<literal>DomesticCat</literal>으로 타입캐스트가 가능하지 않을 것이다:"
 
 #. Tag: programlisting
-#: performance.xml:321
+#: performance.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -658,8 +654,20 @@
 "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "<literal>Criteria</literal> 질의들"
+
+#. Tag: para
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -671,41 +679,41 @@
 "야 함을 의미한다."
 
 #. Tag: para
-#: performance.xml:328
-#, no-c-format
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr ""
 "어떤 오퍼레이션들은 프락시 초기화를 필요로 하지 <emphasis>않는다</emphasis>"
 
 #. Tag: para
-#: performance.xml:334
-#, no-c-format
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal>, 만일 영속 클래스가 <literal>equals()</literal>"
 "를 오버라이드 시키지 않는 경우"
 
 #. Tag: para
-#: performance.xml:340
-#, no-c-format
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal>, 만일 영속 클래스가<literal>hashCode()</"
 "literal>를 오버라이드 시키지 않는 경우"
 
 #. Tag: para
-#: performance.xml:346
+#: performance.xml:375
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "식별자 getter 메소드"
 
 #. Tag: para
-#: performance.xml:352
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -715,13 +723,13 @@
 "오버라이드 시키는 영속 클래스들을 검출할 것이다."
 
 #. Tag: para
-#: performance.xml:357
-#, no-c-format
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "디폴트 <literal>lazy=\"proxy\"</literal> 대신에 <literal>lazy=\"no-proxy\"</"
 "literal>를 선택하여, 우리는 타입캐스팅과 연관된 문제점들을 피할 수 있다. 하지"
@@ -729,19 +737,19 @@
 "프락시 초기화로 귀결될 것이다."
 
 #. Tag: title
-#: performance.xml:367
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "콜렉션들과 프락시들을 초기화 시키기"
 
 #. Tag: para
-#: performance.xml:369
-#, no-c-format
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "만일 초기화 되지 않은 콜렉션이나 프락시가 <literal>Session</literal> 영역의 "
 "외부에서 접근될 경우에, 예를 들어 콜렉션을 소유하거나 프락시에 대한 참조를 가"
@@ -749,14 +757,14 @@
 "literal>이 Hibernate에 의해 던져질 것이다."
 
 #. Tag: para
-#: performance.xml:375
-#, no-c-format
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "때때로 우리는<literal>Session</literal>을 닫기 전에 프락시 또는 콜렉션이 초기"
 "화 됨을 확실히 할 필요가 있다. 물론 우리는 예를 들어 <literal>cat.getSex()</"
@@ -765,11 +773,11 @@
 "코드로 편의적이지 않다."
 
 #. Tag: para
-#: performance.xml:382
-#, no-c-format
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -785,11 +793,11 @@
 "kittens의 콜렉션에 대해 유사한 효과를 갖는다."
 
 #. Tag: para
-#: performance.xml:391
-#, no-c-format
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -804,11 +812,11 @@
 "히 하는 문제일 수 있다. 이 쟁점을 다루는 두 가지 기본 방법들이 존재한다:"
 
 #. Tag: para
-#: performance.xml:402
-#, no-c-format
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -826,21 +834,20 @@
 "다. 이 \"Open Session in View\" 패턴에 관한 예제들은 Hibernate 위키를 보라."
 
 #. Tag: para
-#: performance.xml:415
-#, no-c-format
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "별도의 비지니스 티어를 가진 어플리케이션에서, 비지니스 로직은 반환 전에 웹 티"
 "어에 필요한 모든 콜렉션들을 \"준비\"해야 한다. 이것은 비지니스 티어가 모든 데"
@@ -854,14 +861,14 @@
 "emphasis> 패턴을 채택할 경우에 더 쉽다."
 
 #. Tag: para
-#: performance.xml:430
-#, no-c-format
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "당신은 또한 초기화 되지 않은 콜렉션들(또는 다른 프락시들)에 접근하기 전에 "
 "<literal>merge()</literal> 또는 <literal>lock()</literal>으로 앞서 로드된 객"
@@ -871,17 +878,18 @@
 "이기 때문이다!"
 
 #. Tag: para
-#: performance.xml:440
-#, no-c-format
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "때때로 당신은 거대한 콜렉션을 초기화 시키는 것을 원하지 않지만, 여전히 (그것"
 "의 사이즈와 같은) 그것에 대한 어떤 정보 또는 데이터의 부분집합을 필요로 한다."
 
 #. Tag: para
-#: performance.xml:445
+#: performance.xml:474
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -891,7 +899,7 @@
 "용할 수 있다:"
 
 #. Tag: programlisting
-#: performance.xml:449
+#: performance.xml:478
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -899,7 +907,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:451
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -910,7 +918,7 @@
 "요 없이 콜렉션의 부분집합들을 효율적으로 검색하는데 사용된다:"
 
 #. Tag: programlisting
-#: performance.xml:456
+#: performance.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -918,20 +926,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:461
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "batch 페칭 사용하기"
 
 #. Tag: para
-#: performance.xml:463
-#, no-c-format
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "Hibernate는 배치 페칭을 효율적으로 사용할 수 있다. 즉 하나의 프락시가 액세스 "
 "될 경우에 Hibernate는 몇몇 초기화 되지 않은 프락시들을 로드시킬 수 있다(또는 "
@@ -940,19 +947,19 @@
 "고 콜렉션 레벨에서."
 
 #. Tag: para
-#: performance.xml:469
-#, no-c-format
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "클래스들/엔티티들에 대한 batch 페칭은 이해하기가 더 쉽다. 당신이 실행 시에 다"
 "음 상황에 처한다고 상상하라: 당신은 하나의 <literal>Session</literal> 속에 로"
@@ -967,27 +974,27 @@
 "써 이 동작을 튜닝시킬 수 있다:"
 
 #. Tag: programlisting
-#: performance.xml:479
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:481
-#, no-c-format
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 "Hibernate는 이제 세 개의 질의들 만을 실행시킬 것이고, 그 패턴은 10,10, 5 이"
 "다."
 
 #. Tag: para
-#: performance.xml:485
-#, no-c-format
+#: performance.xml:514
+#, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
-"and 10 persons are currently loaded in the <literal>Sesssion</literal>, "
+"and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
 "one for every call to <literal>getCats()</literal>. If you enable batch "
 "fetching for the <literal>cats</literal> collection in the mapping of "
@@ -1004,7 +1011,7 @@
 "있다:"
 
 #. Tag: programlisting
-#: performance.xml:494
+#: performance.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1015,7 +1022,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:496
+#: performance.xml:525
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -1029,13 +1036,13 @@
 "에 의존한다."
 
 #. Tag: para
-#: performance.xml:502
-#, no-c-format
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "만일 당신이 항목들의 포개진 트리를 가질 경우, 예를 들어 전형적인 bill-of-"
 "materials 패턴인 경우, (비록 <emphasis>내포된 set</emphasis> 또는 <emphasis>"
@@ -1043,40 +1050,40 @@
 "은 옵션일 수 있을지라도) 콜렉션들에 대한 batch 페칭이 특히 유용하다."
 
 #. Tag: title
-#: performance.xml:511
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "subselect 페칭 사용하기"
 
 #. Tag: para
-#: performance.xml:513
-#, no-c-format
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "만일 한 개의 lazy 콜렉션이나 단일 값 프락시가 페치되어야 한다면, Hibernate는 "
 "하나의 subselect 내에서 원래의 질의를 다시 실행하여 그것들 모두를 로드시킨"
 "다. 이것은 조각난 로딩 없이 batch 페칭과 동일한 방식으로 동작한다."
 
 #. Tag: title
-#: performance.xml:524
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "lazy 프로퍼티 페칭 사용하기"
 
 #. Tag: para
-#: performance.xml:526
-#, no-c-format
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "Hibernate3은 개별적인 프로퍼티들에 대한 lazy 페칭을 지원한다. 이 최적화 기술"
 "은 또한 <emphasis>fetch groups</emphasis> 으로 알려져 있다. 이것이 대개 마케"
@@ -1086,7 +1093,7 @@
 "몇 프로퍼티들을 로드시키는 것 만이 유용할 수도 있다."
 
 #. Tag: para
-#: performance.xml:535
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1096,7 +1103,7 @@
 "<literal>lazy</literal> 속성을 설정하라:"
 
 #. Tag: programlisting
-#: performance.xml:540
+#: performance.xml:569
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1112,25 +1119,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:542
-#, no-c-format
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "Lazy property 로딩은 빌드 시 바이트코드 수단을 필요로 한다! 만일 당신의 영속 "
 "클래스들이 개선되지 않을 경우, Hibernate는 조용하게 lazy 프로퍼티 설정들을 무"
 "시하고 즉각적인 페칭으로 후퇴할 것이다."
 
 #. Tag: para
-#: performance.xml:548
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr "bytecode 수단으로, 다음 Ant 태스크를 사용하라:"
 
 #. Tag: programlisting
-#: performance.xml:552
+#: performance.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1150,13 +1157,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:554
-#, no-c-format
+#: performance.xml:583
+#, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a prefered solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "불필요한 컬럼 읽기를 피하는 다른 (더 좋은?) 방법은 적어도 읽기 전용 트랜잭션"
 "의 경우에 HQL 질의 또는 Criteria 질의의 투사(projection) 특징들을 사용하는 것"
@@ -1164,32 +1171,32 @@
 "호되는 해결책이다."
 
 #. Tag: para
-#: performance.xml:561
-#, no-c-format
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "당신은 HQL에서 <literal>fetch all properties</literal>를 사용하여 프로퍼티들"
 "에 대한 통상의 eager 페칭을 강제시킬 수 있다."
 
 #. Tag: title
-#: performance.xml:571
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "두번째 레벨 캐시"
 
 #. Tag: para
-#: performance.xml:573
-#, no-c-format
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "Hibernate <literal>Session</literal>은 영속 데이터에 대한 트랜잭션 레벨 캐시"
 "이다. class-by-class와 collection-by-collection 기반 위에 클러스터 또는 JVM-"
@@ -1199,17 +1206,16 @@
 "른 어플리케이션에 의해 영속 저장소에 대해 행해진 변경들을 결코 알지 못한다."
 
 #. Tag: para
-#: performance.xml:581
-#, no-c-format
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "디폴트로, Hibernate는 JVM-레벨의 캐싱에 EHCache를 사용한다. (JCS 지원은 이제 "
 "진부하게 되었고 Hibernate의 장래 버전에서 제거될 것이다.) 당신은 "
@@ -1234,43 +1240,43 @@
 "폴트 내장이 아니다."
 
 #. Tag: title
-#: performance.xml:592
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr "캐시 프로바이더들"
 
 #. Tag: entry
-#: performance.xml:601 performance.xml:774
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr "캐시"
 
 #. Tag: entry
-#: performance.xml:602
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr "프로바이더 클래스"
 
 #. Tag: entry
-#: performance.xml:603
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr "타입"
 
 #. Tag: entry
-#: performance.xml:604
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "클러스터 안전"
 
 #. Tag: entry
-#: performance.xml:605
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "질의 캐시 지원"
 
 #. Tag: entry
-#: performance.xml:610 performance.xml:783
+#: performance.xml:639 performance.xml:827
 #, fuzzy, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr ""
@@ -1280,120 +1286,138 @@
 "Hashtable (제품용으로 고안되지 않음)"
 
 #. Tag: literal
-#: performance.xml:611
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:612
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr "memory"
 
 #. Tag: entry
-#: performance.xml:614 performance.xml:621 performance.xml:628
-#: performance.xml:784 performance.xml:785 performance.xml:786
-#: performance.xml:791 performance.xml:792 performance.xml:793
-#: performance.xml:798 performance.xml:799 performance.xml:800
-#: performance.xml:805 performance.xml:806 performance.xml:812
-#: performance.xml:815
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:617 performance.xml:790
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:618
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:619 performance.xml:626
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr "memory, disk"
 
 #. Tag: entry
-#: performance.xml:624 performance.xml:797
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:625
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:631 performance.xml:804
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:632
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:633
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "clustered (ip multicast)"
 
 #. Tag: entry
-#: performance.xml:634
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "yes (clustered invalidation)"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:811
-#, no-c-format
-msgid "JBoss TreeCache"
+#: performance.xml:667 performance.xml:855
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:639
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:640
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "clustered (ip multicast), transactional"
 
 #. Tag: entry
-#: performance.xml:641
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr "yes (replication)"
 
 #. Tag: entry
-#: performance.xml:642
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "yes (clock sync req.)"
 
+#. Tag: entry
+#: performance.xml:674 performance.xml:862
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "JBoss TreeCache"
+
+#. Tag: literal
+#: performance.xml:675
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:677
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "yes (clustered invalidation)"
+
 #. Tag: title
-#: performance.xml:649
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr "Cache 매핑들"
 
 #. Tag: para
-#: performance.xml:651
+#: performance.xml:687
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1403,7 +1427,7 @@
 "을 갖는다:"
 
 #. Tag: programlisting
-#: performance.xml:662
+#: performance.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1414,7 +1438,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:665
+#: performance.xml:701
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1426,22 +1450,22 @@
 "literal> 또는 <literal>read-only</literal>"
 
 #. Tag: para
-#: performance.xml:674
-#, no-c-format
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (옵션, 디폴트는 class 또는 콜렉션 role 이름) "
 "second level 캐시 영역의 이름을 지정한다"
 
 #. Tag: para
-#: performance.xml:681
-#, no-c-format
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (옵션, 디폴트는 <literal>all</literal>) "
@@ -1450,19 +1474,19 @@
 "다"
 
 #. Tag: para
-#: performance.xml:691
-#, no-c-format
+#: performance.xml:727
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "다른 방법으로 (선호적으로?), 당신은 <literal>hibernate.cfg.xml</literal> 내"
 "에 <literal>&lt;class-cache&gt;</literal>와 <literal>&lt;collection-cache&gt;"
 "</literal> 요소들을 지정할 수도 있다."
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:732
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1472,18 +1496,18 @@
 "한다."
 
 #. Tag: title
-#: performance.xml:703
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "방도: 읽기 전용"
 
 #. Tag: para
-#: performance.xml:705
-#, no-c-format
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "당신의 어플리케이션이 영속 클래스의 인스턴스들을 읽어들일 필요가 있지만 결코 "
@@ -1492,7 +1516,7 @@
 "용에는 완벽하게 안전하다."
 
 #. Tag: programlisting
-#: performance.xml:711
+#: performance.xml:747
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1502,26 +1526,26 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:717
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "방도: 읽기/쓰기"
 
 #. Tag: para
-#: performance.xml:719
-#, no-c-format
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "어플리케이션이 데이터를 업데이트 할 필요가 있을 경우, <literal>read-write</"
 "literal> 캐시가 적절하다. 만일 직렬화 가능한(serializable) 트랜잭션 격리 레벨"
@@ -1536,7 +1560,7 @@
 "는다</emphasis>."
 
 #. Tag: programlisting
-#: performance.xml:730
+#: performance.xml:766
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1550,18 +1574,18 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:735
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "방도: 엄격하지 않은 읽기/쓰기"
 
 #. Tag: para
-#: performance.xml:737
-#, no-c-format
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1578,18 +1602,18 @@
 "literal>가 호출될 때 트랜잭션이 완료되도록 확실히 해야 한다."
 
 #. Tag: title
-#: performance.xml:749
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "방도: transactional"
 
 #. Tag: para
-#: performance.xml:751
-#, no-c-format
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "<literal>transactional</literal> 캐시 방도는 JBoss TreeCache와 같은 전체 트랜"
@@ -1597,11 +1621,25 @@
 "내에서 사용될 수 있고 당신은 <literal>hibernate.transaction."
 "manager_lookup_class</literal>를 지정해야 한다."
 
+#. Tag: title
+#: performance.xml:796
+#, fuzzy, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
+msgstr "캐시 동시성 방도 지원"
+
 #. Tag: para
-#: performance.xml:759
-#, no-c-format
+#: performance.xml:799
+#, fuzzy, no-c-format
 msgid ""
-"None of the cache providers support all of the cache concurrency strategies. "
+"None of the cache providers support all of the cache concurrency strategies."
+msgstr ""
+"캐시 프로바이더들 중 어느 것도 모든 캐시 동시성 방도들을 지원하지 않는다. 다"
+"음 테이블은 어느 프로바이더들이 어느 동시성 방도들과 호환되는지를 보여준다."
+
+#. Tag: para
+#: performance.xml:804
+#, fuzzy, no-c-format
+msgid ""
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 msgstr ""
@@ -1609,47 +1647,47 @@
 "음 테이블은 어느 프로바이더들이 어느 동시성 방도들과 호환되는지를 보여준다."
 
 #. Tag: title
-#: performance.xml:765
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "캐시 동시성 방도 지원"
 
 #. Tag: entry
-#: performance.xml:775
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr "읽기 전용"
 
 #. Tag: entry
-#: performance.xml:776
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "엄격하지 않은 읽기-쓰기"
 
 #. Tag: entry
-#: performance.xml:777
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr "읽기-쓰기"
 
 #. Tag: entry
-#: performance.xml:778
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
 #. Tag: title
-#: performance.xml:824
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr "캐시들을 관리하기"
 
 #. Tag: para
-#: performance.xml:826
-#, no-c-format
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1663,14 +1701,14 @@
 "다."
 
 #. Tag: para
-#: performance.xml:833
-#, no-c-format
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "<literal>flush()</literal>가 차후적으로 호출될 때, 그 객체의 상태는 데이터베"
@@ -1680,7 +1718,7 @@
 "와 그것의 콜렉션들을 제거하는데 사용될 수 있다."
 
 #. Tag: programlisting
-#: performance.xml:841
+#: performance.xml:894
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1693,7 +1731,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:843
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1703,17 +1741,17 @@
 "하는데 <literal>contains()</literal> 메소드를 제공한다."
 
 #. Tag: para
-#: performance.xml:848
-#, no-c-format
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "세션 캐시로부터 모든 객체들을 완전하게 퇴거시키기 위해, <literal>Session."
 "clear()</literal>를 호출하라."
 
 #. Tag: para
-#: performance.xml:852
+#: performance.xml:905
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1725,7 +1763,7 @@
 "literal> 상에 정의된 메소드들이 존재한다."
 
 #. Tag: programlisting
-#: performance.xml:858
+#: performance.xml:911
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1737,53 +1775,53 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:860
-#, no-c-format
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "<literal>CacheMode</literal>는 특정 세션이 second-level 캐시와 어떻게 상호작"
 "용하는지를 제어한다"
 
 #. Tag: para
-#: performance.xml:867
-#, no-c-format
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr ""
 "<literal>CacheMode.NORMAL</literal> - second-level 캐시로부터 아이템들을 읽어"
 "들이고 second-level 캐시로 아이템들을 기록한다"
 
 #. Tag: para
-#: performance.xml:872
-#, no-c-format
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - second-level 캐시로부터 아이템들을 읽어들"
 "이지만, 데이터를 업데이트할 때를 제외하면 second-level 캐시로 기록하지 않는다"
 
 #. Tag: para
-#: performance.xml:878
-#, no-c-format
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - 아이템들을 second-level 캐시에 기록하지"
 "만, second-level 캐시로부터 읽어들이지 않는다"
 
 #. Tag: para
-#: performance.xml:884
-#, no-c-format
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - 아이템들을 second-level 캐시로기록하지"
 "만, second-level 캐시로부터 읽어들이지 않고, 데이터베이스로부터 읽어들인 모"
@@ -1791,7 +1829,7 @@
 "cache.use_minimal_puts</literal>의 효과를 무시한다"
 
 #. Tag: para
-#: performance.xml:892
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1801,7 +1839,7 @@
 "<literal>Statistics</literal> API를 사용하라:"
 
 #. Tag: programlisting
-#: performance.xml:897
+#: performance.xml:950
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1810,18 +1848,18 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:899
-#, no-c-format
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "당신은 통계를 이용 가능하게 하고, 선택적으로 Hibernate로 하여금 캐시 엔트리들"
 "을 보다 인간에게 이해가능한 형식으로 유지시키도록 강제시키는 것이 필요할 것이"
 "다:"
 
 #. Tag: programlisting
-#: performance.xml:904
+#: performance.xml:957
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1829,41 +1867,40 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:909
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr "질의 캐시"
 
 #. Tag: para
-#: performance.xml:911
-#, no-c-format
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "질의 결과 셋들이 또한 캐시될 수도 있다. 이것은 동일한 파라미터들을 가지고 자"
 "주 실행되는 질의들에만 유용하다. 질의 캐시를 사용하기 위해 당신은 먼저 그것"
 "을 이용 가능하도록 해야 한다:"
 
 #. Tag: programlisting
-#: performance.xml:916
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:918
-#, no-c-format
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "이 설정은 두 개의 새로운 캐시 영역들 - 캐시된 질의 결과 셋들을 보관하는 것 "
 "(<literal>org.hibernate.cache.StandardQueryCache</literal>), 질의 가능한 테이"
@@ -1874,10 +1911,10 @@
 "의 캐시는 항상 second-level 캐시와 함께 사용되어야 한다."
 
 #. Tag: para
-#: performance.xml:928
-#, no-c-format
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1888,11 +1925,11 @@
 "거나 질의가 실행될 때 그것의 결과들을 캐시에 추가하는 것을 허용해준다."
 
 #. Tag: para
-#: performance.xml:935
-#, no-c-format
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "만일 당신이 질의 캐시 만료 정책들에 대한 세밀한 제어를 필요로 할 경우, 당신"
@@ -1900,7 +1937,7 @@
 "해 명명되니 캐시 영역을 지정할 수도 있다."
 
 #. Tag: programlisting
-#: performance.xml:941
+#: performance.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1913,7 +1950,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:943
+#: performance.xml:996
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1933,55 +1970,52 @@
 "시키는 보다 효과적인 대안이다."
 
 #. Tag: title
-#: performance.xml:955
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "콜렉션 퍼포먼스 이해하기"
 
 #. Tag: para
-#: performance.xml:957
+#: performance.xml:1010
 #, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"우리는이미 콜렉션들에 관해 얘기하는데 꽤 많은 시간을 소요했다. 이 절에서 우리"
-"는 콜렉션들이 실행 시에 어떻게 행위하는지에 관한 한 쌍의 쟁점들을 조명할 것이"
-"다."
 
 #. Tag: title
-#: performance.xml:964
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr "분류"
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate는 세 가지 기본적인 종류의 콜렉션들을 정의한다:"
 
 #. Tag: para
-#: performance.xml:970
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr "값들을 가진 콜렉션들"
 
 #. Tag: para
-#: performance.xml:973
-#, no-c-format
-msgid "one to many associations"
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "one to many 연관들"
 
 #. Tag: para
-#: performance.xml:976
-#, no-c-format
-msgid "many to many associations"
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "many to many 연관들"
 
 #. Tag: para
-#: performance.xml:980
+#: performance.xml:1033
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -1998,31 +2032,31 @@
 "한다. 이것은 다음 분류를 제안한다:"
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr "인덱싱 된 콜렉션들"
 
 #. Tag: para
-#: performance.xml:994
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr "set들"
 
 #. Tag: para
-#: performance.xml:997
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr "bag들"
 
 #. Tag: para
-#: performance.xml:1001
-#, no-c-format
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "모든 인덱싱된 콜렉션들(map들, list들, array들)은 <literal>&lt;key&gt;</"
@@ -2032,18 +2066,18 @@
 "고 특정 행은 효율적으로 위치지워질 수 있다."
 
 #. Tag: para
-#: performance.xml:1009
-#, no-c-format
+#: performance.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "Set들은 <literal>&lt;key&gt;</literal>와 요소 컬럼들로 구성된 프라이머리 키"
 "를 갖는다. 이것은 몇몇 유형의 콜렉션 요소, 특히 composite 요소들 또는 대형 텍"
@@ -2056,24 +2090,24 @@
 "로 선언해야 한다.)"
 
 #. Tag: para
-#: performance.xml:1020
-#, no-c-format
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> 매핑들은 대용 키를 정의하여서, 그것들은 항"
 "상 업데이트에 매우 효율적이다. 사실, 그것들은 최상의 경우이다."
 
 #. Tag: para
-#: performance.xml:1025
-#, no-c-format
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "Bag들은 가장 나쁜 경우이다. 왜냐하면 하나의 bag은 중복 요소 값들을 허용하고 "
 "인덱스 컬럼을 갖지 않기 때문에, 프라이머리 키가 정의될 수 없다. Hibernate는 "
@@ -2082,13 +2116,13 @@
 "문제를 해결한다. 이것은 매우 비효율적이다."
 
 #. Tag: para
-#: performance.xml:1033
-#, no-c-format
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "one-to-many 연관의 경우, \"프라이머리 키\"는 데이터베이스 테이블의 물리적인 "
 "프라이머리 키가 아닐 수도 있지만- 이 경우에서도 위의 분류는 여전히 유용하다. "
@@ -2096,34 +2130,34 @@
 "영한다.)"
 
 #. Tag: title
-#: performance.xml:1043
+#: performance.xml:1096
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr "List, map, idbag, set들은 update에 가장 효율적인 콜렉션들이다"
 
 #. Tag: para
-#: performance.xml:1045
-#, no-c-format
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "위의 논의에서, 인덱싱된 콜렉션들과 (대개) set들이 요소들을 추가하고, 제거하"
 "고 업데이트함에 있어 가장 효율적인 오퍼레이션을 허용해준다."
 
 #. Tag: para
-#: performance.xml:1051
-#, no-c-format
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "아마 인덱싱 된 콜렉션들이 many to many 연관들을 위한 또는 값들을 가진 콜렉션"
 "들을 위한 set들에 대해 갖고 있는 하나 이상의 장점들이 존재한다. "
@@ -2134,12 +2168,12 @@
 "다."
 
 #. Tag: para
-#: performance.xml:1060
-#, no-c-format
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -2150,14 +2184,14 @@
 "한 것이기 때문이다."
 
 #. Tag: para
-#: performance.xml:1068
-#, no-c-format
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "하지만, 잘 설계된 Hibernate 도메인 모형들에서, 우리는 대개 대부분의 콜렉션들"
 "이 사실 <literal>inverse=\"true\"</literal>를 가진 one-to-many 연관들임을 보"
@@ -2165,24 +2199,23 @@
 "고, 따라서 콜렉션 업데이트 퍼포먼스에 대한 검토들은 단순히 적용되지 않는다."
 
 #. Tag: title
-#: performance.xml:1078
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr "Bag들과 list들은 가장 효율적인 inverse 콜렉션들이다"
 
 #. Tag: para
-#: performance.xml:1080
-#, no-c-format
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "단지 당신이 영원히 bag들을 버리기 전에, bag들(과 또한 list들)이 set들보다 훨"
 "씬 더 성능이 좋은 특별한 경우들이 존재한다. <literal>inverse=\"true\"</"
@@ -2194,7 +2227,7 @@
 "은 훨씬 다음 공통적인 코드를 더 빠르게 만들 수 있다."
 
 #. Tag: programlisting
-#: performance.xml:1090
+#: performance.xml:1143
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2205,20 +2238,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1095
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr "원 샷 delete"
 
 #. Tag: para
-#: performance.xml:1097
-#, no-c-format
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "종종 콜렉션 요소들을 하나씩 삭제하는 것은 극히 비효율적일 수 있다! Hibernate"
 "는 완전하게 바보가 아니어서, 그것은 새로운 공백의 콜렉션의 경우(예를 들어 당"
@@ -2227,13 +2259,13 @@
 "을 내릴 것이고 우리는 모두 행했다!"
 
 #. Tag: para
-#: performance.xml:1104
-#, no-c-format
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "우리가 길이 20인 하나의 콜렉션에 한 개의 요소를 추가하고 그런 다음 두 개의 요"
 "소들을 제거한다고 가정하자. Hibernate는 (콜렉션이 bag가 아닌 한) 한 개의 "
@@ -2241,7 +2273,7 @@
 "령 내릴 것이다. 이것은 확실히 마음에 든다."
 
 #. Tag: para
-#: performance.xml:1110
+#: performance.xml:1163
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2252,28 +2284,28 @@
 "다."
 
 #. Tag: para
-#: performance.xml:1117
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "하나씩 열 여덟 개의 행들을 삭제한 다음에 세 개의 행들을 삽입시킨다"
 
 #. Tag: para
-#: performance.xml:1120
-#, no-c-format
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr ""
 "(한 개의 SQL <literal>DELETE</literal>로)전체 콜렉션을 삭제하고 모든 다섯개"
 "의 현재 요소들을 (하나씩) insert 시킨다"
 
 #. Tag: para
-#: performance.xml:1125
-#, no-c-format
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernate는 두 번째 옵션이 아마 이 경우에 더 빠르다는 점을 알 만큼 충분히 영"
 "리하지 않다.(그리고 Hibernate가 그렇게 영리해지는 것을 희망 하는 것은 가능하"
@@ -2281,36 +2313,35 @@
 "다.)"
 
 #. Tag: para
-#: performance.xml:1131
-#, no-c-format
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "다행히, 당신은 원래의 콜렉션을 폐기시키고(예를 들어 참조 해제하고) 모든 현재 "
 "요소들을 가진 새로이 초기화된 콜렉션을 반환함으로써 아무때든지 이 특징을 강제"
 "시킬 수 있다. 이것은 시간이 흐름에 따라 매우 유용하고 강력해질 수 있다."
 
 #. Tag: para
-#: performance.xml:1137
-#, no-c-format
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "물론 단 한번의 삭제(one-shot-delete)는 <literal>inverse=\"true\"</literal>로 "
 "매핑된 콜렉션들에 적용되지 않는다."
 
 #. Tag: title
-#: performance.xml:1146
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "퍼포먼스 모니터링하기"
 
 #. Tag: para
-#: performance.xml:1148
+#: performance.xml:1201
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2324,13 +2355,13 @@
 "이용 가능하다."
 
 #. Tag: title
-#: performance.xml:1155
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "SessionFactory 모니터링 하기"
 
 #. Tag: para
-#: performance.xml:1157
+#: performance.xml:1210
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2343,11 +2374,11 @@
 "레이 하는 것이다."
 
 #. Tag: para
-#: performance.xml:1163
-#, no-c-format
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2357,7 +2388,7 @@
 "한 개를 이용 가능하게 할 수 있다. 최소한의 구성 예제들은 다음 코드를 보라:"
 
 #. Tag: programlisting
-#: performance.xml:1170
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2373,7 +2404,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1173
+#: performance.xml:1226
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2387,30 +2418,17 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1175
-#, no-c-format
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"TODO: 이것은 의미가 없다: 첫번째 경우에, 우리는 직접 MBean을 검색하고 사용한"
-"다. 두 번째 경우에 우리는 JNDI 이름을 사용하기 전에 세션 팩토리가 보관하고 있"
-"는 JNDI 이름을 부여해야 한다. <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>을 사용하라."
-
-#. Tag: para
-#: performance.xml:1180
-#, no-c-format
-msgid ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
 "당신은 <literal>SessionFactory</literal>에 대한 모니터링을 (비)활성화 시킬 "
 "수 있다"
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1238
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2420,7 +2438,7 @@
 "<literal>false</literal>"
 
 #. Tag: para
-#: performance.xml:1192
+#: performance.xml:1245
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2430,11 +2448,11 @@
 "는 <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
 
 #. Tag: para
-#: performance.xml:1199
-#, no-c-format
+#: performance.xml:1252
+#, fuzzy, no-c-format
 msgid ""
-"Statistics can be reset programatically using the <literal>clear()</literal> "
-"method. A summary can be sent to a logger (info level) using the "
+"Statistics can be reset programmatically using the <literal>clear()</"
+"literal> method. A summary can be sent to a logger (info level) using the "
 "<literal>logSummary()</literal> method."
 msgstr ""
 "Statistics(통계량들)은 <literal>clear()</literal> 메소드를 사용하여 프로그래"
@@ -2442,19 +2460,19 @@
 "를 사용하여 logger(info 레벨)에게 전송될 수 있다."
 
 #. Tag: title
-#: performance.xml:1208
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr "Metrics"
 
 #. Tag: para
-#: performance.xml:1210
-#, no-c-format
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "Hibernate는 매우 기본적인 것에서부터 어떤 시나리오들에만 관련된 전문 정보에 "
 "이르는 많은 metrics를 제공한다. 모든 이용 가능한 카운터들은 "
@@ -2462,7 +2480,7 @@
 "다:"
 
 #. Tag: para
-#: performance.xml:1217
+#: performance.xml:1270
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2472,17 +2490,17 @@
 "<literal>Session</literal> 사용에 관련된 metrics."
 
 #. Tag: para
-#: performance.xml:1223
-#, no-c-format
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr ""
 "전체적으로 엔티티들, 콜렉션들, 질의들, 그리고 캐시들에 관련된 metrics(전역 "
 "metrics로 알려져 있음),"
 
 #. Tag: para
-#: performance.xml:1229
+#: performance.xml:1282
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2490,14 +2508,14 @@
 msgstr "특정한 엔티티, 콜렉션, 질의 또는 캐시 영역에 관련된 상세 metrics."
 
 #. Tag: para
-#: performance.xml:1236
-#, no-c-format
+#: performance.xml:1289
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"For example, you can check the cache hit, miss, and put ratio of entities, "
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "예를 들어 당신은 엔티티, 콜렉션, 질의들의 캐시 성공율 및 실패율, put(역자 "
 "주, 캐시 시도, putt) 비율, 콜렉션들과 질의들, 그리고 평균 질의 요구 시간 등"
@@ -2506,8 +2524,8 @@
 "있다."
 
 #. Tag: para
-#: performance.xml:1243
-#, no-c-format
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2516,7 +2534,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "간단한 getter들은 (예를 들어 특정 엔티티, 콜렉션, 캐시 영역에 묶이지 않은) 전"
@@ -2530,7 +2548,7 @@
 "준다:"
 
 #. Tag: programlisting
-#: performance.xml:1253
+#: performance.xml:1306
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2552,12 +2570,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1255
-#, no-c-format
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2567,6 +2585,43 @@
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, 그리고 <literal>getSecondLevelCacheRegionNames()</literal>."
 
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "여기서 <literal>CatImpl</literal>은 <literal>Cat</literal> 인터페이스를 구"
+#~ "현하고 <literal>DomesticCatImpl</literal>은 <literal>DomesticCat</"
+#~ "literal> 인터페이스를 구현한다. 그때 <literal>Cat</literal>과 "
+#~ "<literal>DomesticCat</literal>의 인스턴스들에 대한 프락시들은 "
+#~ "<literal>load()</literal> 또는 <literal>iterate()</literal>에 의해 반환될 "
+#~ "수 있다. (<literal>list()</literal>가 대개 프락시들을 반환하지 않음을 노트"
+#~ "하라.)"
+
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "우리는이미 콜렉션들에 관해 얘기하는데 꽤 많은 시간을 소요했다. 이 절에서 "
+#~ "우리는 콜렉션들이 실행 시에 어떻게 행위하는지에 관한 한 쌍의 쟁점들을 조명"
+#~ "할 것이다."
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "TODO: 이것은 의미가 없다: 첫번째 경우에, 우리는 직접 MBean을 검색하고 사용"
+#~ "한다. 두 번째 경우에 우리는 JNDI 이름을 사용하기 전에 세션 팩토리가 보관하"
+#~ "고 있는 JNDI 이름을 부여해야 한다. <literal>hibernateStatsBean."
+#~ "setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>을 사용하라."
+
 #, fuzzy
 #~ msgid "yes"
 #~ msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,20 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: persistent_classes.xml:5
+#: persistent_classes.xml:29
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "영속 클래스들"
 
 #. Tag: para
-#: persistent_classes.xml:7
-#, no-c-format
+#: persistent_classes.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "영속 클래스들은 비지니스 문제의 엔티티들(예를 들어 E-Commerce 어플리케이션에"
 "서 고객이나 주문)을 구현하는 어플리케이션 내의 클래스들이다. 영속 클래스들의 "
@@ -31,14 +32,14 @@
 "스턴스는 transient 또는 detached 상태일 수 있다."
 
 #. Tag: para
-#: persistent_classes.xml:14
-#, no-c-format
+#: persistent_classes.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "Hibernate는 이들 클래스들이 Plain Old Java Object (POJO) 프로그래밍 모형으로"
 "서 알려진, 몇몇 간단한 규칙들을 따를 경우에 가장 잘 동작한다. 하지만 이들 규"
@@ -48,21 +49,23 @@
 "기."
 
 #. Tag: title
-#: persistent_classes.xml:23
+#: persistent_classes.xml:47
 #, no-c-format
 msgid "A simple POJO example"
 msgstr "간단한 POJO 예제"
 
 #. Tag: para
-#: persistent_classes.xml:25
-#, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+#: persistent_classes.xml:49
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr ""
 "대부분의 자바 어플리케이션들은 고양이과들을 표현하는 영속 클래스를 필요로 한"
 "다."
 
 #. Tag: programlisting
-#: persistent_classes.xml:29
+#: persistent_classes.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -146,25 +149,27 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:31
+#: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
-msgstr "준수할 네 개의 주요 규칙들이 다음에 있다:"
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:37
+#: persistent_classes.xml:61
 #, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "아규먼트 없는 생성자를 구현하라"
 
 #. Tag: para
-#: persistent_classes.xml:39
-#, no-c-format
+#: persistent_classes.xml:63
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -176,22 +181,22 @@
 "다."
 
 #. Tag: title
-#: persistent_classes.xml:49
+#: persistent_classes.xml:73
 #, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "identifier 프로퍼티를 제공하라(옵션)"
 
 #. Tag: para
-#: persistent_classes.xml:51
-#, no-c-format
+#: persistent_classes.xml:75
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal>은 <literal>id</literal>로 명명된 하나의 프로퍼티를 갖"
 "는다. 이 프로퍼티는 데이터베이스 테이블의 프라이머리 키 컬럼으로 매핑된다. "
@@ -202,7 +207,7 @@
 "의 클래스를 사용할 수도 있다 - 나중에 composite 식별자들에 대한 절을 보라)"
 
 #. Tag: para
-#: persistent_classes.xml:60
+#: persistent_classes.xml:84
 #, no-c-format
 msgid ""
 "The identifier property is strictly optional. You can leave them off and let "
@@ -214,17 +219,17 @@
 "우리는 이것을 권장하지 않는다."
 
 #. Tag: para
-#: persistent_classes.xml:65
-#, no-c-format
+#: persistent_classes.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr ""
 "사실, 어떤 기능은 identifier 프로퍼티를 선언하는 클래스들에 대해서만 이용 가"
 "능하다:"
 
 #. Tag: para
-#: persistent_classes.xml:72
+#: persistent_classes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "Transitive reattachment for detached objects (cascade update or cascade "
@@ -234,37 +239,36 @@
 "merge) - <xref linkend=\"objectstate-transitive\"/>"
 
 #. Tag: literal
-#: persistent_classes.xml:79
+#: persistent_classes.xml:103
 #, no-c-format
 msgid "Session.saveOrUpdate()"
 msgstr "Session.saveOrUpdate()"
 
 #. Tag: literal
-#: persistent_classes.xml:84
+#: persistent_classes.xml:108
 #, no-c-format
 msgid "Session.merge()"
 msgstr "Session.merge()"
 
 #. Tag: para
-#: persistent_classes.xml:89
-#, no-c-format
+#: persistent_classes.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "우리는 당신이 영속 클래스들에 대해 일관되게 명명된 identifier 프로퍼티들을 선"
 "언할 것을 권장한다. 게다가 우리는 당신이 nullable 타입(예를 들어 non-"
 "primitive)을 사용할 것을 권장한다."
 
 #. Tag: title
-#: persistent_classes.xml:96
+#: persistent_classes.xml:120
 #, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr "final이 아닌 클래스들을 선호하라(옵션)"
 
 #. Tag: para
-#: persistent_classes.xml:97
+#: persistent_classes.xml:121
 #, no-c-format
 msgid ""
 "A central feature of Hibernate, <emphasis>proxies</emphasis>, depends upon "
@@ -276,12 +280,13 @@
 "클래스들에 의존한다."
 
 #. Tag: para
-#: persistent_classes.xml:102
-#, no-c-format
+#: persistent_classes.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "당신은 Hibernate로 인터페이스를 구현하지 않은 <literal>final</literal> 클래스"
 "들을 영속화 시킬 수 있지만 당신은 lazy 연관 페칭(lazy association fetching)"
@@ -289,7 +294,7 @@
 "옵션들을 제한시킬 것이다."
 
 #. Tag: para
-#: persistent_classes.xml:107
+#: persistent_classes.xml:131
 #, no-c-format
 msgid ""
 "You should also avoid declaring <literal>public final</literal> methods on "
@@ -303,23 +308,22 @@
 "literal>를 설정함으로써 명시적으로 프락싱을 사용 불가능하도록 해야 한다."
 
 #. Tag: title
-#: persistent_classes.xml:115
+#: persistent_classes.xml:139
 #, no-c-format
 msgid "Declare accessors and mutators for persistent fields (optional)"
 msgstr "영속 필드들을 위한 accessor들과 mutator들을 선언하라(옵션)"
 
 #. Tag: para
-#: persistent_classes.xml:117
-#, no-c-format
+#: persistent_classes.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal>은 그것의 모든 영속 필드들에 대해 accessor 메소드들을 "
 "선언한다. 많은 다른 ORM 도구들은 인스턴스 변수들을 직접 영속화 시킨다. 우리"
@@ -330,7 +334,7 @@
 "정 프로퍼티에 대한 직접적인 필드 접근으로 전환할 수도 있다."
 
 #. Tag: para
-#: persistent_classes.xml:127
+#: persistent_classes.xml:151
 #, no-c-format
 msgid ""
 "Properties need <emphasis>not</emphasis> be declared public - Hibernate can "
@@ -342,24 +346,24 @@
 "literal> get/set 쌍을 가진 프로퍼티를 영속화 시킬 수 있다."
 
 #. Tag: title
-#: persistent_classes.xml:138
+#: persistent_classes.xml:162
 #, no-c-format
 msgid "Implementing inheritance"
 msgstr "상속 구현하기"
 
 #. Tag: para
-#: persistent_classes.xml:140
-#, no-c-format
+#: persistent_classes.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "서브클래스는 또한 첫 번째 규칙들과 두 번째 규칙들을 주시해야 한다. 그것은 슈"
 "퍼클래스 <literal>Cat</literal>으로부터 그것의 identifier 프로퍼티를 상속받는"
 "다."
 
 #. Tag: programlisting
-#: persistent_classes.xml:145
+#: persistent_classes.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -377,47 +381,47 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:149
+#: persistent_classes.xml:173
 #, no-c-format
 msgid ""
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
 msgstr "<literal>equals()</literal>와 <literal>hashCode()</literal> 구현하기"
 
 #. Tag: para
-#: persistent_classes.xml:151
-#, no-c-format
+#: persistent_classes.xml:175
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "만일 당신이 다음의 경우라면, 당신은 <literal>equals()</literal>와 "
 "<literal>hashCode()</literal> 메소드들을 오버라이드 시켜야 한다."
 
 #. Tag: para
-#: persistent_classes.xml:157
-#, no-c-format
+#: persistent_classes.xml:181
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "하나의 <literal>Set</literal> 속에 영속 클래스들의 인스턴스들을 집어넣고자 의"
 "도하고 (many-valued 연관들에 대해 권장되는 방법) <emphasis>그리고</emphasis>"
 
 #. Tag: para
-#: persistent_classes.xml:164
+#: persistent_classes.xml:188
 #, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr "detached 인스턴스들의 reattachment(재첨부)를 사용하고자 의도하는"
 
 #. Tag: para
-#: persistent_classes.xml:170
-#, no-c-format
+#: persistent_classes.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernate는 특정 session 범위 내에서만 persistent identity(데이터베이스 행)"
@@ -427,24 +431,23 @@
 "literal>를 구현해야 한다."
 
 #. Tag: para
-#: persistent_classes.xml:178
-#, no-c-format
+#: persistent_classes.xml:202
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "가장 명백한 방법은 두 객체들의 identifier 값을 비교함으로써 <literal>equals()"
 "</literal>/<literal>hashCode()</literal>를 구현하는 것이다. 만일 그 값이 동일"
@@ -462,14 +465,15 @@
 "체 identity와 equality에 관한 통상의 자바 의미론임을 노트하라."
 
 #. Tag: para
-#: persistent_classes.xml:192
-#, no-c-format
+#: persistent_classes.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "우리는 <emphasis>Business key equality</emphasis>를 사용하여 <literal>equals"
 "()</literal>와 <literal>hashCode()</literal>를 구현할 것 권장한다. Business "
@@ -478,7 +482,7 @@
 "형성하는 프로퍼티들만을 비교한다는 점을 의미한다 :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:200
+#: persistent_classes.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
@@ -507,13 +511,12 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:202
-#, no-c-format
+#: persistent_classes.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "하나의 비지니스 키는 데이터베이스 프라이머리 키 후보 만큼 견고하지 않아야 한"
 "다(<xref linkend=\"transactions-basics-identity\"/>를 보라). 대개 변경할 수 "
@@ -521,30 +524,36 @@
 "보들이다."
 
 #. Tag: title
-#: persistent_classes.xml:212
+#: persistent_classes.xml:236
 #, no-c-format
 msgid "Dynamic models"
 msgstr "동적인 모형들"
 
+#. Tag: title
+#: persistent_classes.xml:239
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: emphasis
-#: persistent_classes.xml:215
-#, no-c-format
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr ""
 "다음 특징들은 현재 실험적으로 고려되고 있으며 장래에는 변경될 수 있음을 노트"
 "하라."
 
 #. Tag: para
-#: persistent_classes.xml:219
-#, no-c-format
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "영속 엔티티들은 반드시 실행시에 POJO 클래스들로 또는 자바빈즈 객체들로 표현되"
 "어야할 필요는 없다. Hibernate는 또한 (실행 시에 <literal>Map</literal>들을 가"
@@ -553,13 +562,13 @@
 "작성하지 않고, 오직 매핑 파일들 만을 작성한다."
 
 #. Tag: para
-#: persistent_classes.xml:227
-#, no-c-format
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "디폴트로, Hibernate는 통산의 POJO 모드로 동작한다. 당신은 "
 "<literal>default_entity_mode</literal> 구성 옵션을 사용하여 특별한 "
@@ -567,19 +576,19 @@
 "있다 (<xref linkend=\"configuration-optional-properties\"/>을 보라)."
 
 #. Tag: para
-#: persistent_classes.xml:234
-#, no-c-format
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "다음 예제들은<literal>Map</literal>들을 사용하는 표현을 설명한다. 먼저 매핑 "
 "파일에서, <literal>entity-name</literal>은 클래스 이름 대신에(또는 클래스 이"
 "름에 덧붙여) 선언되어야 한다:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:240
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -618,22 +627,21 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:242
-#, no-c-format
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "심지어 비록 연관들이 대상(target) 클래스 이름들을 사용하여 선언될지라도, 연관"
 "들의 대상(target) 타입은 또한 POJO가 아닌 동적인 엔티티일 수 있음을 노트하라."
 
 #. Tag: para
-#: persistent_classes.xml:249
-#, no-c-format
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "<literal>SessionFactory</literal>에 대한 디폴트 엔티티 모드를 "
@@ -641,7 +649,7 @@
 "들을 가진 <literal>Map</literal>들에 대해 실행 시에 작업할 수 있다:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:255
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -668,14 +676,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:257
-#, no-c-format
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "dynamic 매핑의 장점들은 엔티티 클래스 구현에 대한 필요 없이도 프로토타이핑을 "
@@ -685,7 +693,7 @@
 "규화 되고 소리가 울려 퍼질 수 있다."
 
 #. Tag: para
-#: persistent_classes.xml:265
+#: persistent_classes.xml:292
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -695,7 +703,7 @@
 "설정될 수 있다:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:270
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -713,14 +721,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
-#, no-c-format
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -735,7 +743,7 @@
 "다."
 
 #. Tag: para
-#: persistent_classes.xml:283
+#: persistent_classes.xml:310
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -745,29 +753,24 @@
 "다."
 
 #. Tag: title
-#: persistent_classes.xml:291
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr "Tuplizer들"
 
 #. Tag: para
-#: persistent_classes.xml:293
-#, no-c-format
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, 그리고 그것의 서브-인터페이"
 "스들은 데이터의 조각에 대한 특별한 표현의 <literal>org.hibernate.EntityMode</"
@@ -786,17 +789,29 @@
 "한다."
 
 #. Tag: para
-#: persistent_classes.xml:308
+#: persistent_classes.xml:330
 #, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "사용자들은 또한 그들 자신의 tuplizer들을 플러그 시킬 수 있다. 아마 당신은 "
 "dynamic-map entity-mode 동안에 사용되는 <literal>java.util.HashMap</literal> "
@@ -807,7 +822,7 @@
 "다. 우리의 고객 엔티티에 대한 예제로 되돌아가면:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:317
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -847,11 +862,195 @@
 "}]]>"
 msgstr ""
 
+#. Tag: title
+#: persistent_classes.xml:354
+#, no-c-format
+msgid "EntityNameResolvers"
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:322
+#: persistent_classes.xml:356
 #, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
 msgstr ""
-"TODO: property 패키지와 proxy 패키지 내에 user-extension 프레임웍을 문서화 "
-"할 것."
+
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "준수할 네 개의 주요 규칙들이 다음에 있다:"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr ""
+#~ "TODO: property 패키지와 proxy 패키지 내에 user-extension 프레임웍을 문서"
+#~ "화 할 것."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: preface.xml:21
+#: preface.xml:29
 #, no-c-format
 msgid "Preface"
 msgstr "머리말"
 
 #. Tag: para
-#: preface.xml:23
-#, no-c-format
+#: preface.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -34,13 +34,13 @@
 "하는 기술을 언급한다."
 
 #. Tag: para
-#: preface.xml:31
-#, no-c-format
+#: preface.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "Hibernate는 자바 클래스들로부터 데이터베이스로의 매핑(그리고 자바 데이터 타입"
 "들로부터 SQL 데이터 타입들로의 매핑)을 처리할 뿐만 아니라, 또한 데이터 질의"
@@ -48,10 +48,10 @@
 "시간을 현저하게 단축시켜줄 수 있다."
 
 #. Tag: para
-#: preface.xml:38
-#, no-c-format
+#: preface.xml:46
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -69,7 +69,7 @@
 "객체들의 그래프로 결과 셋을 변환하는 공통된 태스크를 도와줄 것이다."
 
 #. Tag: para
-#: preface.xml:48
+#: preface.xml:56
 #, no-c-format
 msgid ""
 "If you are new to Hibernate and Object/Relational Mapping or even Java, "
@@ -79,7 +79,7 @@
 "면, 다음 단계들을 따르기 바란다:"
 
 #. Tag: para
-#: preface.xml:55
+#: preface.xml:63
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"tutorial\"/> for a tutorial with step-by-step "
@@ -91,7 +91,7 @@
 "tutorial/</literal> 디렉토리에 포함되어 있다."
 
 #. Tag: para
-#: preface.xml:63
+#: preface.xml:71
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
@@ -101,15 +101,15 @@
 "를 읽어라."
 
 #. Tag: para
-#: preface.xml:69
-#, no-c-format
+#: preface.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "Hibernate 배포본 내의 <literal>eg/</literal> 디렉토리를 살펴 보라. 이 디렉토"
 "리는 간단한 스탠드얼론 어플리케이션을 포함하고 있다. 당신의 JDBC 드라이버를 "
@@ -120,15 +120,15 @@
 "이프 하라."
 
 #. Tag: para
-#: preface.xml:80
-#, no-c-format
+#: preface.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr ""
 "당신의 주된 정보의 소스로서 이 참조 문서를 사용하라. 만일 어플리케이션 설계"
 "에 대해 더 많은 도움을 필요로 하거나 당신이 단계적인 튜토리얼을 선호한다면 "
@@ -137,23 +137,23 @@
 "여 Java Persistence with Hibernate용 예제 어플리케이션을 다운로드 하라."
 
 #. Tag: para
-#: preface.xml:90
+#: preface.xml:98
 #, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr "FAQ들은 Hibernate 웹 사이트 상에 답변되어 있다."
 
 #. Tag: para
-#: preface.xml:95
-#, no-c-format
+#: preface.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr ""
 "제 3의 데모들, 예제들, 그리고 튜토리얼들은 Hibernate 웹 사이트 상에 링크되어 "
 "있다."
 
 #. Tag: para
-#: preface.xml:101
+#: preface.xml:109
 #, no-c-format
 msgid ""
 "The Community Area on the Hibernate website is a good resource for design "
@@ -164,11 +164,11 @@
 "(Tomcat, JBoss AS, Struts, EJB 등.)에 관한 좋은 리소스이다."
 
 #. Tag: para
-#: preface.xml:109
-#, no-c-format
+#: preface.xml:117
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."
@@ -180,7 +180,7 @@
 "에 접촉하라."
 
 #. Tag: para
-#: preface.xml:117
+#: preface.xml:125
 #, no-c-format
 msgid ""
 "Commercial development support, production support, and training for "

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_criteria.xml:5
+#: query_criteria.xml:29
 #, no-c-format
 msgid "Criteria Queries"
 msgstr "Criteria 질의들"
 
 #. Tag: para
-#: query_criteria.xml:7
+#: query_criteria.xml:31
 #, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr "Hibernate는 직관적인, 확장 가능한 criteria query API를 특징 짓는다."
 
 #. Tag: title
-#: query_criteria.xml:12
+#: query_criteria.xml:36
 #, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr "<literal>Criteria</literal> 인스턴스 생성하기"
 
 #. Tag: para
-#: query_criteria.xml:14
+#: query_criteria.xml:38
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.Criteria</literal> represents a query "
@@ -41,7 +41,7 @@
 "인스턴스들에 대한 팩토리이다."
 
 #. Tag: programlisting
-#: query_criteria.xml:20
+#: query_criteria.xml:44
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = sess.createCriteria(Cat.class);\n"
@@ -50,13 +50,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:25
+#: query_criteria.xml:49
 #, no-c-format
 msgid "Narrowing the result set"
 msgstr "결과 셋 제한하기"
 
 #. Tag: para
-#: query_criteria.xml:27
+#: query_criteria.xml:51
 #, no-c-format
 msgid ""
 "An individual query criterion is an instance of the interface <literal>org."
@@ -70,7 +70,7 @@
 "는 팩토리 메소드들을 정의한다."
 
 #. Tag: programlisting
-#: query_criteria.xml:35
+#: query_criteria.xml:59
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -80,13 +80,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:37
-#, no-c-format
-msgid "Restrictions may be grouped logically."
+#: query_criteria.xml:61
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "제한들은 논리적으로 그룹지워질 수도 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:41
+#: query_criteria.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -99,7 +99,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:43
+#: query_criteria.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -115,11 +115,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:45
-#, no-c-format
+#: query_criteria.xml:69
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "미리 만들어진 criterion 타입들(<literal>Restrictions</literal> 서브클래스들)"
@@ -127,7 +127,7 @@
 "록 해준다."
 
 #. Tag: programlisting
-#: query_criteria.xml:50
+#: query_criteria.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -137,7 +137,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:52
+#: query_criteria.xml:76
 #, no-c-format
 msgid ""
 "The <literal>{alias}</literal> placeholder with be replaced by the row alias "
@@ -147,19 +147,19 @@
 "placeholder."
 
 #. Tag: para
-#: query_criteria.xml:57
-#, no-c-format
+#: query_criteria.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "criterion을 얻는 대안적인 접근법은 <literal>Property</literal> 인스턴스로부"
 "터 그것을 얻는 것이다. 당신은 <literal>Property.forName()</literal>을 호출하"
 "여 <literal>Property</literal>를 생성시킬 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:63
+#: query_criteria.xml:87
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -177,23 +177,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:68
+#: query_criteria.xml:92
 #, no-c-format
 msgid "Ordering the results"
 msgstr "결과들을 순서지우기(ordering)"
 
 #. Tag: para
-#: query_criteria.xml:70
-#, no-c-format
+#: query_criteria.xml:94
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "당신은 <literal>org.hibernate.criterion.Order</literal>를 사용하여 결과들을 "
 "순서(ordering)지울 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:74
+#: query_criteria.xml:98
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -205,7 +205,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:76
+#: query_criteria.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -217,23 +217,21 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:81
+#: query_criteria.xml:105
 #, no-c-format
 msgid "Associations"
 msgstr "연관들"
 
 #. Tag: para
-#: query_criteria.xml:83
+#: query_criteria.xml:107
 #, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"당신은 <literal>createCriteria()</literal>를 사용하여 연관들을 네비게이트함으"
-"로써 관계된 엔티티들에 대한 컨스트레인트들을 쉽게 지정할 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:88
+#: query_criteria.xml:112
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -244,11 +242,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:90
-#, no-c-format
+#: query_criteria.xml:114
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "두 번째 <literal>createCriteria()</literal>는 <literal>Criteria</literal>의 "
@@ -256,13 +254,14 @@
 "을 참조한다는 점을 노트하라."
 
 #. Tag: para
-#: query_criteria.xml:96
-#, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+#: query_criteria.xml:120
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "다음 대체 형식은 어떤 환경들에서 유용하다."
 
 #. Tag: programlisting
-#: query_criteria.xml:100
+#: query_criteria.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -273,7 +272,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:102
+#: query_criteria.xml:126
 #, no-c-format
 msgid ""
 "(<literal>createAlias()</literal> does not create a new instance of "
@@ -283,12 +282,12 @@
 "턴스를 생성시키지 않는다.)"
 
 #. Tag: para
-#: query_criteria.xml:107
-#, no-c-format
+#: query_criteria.xml:131
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "앞의 두 개의 질의들에 의해 반환된 <literal>Cat</literal> 인스턴스들에 의해 보"
@@ -298,7 +297,7 @@
 "literal>를 사용해야 한다."
 
 #. Tag: programlisting
-#: query_criteria.xml:114
+#: query_criteria.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -315,23 +314,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:119
+#: query_criteria.xml:143
 #, no-c-format
 msgid "Dynamic association fetching"
 msgstr "동적인 연관 페칭"
 
 #. Tag: para
-#: query_criteria.xml:121
-#, no-c-format
+#: query_criteria.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "당신은 <literal>setFetchMode()</literal>를 사용하여 실행 시에 연관 페칭 의미"
 "를 지정할 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:126
+#: query_criteria.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -342,7 +341,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:128
+#: query_criteria.xml:152
 #, no-c-format
 msgid ""
 "This query will fetch both <literal>mate</literal> and <literal>kittens</"
@@ -354,13 +353,13 @@
 "fetching\"/>을 보라."
 
 #. Tag: title
-#: query_criteria.xml:136
+#: query_criteria.xml:160
 #, no-c-format
 msgid "Example queries"
 msgstr "예제 질의들"
 
 #. Tag: para
-#: query_criteria.xml:138
+#: query_criteria.xml:162
 #, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Example</literal> allows you to "
@@ -370,7 +369,7 @@
 "부터 질의 기준(criterion)을 구조화 시키는 것을 당신에게 허용해준다."
 
 #. Tag: programlisting
-#: query_criteria.xml:143
+#: query_criteria.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
@@ -382,7 +381,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:145
+#: query_criteria.xml:169
 #, no-c-format
 msgid ""
 "Version properties, identifiers and associations are ignored. By default, "
@@ -392,13 +391,13 @@
 "이 제외된다."
 
 #. Tag: para
-#: query_criteria.xml:150
+#: query_criteria.xml:174
 #, no-c-format
 msgid "You can adjust how the <literal>Example</literal> is applied."
 msgstr "당신은 <literal>Example</literal>이 적용되는 방법을 조정할 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:154
+#: query_criteria.xml:178
 #, no-c-format
 msgid ""
 "<![CDATA[Example example = Example.create(cat)\n"
@@ -413,7 +412,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:156
+#: query_criteria.xml:180
 #, no-c-format
 msgid "You can even use examples to place criteria upon associated objects."
 msgstr ""
@@ -421,7 +420,7 @@
 "수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:160
+#: query_criteria.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -432,18 +431,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:165
+#: query_criteria.xml:189
 #, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr "Projections, aggregation 그리고 grouping"
 
 #. Tag: para
-#: query_criteria.xml:166
-#, no-c-format
+#: query_criteria.xml:190
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "<literal>org.hibernate.criterion.Projections</literal> 클래스는 "
 "<literal>Projection</literal> 인스턴스들에 대한 팩토리이다. 우리는 "
@@ -451,7 +450,7 @@
 "투영)을 적용시킨다."
 
 #. Tag: programlisting
-#: query_criteria.xml:172
+#: query_criteria.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -461,7 +460,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:174
+#: query_criteria.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -475,7 +474,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:176
+#: query_criteria.xml:200
 #, no-c-format
 msgid ""
 "There is no explicit \"group by\" necessary in a criteria query. Certain "
@@ -487,19 +486,19 @@
 "고, 그것은 또한 SQL <literal>group by</literal> 절 속에 나타난다."
 
 #. Tag: para
-#: query_criteria.xml:182
-#, no-c-format
+#: query_criteria.xml:206
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "alias는 선택적으로 projection에 할당될 수 있어서, 투사된(projected) 값은 제한"
 "(restriction)들 또는 ordering들 내에서 참조될 수 있다. 다음은 이것을 행하는 "
 "두 개의 다른 방법들이다:"
 
 #. Tag: programlisting
-#: query_criteria.xml:188
+#: query_criteria.xml:212
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -510,7 +509,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:190
+#: query_criteria.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -520,7 +519,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:192
+#: query_criteria.xml:216
 #, no-c-format
 msgid ""
 "The <literal>alias()</literal> and <literal>as()</literal> methods simply "
@@ -534,7 +533,7 @@
 "에 추가할 때 당신은 alias를 할당할 수 있다:"
 
 #. Tag: programlisting
-#: query_criteria.xml:199
+#: query_criteria.xml:223
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -550,7 +549,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:201
+#: query_criteria.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Domestic.class, \"cat\")\n"
@@ -565,7 +564,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:203
+#: query_criteria.xml:227
 #, no-c-format
 msgid ""
 "You can also use <literal>Property.forName()</literal> to express "
@@ -575,7 +574,7 @@
 "을 사용할 수 있다:"
 
 #. Tag: programlisting
-#: query_criteria.xml:207
+#: query_criteria.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -585,7 +584,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:209
+#: query_criteria.xml:233
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -601,25 +600,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:214
+#: query_criteria.xml:238
 #, no-c-format
 msgid "Detached queries and subqueries"
 msgstr "Detached 질의들과 서브질의들"
 
 #. Tag: para
-#: query_criteria.xml:215
-#, no-c-format
+#: query_criteria.xml:239
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal> 클래스는 당신에게 세션 영역의 외부에서 질"
 "의를 생성시키도록 하고, 그런 다음 나중에 어떤 임의의 <literal>Session</"
 "literal>을 사용하여 그것을 실행하도록 한다."
 
 #. Tag: programlisting
-#: query_criteria.xml:220
+#: query_criteria.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria query = DetachedCriteria.forClass(Cat.class)\n"
@@ -634,11 +633,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:222
-#, no-c-format
+#: query_criteria.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal>는 또한 서브질의를 표현하는데 사용된다. 서"
@@ -646,7 +645,7 @@
 "는 <literal>Property</literal>를 통해 얻어질 수 있다."
 
 #. Tag: programlisting
-#: query_criteria.xml:228
+#: query_criteria.xml:252
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)\n"
@@ -657,7 +656,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:230
+#: query_criteria.xml:254
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
@@ -668,13 +667,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:232
-#, no-c-format
-msgid "Even correlated subqueries are possible:"
+#: query_criteria.xml:256
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "심지어 상관관계 지워진 서브질의들이 가능하다:"
 
 #. Tag: programlisting
-#: query_criteria.xml:236
+#: query_criteria.xml:260
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
@@ -687,18 +686,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:245
+#: query_criteria.xml:269
 #, no-c-format
 msgid "Queries by natural identifier"
 msgstr "natural 식별자에 의한 질의들"
 
 #. Tag: para
-#: query_criteria.xml:247
-#, no-c-format
+#: query_criteria.xml:271
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -710,18 +709,18 @@
 "질의가 자주 발생한다. criteria API는 이 쓰임새를 위한 특별한 설비를 제공한다."
 
 #. Tag: para
-#: query_criteria.xml:255
-#, no-c-format
+#: query_criteria.xml:279
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "첫번째로 당신은 <literal>&lt;natural-id&gt;</literal>를 사용하여 당신의 엔티"
 "티에 대한 natural 키를 매핑 시켜야 하고, second-level 캐시 사용을 가능하게 해"
 "야 한다."
 
 #. Tag: programlisting
-#: query_criteria.xml:260
+#: query_criteria.xml:284
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
@@ -738,33 +737,28 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:262
-#, no-c-format
+#: query_criteria.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr ""
 "이 기능은 <emphasis>가변성 있는</emphasis> natural 키들을 가진 엔티티들의 용"
 "도로 고안되어 있지 않음을 노트하라."
 
 #. Tag: para
-#: query_criteria.xml:267
-#, no-c-format
-msgid "Next, enable the Hibernate query cache."
-msgstr "다음으로 , Hibernate 질의 캐시를 사용 가능하도록 하라."
-
-#. Tag: para
-#: query_criteria.xml:271
-#, no-c-format
+#: query_criteria.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "이제 <literal>Restrictions.naturalId()</literal>는 캐시 알고리즘을 보다 효율"
 "적으로 사용할 수 있도록 우리에게 허용해준다."
 
 #. Tag: programlisting
-#: query_criteria.xml:276
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
@@ -774,3 +768,13 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 msgstr ""
+
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "당신은 <literal>createCriteria()</literal>를 사용하여 연관들을 네비게이트"
+#~ "함으로써 관계된 엔티티들에 대한 컨스트레인트들을 쉽게 지정할 수 있다."
+
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "다음으로 , Hibernate 질의 캐시를 사용 가능하도록 하라."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,39 +11,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_hql.xml:5
+#: query_hql.xml:29
 #, no-c-format
 msgid "HQL: The Hibernate Query Language"
 msgstr "HQL: 하이버네이트 질의 언어(Hibernate Query Language)"
 
 #. Tag: para
-#: query_hql.xml:7
-#, no-c-format
+#: query_hql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "Hibernate는 (아주 의도적으로) SQL과 매우 흡사하게 보이는 극히 강력한 질의 언"
 "어를 구비하고 있다. 그러나 그 구문에 의해 우롱당하지 말라; HQL은 상속, 다형"
 "성 그리고 연관과 같은 개념들을 이해하여서, 전체적으로 객체 지향적이다."
 
 #. Tag: title
-#: query_hql.xml:14
+#: query_hql.xml:38
 #, no-c-format
 msgid "Case Sensitivity"
 msgstr "대소문자 구분"
 
 #. Tag: para
-#: query_hql.xml:16
-#, no-c-format
+#: query_hql.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "질의들은 Java 클래스들과 프로퍼티들의 이름들을 제외하면 대소문자를 구분하지 "
 "않는다. 따라서 <literal>SeLeCT</literal>는 <literal>SELECT</literal>와 같고 "
@@ -52,42 +51,42 @@
 "literal>은 <literal>foo.BARSET</literal>과 같지 않다."
 
 #. Tag: para
-#: query_hql.xml:27
-#, no-c-format
+#: query_hql.xml:51
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "이 매뉴얼은 소문자 HQL 키워드를 사용한다. 몇몇 사용자들은 보다 나은 가독성을 "
 "위해 대문자 키워드들을 가진 질의들을 찾지만, 우리는 자바 코드 속에 삽입될 때 "
 "이 컨벤션이 추하다는 점을 발견한다."
 
 #. Tag: title
-#: query_hql.xml:35
+#: query_hql.xml:59
 #, no-c-format
 msgid "The from clause"
 msgstr "from 절"
 
 #. Tag: para
-#: query_hql.xml:37
+#: query_hql.xml:61
 #, no-c-format
 msgid "The simplest possible Hibernate query is of the form:"
 msgstr "가장 간단한 가능한 Hibernate 질의는 다음 형식이다:"
 
 #. Tag: programlisting
-#: query_hql.xml:41
+#: query_hql.xml:65
 #, no-c-format
 msgid "<![CDATA[from eg.Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:43
-#, no-c-format
+#: query_hql.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "이것은 <literal>eg.Cat</literal> 클래스의 모든 인스턴스들을 간단하게 반환한"
 "다. 우리는 대개 클래스 이름을 수식할 필요가 없다. 왜냐하면, <literal>auto-"
@@ -95,36 +94,32 @@
 "같이 작성한다:"
 
 #. Tag: programlisting
-#: query_hql.xml:49
+#: query_hql.xml:73
 #, no-c-format
 msgid "<![CDATA[from Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:51
+#: query_hql.xml:75
 #, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"대개 당신은 한 개의 <emphasis>alias</emphasis>를 할당할 필요가 있을 것이다. "
-"왜냐하면 당신은 질의의 다른 부분들에서 <literal>Cat</literal>을 참조하고자 원"
-"할 것이기 때문이다."
 
 #. Tag: programlisting
-#: query_hql.xml:57 query_hql.xml:372
+#: query_hql.xml:81 query_hql.xml:396
 #, no-c-format
 msgid "<![CDATA[from Cat as cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:59
-#, no-c-format
+#: query_hql.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "이 질의는 alias <literal>cat</literal>을 <literal>Cat</literal> 인스턴스들에 "
 "할당하여서, 우리는 나중에 질의 속에서 그 alias를 사용할 수 있을 것이다. "
@@ -132,39 +127,39 @@
 "다:"
 
 #. Tag: programlisting
-#: query_hql.xml:65
+#: query_hql.xml:89
 #, no-c-format
 msgid "<![CDATA[from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:67
-#, no-c-format
+#: query_hql.xml:91
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr ""
 "여러 개의 클래스들은 cartesian product(카티젼 곱) 또는 \"크로스\" 조인으로 귀"
 "결되어 나타날 수도 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:71
+#: query_hql.xml:95
 #, no-c-format
 msgid "<![CDATA[from Formula, Parameter]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:72
+#: query_hql.xml:96
 #, no-c-format
 msgid "<![CDATA[from Formula as form, Parameter as param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:74
-#, no-c-format
+#: query_hql.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "로컬 변수들에 대한 Java 네이밍 표준들과 일치되게, 첫 소문자를 사용하여 질의 "
@@ -172,23 +167,23 @@
 "<literal>domesticCat</literal>)."
 
 #. Tag: title
-#: query_hql.xml:83
+#: query_hql.xml:107
 #, no-c-format
 msgid "Associations and joins"
 msgstr "연관들과 조인들"
 
 #. Tag: para
-#: query_hql.xml:85
-#, no-c-format
+#: query_hql.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "우리는 또한 <literal>join</literal>을 사용하여 , 연관된 엔티티들에 또는 값들"
 "을 가진 콜렉션의 요소들에도 alias들을 할당할 수도 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:90
+#: query_hql.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -197,49 +192,49 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:92
+#: query_hql.xml:116
 #, no-c-format
 msgid "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:94
+#: query_hql.xml:118
 #, no-c-format
 msgid "<![CDATA[from Formula form full join form.parameter param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:96
-#, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+#: query_hql.xml:120
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "지원되는 join 타입들은 ANSI SQL로부터 빌려왔다"
 
 #. Tag: literal
-#: query_hql.xml:103
+#: query_hql.xml:127
 #, no-c-format
 msgid "inner join"
 msgstr "inner join"
 
 #. Tag: literal
-#: query_hql.xml:108
+#: query_hql.xml:132
 #, no-c-format
 msgid "left outer join"
 msgstr "left outer join"
 
 #. Tag: literal
-#: query_hql.xml:113
+#: query_hql.xml:137
 #, no-c-format
 msgid "right outer join"
 msgstr "right outer join"
 
 #. Tag: para
-#: query_hql.xml:117
+#: query_hql.xml:141
 #, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr "<literal>full join</literal> (대개 유용하지 않음)"
 
 #. Tag: para
-#: query_hql.xml:123
+#: query_hql.xml:147
 #, no-c-format
 msgid ""
 "The <literal>inner join</literal>, <literal>left outer join</literal> and "
@@ -249,7 +244,7 @@
 "<literal>right outer join</literal> 구조체들이 약칭될 수 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:128
+#: query_hql.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -258,7 +253,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:130
+#: query_hql.xml:154
 #, no-c-format
 msgid ""
 "You may supply extra join conditions using the HQL <literal>with</literal> "
@@ -268,7 +263,7 @@
 "공할 수 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:135
+#: query_hql.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -277,15 +272,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:137
-#, no-c-format
+#: query_hql.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "게다가, \"fetch\" join은 값들을 가진 콜렉션들이나 연관관계들이 한 개의 select"
 "를 사용하여, 그것들의 부모 객체들에 따라 초기화 되는 것을 허용해준다. 이것은 "
@@ -294,7 +289,7 @@
 "<xref linkend=\"performance-fetching\"/>을 보라."
 
 #. Tag: programlisting
-#: query_hql.xml:145
+#: query_hql.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -303,14 +298,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:147
-#, no-c-format
+#: query_hql.xml:171
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "fetch join은 대개 alias를 할당할 필요가 없다. 왜냐하면, 연관된 객체들이 "
@@ -320,7 +315,7 @@
 "이유는 더 많은 콜렉션들을 재귀적으로 조인 페칭시키는 경우이다:"
 
 #. Tag: programlisting
-#: query_hql.xml:155
+#: query_hql.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -330,23 +325,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:157
-#, no-c-format
+#: query_hql.xml:181
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "(비록 <literal>scroll()</literal>이 사용될 수 있을지라도) <literal>fetch</"
 "literal> 구조체는 <literal>iterate()</literal>를 사용하여 호출되는 질의들 내"
@@ -363,12 +358,12 @@
 "literal>와 <literal>right join fetch</literal>는 의미가 없다."
 
 #. Tag: para
-#: query_hql.xml:172
-#, no-c-format
+#: query_hql.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "만일 당신이 (바이트코드 방편으로) property-레벨 lazy 페칭을 사용할 경우, "
@@ -376,13 +371,13 @@
 "째 질의에서) lazy 프로퍼티들을 즉시 페치하도록 강제시키는 것이 가능하다."
 
 #. Tag: programlisting
-#: query_hql.xml:178
+#: query_hql.xml:202
 #, no-c-format
 msgid "<![CDATA[from Document fetch all properties order by name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:179
+#: query_hql.xml:203
 #, no-c-format
 msgid ""
 "<![CDATA[from Document doc fetch all properties where lower(doc.name) like '%"
@@ -390,13 +385,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:184
+#: query_hql.xml:208
 #, no-c-format
 msgid "Forms of join syntax"
 msgstr "join 구문의 형식들"
 
 #. Tag: para
-#: query_hql.xml:186
+#: query_hql.xml:210
 #, no-c-format
 msgid ""
 "HQL supports two forms of association joining: <literal>implicit</literal> "
@@ -406,18 +401,18 @@
 "<literal>명시적</literal>."
 
 #. Tag: para
-#: query_hql.xml:190
-#, no-c-format
+#: query_hql.xml:214
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "앞의 절에서 보여진 질의들은 모두 join 키워드가 from 절 내에 명시적으로 사용되"
 "는 <literal>명시적인</literal> 형식을 사용한다. 이것은 권장되는 형식이다."
 
 #. Tag: para
-#: query_hql.xml:195
+#: query_hql.xml:219
 #, no-c-format
 msgid ""
 "The <literal>implicit</literal> form does not use the join keyword. Instead, "
@@ -431,32 +426,30 @@
 "literal> join은 결과되는 SQL 문장에서 inner join으로 귀결된다."
 
 #. Tag: programlisting
-#: query_hql.xml:202
+#: query_hql.xml:226
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:206
-#, no-c-format
-msgid "Refering to identifier property"
+#: query_hql.xml:230
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "식별자 속성 참조하기"
 
 #. Tag: para
-#: query_hql.xml:208
-#, no-c-format
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#: query_hql.xml:232
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "개략적으로 말하자면, 엔티티의 식별자 속성을 참조하는 2가지 방법들이 존재한다:"
 
 #. Tag: para
-#: query_hql.xml:213
-#, no-c-format
+#: query_hql.xml:237
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "<emphasis>엔티티가 id로 명명된 비식별자 속성을 정의하지 않는다고 가정하면</"
@@ -464,23 +457,23 @@
 "참조하는데 사용될 수 있다."
 
 #. Tag: para
-#: query_hql.xml:220
-#, no-c-format
+#: query_hql.xml:244
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "만일 그 엔티티가 명명된 식별자 속성을 정의하는 경우, 당신은 그 속성 이름을 사"
 "용할 수도 있다."
 
 #. Tag: para
-#: query_hql.xml:226
-#, no-c-format
+#: query_hql.xml:250
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "composite 식별자 속성들에 대한 참조들은 동일한 네이밍 규칙들을 따른다. 만일 "
@@ -489,14 +482,14 @@
 "literal> 속성이 식별자 속성을 참조하는데 사용될 수 있다."
 
 #. Tag: para
-#: query_hql.xml:233
+#: query_hql.xml:258
 #, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "노트: 이것은 버전 3.2.2에서 시작될 때 현격하게 변경되었다. 이전 버전들에서, "
 "<literal>id</literal>는 <emphasis>항상</emphasis> 그것의 실제 이름에 관계없"
@@ -504,23 +497,23 @@
 "비식별자 속성들이 Hibernate 질의들 내에서 결코 참조될 수 없었다는 점이었다."
 
 #. Tag: title
-#: query_hql.xml:242
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr "select 절"
 
 #. Tag: para
-#: query_hql.xml:244
-#, no-c-format
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "<literal>select</literal> 절은 질의 결과 셋 속에 반환할 객체들과 프로퍼티들"
 "이 어느 것인지를 골라 내도록 강제한다. 다음을 검토하자:"
 
 #. Tag: programlisting
-#: query_hql.xml:249
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -529,34 +522,34 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:251
-#, no-c-format
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "질의는 다른 <literal>Cat</literal>들의 <literal>mate</literal>들을 select 할 "
 "것이다. 실제로 당신은 이 질의들을 다음과 같이 보다 축약형으로 표현할수도 있"
 "다:"
 
 #. Tag: programlisting
-#: query_hql.xml:256
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:258
-#, no-c-format
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "질의들은 컴포넌트 타입의 프로퍼티들을 포함하는 임의의 값 타입의 프로퍼티들을 "
 "반환할 수도 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:262
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -564,24 +557,24 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:264
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:266
-#, no-c-format
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "<literal>Family</literal> 클래스가 적당한 생성자를 갖고 있음을 가정하면, 질의"
 "들은 여러 객체들 그리고/또는 프로퍼티들을 <literal>Object[]</literal> 타입의 "
 "배열로서,"
 
 #. Tag: programlisting
-#: query_hql.xml:271
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -591,13 +584,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:273
-#, no-c-format
-msgid "or as a <literal>List</literal>,"
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "또는 <literal>List</literal>로서,"
 
 #. Tag: programlisting
-#: query_hql.xml:277
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -607,13 +600,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:279
-#, no-c-format
-msgid "or as an actual typesafe Java object,"
-msgstr "또는 실제 typesafe 자바 객체로서,"
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr "반환할 수도 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:283
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -623,24 +618,16 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:285
-#, no-c-format
+#: query_hql.xml:313
+#, fuzzy, no-c-format
 msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
-msgstr "반환할 수도 있다."
-
-#. Tag: para
-#: query_hql.xml:289
-#, no-c-format
-msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr ""
 "당신은 <literal>as</literal>를 사용하여 select되는 표현식들에 alias들을 할당"
 "할 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:293
+#: query_hql.xml:317
 #, no-c-format
 msgid ""
 "<![CDATA[select max(bodyWeight) as max, min(bodyWeight) as min, count(*) as "
@@ -649,7 +636,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:295
+#: query_hql.xml:319
 #, no-c-format
 msgid ""
 "This is most useful when used together with <literal>select new map</"
@@ -658,7 +645,7 @@
 "다음은 <literal>select new map</literal>과 함께 사용될 때 가장 유용하다:"
 
 #. Tag: programlisting
-#: query_hql.xml:299
+#: query_hql.xml:323
 #, no-c-format
 msgid ""
 "<![CDATA[select new map( max(bodyWeight) as max, min(bodyWeight) as min, "
@@ -667,7 +654,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:301
+#: query_hql.xml:325
 #, no-c-format
 msgid ""
 "This query returns a <literal>Map</literal> from aliases to selected values."
@@ -676,22 +663,22 @@
 "반환한다."
 
 #. Tag: title
-#: query_hql.xml:308
+#: query_hql.xml:332
 #, no-c-format
 msgid "Aggregate functions"
 msgstr "집계 함수들"
 
 #. Tag: para
-#: query_hql.xml:310
-#, no-c-format
+#: query_hql.xml:334
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr ""
 "HQL 질의들은 프로퍼티들에 대한 집계(aggregate) 함수들의 결과들을 반환할수도 "
 "있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:314
+#: query_hql.xml:338
 #, no-c-format
 msgid ""
 "<![CDATA[select avg(cat.weight), sum(cat.weight), max(cat.weight), count"
@@ -700,41 +687,41 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:325
-#, no-c-format
-msgid "The supported aggregate functions are"
+#: query_hql.xml:349
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "지원되는 집계 함수들은 다음과 같다"
 
 #. Tag: literal
-#: query_hql.xml:332
+#: query_hql.xml:356
 #, no-c-format
 msgid "avg(...), sum(...), min(...), max(...)"
 msgstr "avg(...), sum(...), min(...), max(...)"
 
 #. Tag: literal
-#: query_hql.xml:337
+#: query_hql.xml:361
 #, no-c-format
 msgid "count(*)"
 msgstr "count(*)"
 
 #. Tag: literal
-#: query_hql.xml:342
+#: query_hql.xml:366
 #, no-c-format
 msgid "count(...), count(distinct ...), count(all...)"
 msgstr "count(...), count(distinct ...), count(all...)"
 
 #. Tag: para
-#: query_hql.xml:347
-#, no-c-format
+#: query_hql.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr ""
 "당신은 select 절 속에 산술 연산자들, 연결 연산자, 그리고 인지된 SQL 함수들을 "
 "사용할 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:352
+#: query_hql.xml:376
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
@@ -744,24 +731,24 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:354
+#: query_hql.xml:378
 #, no-c-format
 msgid ""
 "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from Person]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:356
-#, no-c-format
+#: query_hql.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "<literal>distinct</literal> 키워드와 all <literal>all</literal>가 사용될 수 "
 "있고 SQL의 경우와 동일한 의미를 갖는다."
 
 #. Tag: programlisting
-#: query_hql.xml:361
+#: query_hql.xml:385
 #, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
@@ -770,23 +757,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:366
+#: query_hql.xml:390
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Polymorphic(다형성) 질의들"
 
 #. Tag: para
-#: query_hql.xml:368
+#: query_hql.xml:392
 #, no-c-format
 msgid "A query like:"
 msgstr "다음과 같은 질의:"
 
 #. Tag: para
-#: query_hql.xml:374
-#, no-c-format
+#: query_hql.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -800,13 +787,13 @@
 "든 영속 객체들을 반환할 것이다:"
 
 #. Tag: programlisting
-#: query_hql.xml:382
+#: query_hql.xml:406
 #, no-c-format
 msgid "<![CDATA[from java.lang.Object o]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:384
+#: query_hql.xml:408
 #, no-c-format
 msgid ""
 "The interface <literal>Named</literal> might be implemented by various "
@@ -816,19 +803,19 @@
 "수도 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:389
+#: query_hql.xml:413
 #, no-c-format
 msgid "<![CDATA[from Named n, Named m where n.name = m.name]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:391
-#, no-c-format
+#: query_hql.xml:415
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "이들 마지막 두 개의 질의들은 하나 이상의 SQL <literal>SELECT</literal>를 필요"
 "로 할 것임을 노트하라. 이것은 <literal>order by</literal> 절이 정확하게 전체 "
@@ -836,30 +823,30 @@
 "scroll()</literal>을 사용하여 이들 질의들을 호출할 수 없음을 의미한다)."
 
 #. Tag: title
-#: query_hql.xml:400
+#: query_hql.xml:424
 #, no-c-format
 msgid "The where clause"
 msgstr "where 절"
 
 #. Tag: para
-#: query_hql.xml:402
-#, no-c-format
+#: query_hql.xml:426
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "<literal>where</literal> 절은 반환된 인스턴스들의 목록을 제한시키는 것을 당신"
 "에게 허용해준다. 만일 alias가 존재하지 않을 경우, 당신은 이름에 의해 프로퍼티"
 "들을 참조할 수도 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:407
+#: query_hql.xml:431
 #, no-c-format
 msgid "<![CDATA[from Cat where name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:409
+#: query_hql.xml:433
 #, no-c-format
 msgid "If there is an alias, use a qualified property name:"
 msgstr ""
@@ -867,19 +854,25 @@
 "라:"
 
 #. Tag: programlisting
-#: query_hql.xml:413
+#: query_hql.xml:437
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:415
-#, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#: query_hql.xml:439
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "는 'Fritz'로 명명된 <literal>Cat</literal>의 인스턴스들을 반환한다."
 
+#. Tag: para
+#: query_hql.xml:443
+#, no-c-format
+msgid "The following query:"
+msgstr ""
+
 #. Tag: programlisting
-#: query_hql.xml:419
+#: query_hql.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
@@ -888,14 +881,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:421
-#, no-c-format
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "는 <literal>Foo</literal>의 <literal>startDate</literal> 프로퍼티와 동일한 "
 "<literal>date</literal> 프로퍼티를 가진 <literal>bar</literal>의 인스턴스가 "
@@ -904,23 +897,22 @@
 "하자:"
 
 #. Tag: programlisting
-#: query_hql.xml:430
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:432
-#, no-c-format
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "이 질의는 테이블 (inner) join을 가진 SQL 질의로 번역된다. 만일 당신이 다음과 "
 "같은 어떤 것을 작성했다면"
 
 #. Tag: programlisting
-#: query_hql.xml:437
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -928,31 +920,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:439
-#, no-c-format
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 "당신은 SQL에서 네 개의 테이블 join들을 필요로 하는 하나의 질의로 끝낼 것이다."
 
 #. Tag: para
-#: query_hql.xml:443
-#, no-c-format
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "<literal>=</literal> 연산자는 프로퍼티들 뿐만 아니라 또한 인스턴스들을 비교하"
 "는데 사용될 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:448
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:450
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -961,10 +952,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:452
-#, no-c-format
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -973,7 +964,7 @@
 "\"/>를 보라."
 
 #. Tag: programlisting
-#: query_hql.xml:458
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -982,20 +973,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:460
-#, no-c-format
-msgid "The second query is efficient. No table join is required!"
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr "두 번째 질의가 효율적이다. 테이블 join이 필요 없다!"
 
 #. Tag: para
-#: query_hql.xml:464
-#, no-c-format
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "composite(합성) 식별자들의 프로퍼티들이 또한 사용될 수 있다. "
 "<literal>Person</literal>이 <literal>country</literal>와 "
@@ -1004,7 +993,7 @@
 "\"queryhql-identifier-property\"/>를 보라."
 
 #. Tag: programlisting
-#: query_hql.xml:471
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -1013,7 +1002,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:473
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -1022,51 +1011,59 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:475
-#, no-c-format
-msgid "Once again, the second query requires no table join."
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr "다시 한번, 두 번째 질의는 테이블 join을 필요로 하지 않는다."
 
 #. Tag: para
-#: query_hql.xml:479
+#: query_hql.xml:505
 #, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "마찬가지로, 특별한 프로퍼티 <literal>class</literal>는 다형적인 영속성"
 "(polymorphic persistence)의 경우에 인스턴스의 판별자(discriminator) 값에 액세"
 "스한다. where 절 속에 삽입된 Java 클래스 이름은 그것의 판별자(discriminator) "
 "값으로 변환될 것이다."
 
 #. Tag: programlisting
-#: query_hql.xml:485
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:487
-#, no-c-format
+#: query_hql.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "당신은 또한 컴포넌트들 또는 composite 사용자 타입들, 또는 명명된 컴포넌트 타"
 "입들의 속성들을 사용할 수도 있다. 상세한 것은 <xref linkend=\"queryhql-"
 "components\"/>를 보라."
 
 #. Tag: para
-#: query_hql.xml:492
-#, no-c-format
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "\"임의의\" 타입은 다음 방법으로 join을 표현하는 것을 우리에게 허용해주는, 특"
 "별한 프로퍼티들 <literal>id</literal>와 <literal>class</literal>를 갖는다(여"
@@ -1074,7 +1071,7 @@
 "된 프로퍼티이다)."
 
 #. Tag: programlisting
-#: query_hql.xml:498
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1082,61 +1079,61 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:500
-#, no-c-format
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "<literal>log.item.class</literal>와 <literal>payment.class</literal>는 위의 "
 "질의 내에서 완전히 다른 데이터베이스 컬럼들의 값들을 참조할 것임을 노트하라."
 
 #. Tag: title
-#: query_hql.xml:508
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr "표현식들"
 
 #. Tag: para
-#: query_hql.xml:510
-#, no-c-format
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "<literal>where</literal> 절 속에 허용되는 표현식들은 당신이 SQL로 작성할 수 "
 "있는 대부분의 종류의 것들을 포함한다:"
 
 #. Tag: para
-#: query_hql.xml:517
-#, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "산술 연산자들 <literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:522
-#, no-c-format
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr ""
 "바이너리 비교 연산자들 <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
 
 #. Tag: para
-#: query_hql.xml:527
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "논리 연산들 <literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:532
-#, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "그룹핑을 나타내는 괄호들 <literal>( )</literal>, indicating grouping"
 
 #. Tag: para
-#: query_hql.xml:537
+#: query_hql.xml:568
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1150,7 +1147,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:550
+#: query_hql.xml:581
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1161,7 +1158,7 @@
 "literal>"
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:587
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1170,29 +1167,29 @@
 "문자열 연결 <literal>...||...</literal> or <literal>concat(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:561
-#, no-c-format
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:567
-#, no-c-format
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:605
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1204,13 +1201,13 @@
 "mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> 그리고 <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
+#: query_hql.xml:616
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1220,7 +1217,7 @@
 "()</literal>"
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:622
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1234,7 +1231,7 @@
 "literal>."
 
 #. Tag: para
-#: query_hql.xml:599
+#: query_hql.xml:630
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1244,13 +1241,13 @@
 "함수"
 
 #. Tag: para
-#: query_hql.xml:605
-#, no-c-format
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "콜렉션 값을 가진 경로 표현식들을 취하는 HQL 함수들 : <literal>some, all, "
@@ -1260,11 +1257,11 @@
 "literal>."
 
 #. Tag: para
-#: query_hql.xml:613
-#, no-c-format
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "<literal>sign()</literal>, <literal>trunc()</literal>, <literal>rtrim()</"
@@ -1272,23 +1269,23 @@
 "라 함수"
 
 #. Tag: para
-#: query_hql.xml:619
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "JDBC-스타일 위치 파라미터들 <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:624
-#, no-c-format
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "명명된 파라미터들 <literal>:name</literal>, <literal>:start_date</literal>, "
 "<literal>:x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:660
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1298,7 +1295,7 @@
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:635
+#: query_hql.xml:666
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1308,41 +1305,41 @@
 "literal>"
 
 #. Tag: para
-#: query_hql.xml:641
-#, no-c-format
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "<literal>in</literal> 과 <literal>between</literal>은 다음과 같이 사용될 수 "
 "있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:645
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:647
+#: query_hql.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:649
-#, no-c-format
-msgid "and the negated forms may be written"
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "그리고 부정형들은 다음과 같이 작성될 수 있다"
 
 #. Tag: programlisting
-#: query_hql.xml:653
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:655
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1350,27 +1347,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:657
-#, no-c-format
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "마찬가지로, <literal>is null</literal>과 <literal>is not null</literal>은 "
 "null 값들을 테스트하는데 사용될 수 있다."
 
 #. Tag: para
-#: query_hql.xml:662
-#, no-c-format
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "Boolean들은 Hibernate 구성 내에 HQL 질의 치환들을 선언함으로써 표현식들 내에 "
 "쉽게 사용될 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:667
+#: query_hql.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1378,7 +1375,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:669
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1390,42 +1387,42 @@
 "literal>으로 대체될 것이다:"
 
 #. Tag: programlisting
-#: query_hql.xml:674
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:676
-#, no-c-format
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "당신은 특별한 프로퍼티 <literal>size</literal>로서 또는 특별한 <literal>size"
 "()</literal> 함수로서 콜렉션의 사이즈를 테스트할 수 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:681
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:683
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:685
-#, no-c-format
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "인덱싱된 콜렉션들에 대해, 당신은<literal>minindex</literal>와 "
 "<literal>maxindex</literal> 함수들을 사용하여 최소 인덱스과 최대 인덱스를 참"
@@ -1434,39 +1431,39 @@
 "요소 및 최대 요소를 참조할 수 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:693
+#: query_hql.xml:724
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:695
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:697
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:699
-#, no-c-format
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "SQL 함수들 <literal>any, some, all, exists, in</literal>은 콜렉션의 요소 또"
 "는 인덱스 세트(<literal>elements</literal> 함수와 <literal>indices</literal> "
 "함수), 또는 서브질의의 결과를 전달했을 때 지원된다(아래를 보라)."
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1474,7 +1471,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1482,31 +1479,31 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:709
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:711
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:713
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:715
-#, no-c-format
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "이들 구조체들-<literal>size</literal>, <literal>elements</literal>, "
@@ -1515,23 +1512,23 @@
 "Hibernate3에서 where 절 내에서만 사용될 것임을 노트하라."
 
 #. Tag: para
-#: query_hql.xml:722
-#, no-c-format
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "인덱싱 된 콜렉션들의 요소들(배열들, 리스트들, map들)은 인덱스에 의해 참조될 "
 "수 있다(where 절 안에서만):"
 
 #. Tag: programlisting
-#: query_hql.xml:727
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1540,7 +1537,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1549,7 +1546,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1557,15 +1554,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:735
-#, no-c-format
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr "<literal>[]</literal> 내부의 표현식은 산술 표현실일 수 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:739
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1573,17 +1570,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:741
-#, no-c-format
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "HQL은 또한 one-to-many 연관 또는 값들을 가진 콜렉션의 요소들에 대해 미리 만들"
 "어진 <literal>index()</literal> 함수를 제공한다."
 
 #. Tag: programlisting
-#: query_hql.xml:746
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1592,29 +1589,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:748
-#, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr "기본 데이터베이스에 의해 제공되는 Scalar SQL 함수들이 사용될 수도 있다"
 
 #. Tag: programlisting
-#: query_hql.xml:752
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:754
-#, no-c-format
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "당신이 아직 이 모든 것을 납득하지 못한다면, SQL 내에서 다음 질의가 가독성이 "
 "얼마나 많고 적은지를 생각해보라:"
 
 #. Tag: programlisting
-#: query_hql.xml:759
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1627,13 +1624,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:761
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>힌트</emphasis> : 다음과 같은 어떤 것"
 
 #. Tag: programlisting
-#: query_hql.xml:765
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1657,23 +1654,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:770
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr "order by 절"
 
 #. Tag: para
-#: query_hql.xml:772
-#, no-c-format
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "질의에 의해 반환된 리스트는 반환된 클래스 또는 컴포넌트들의 프로퍼티에 의해 "
 "순서(ordering)지워질 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1681,7 +1678,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:809
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1691,23 +1688,23 @@
 "순 또는 내림차순 정렬을 나타낸다."
 
 #. Tag: title
-#: query_hql.xml:785
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr "group by 절"
 
 #. Tag: para
-#: query_hql.xml:787
-#, no-c-format
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "aggregate 값들을 반환하는 질의는 반환된 클래스나 컴포넌트들의 프로퍼티에 의"
 "해 그룹지워질 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:791
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1716,7 +1713,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:793
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1725,13 +1722,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:795
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr "또한 <literal>having</literal> 절이 허용된다."
 
 #. Tag: programlisting
-#: query_hql.xml:799
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1741,19 +1738,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:801
-#, no-c-format
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "SQL 함수들과 집계 함수들이 기본 데이터베이스에 의해 지원될 경우(예를 들어 "
 "MySQL은 지원되지 않는다) <literal>having</literal> 절과 <literal>order by</"
 "literal> 절 속에 허용된다."
 
 #. Tag: programlisting
-#: query_hql.xml:807
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1765,15 +1762,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:809
-#, no-c-format
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "<literal>group by</literal> 절도 <literal>order by</literal> 절 어느 것도 산"
 "술 표현식들을 포함할 수 없다는 점을 노트하라. 또한 Hibernate는 현재 그룹지워"
@@ -1782,13 +1778,13 @@
 "라. 당신은 명시적으로 모든 집계되지 않는 속성들을 리스트해야 한다."
 
 #. Tag: title
-#: query_hql.xml:821
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr "서브질의들"
 
 #. Tag: para
-#: query_hql.xml:823
+#: query_hql.xml:854
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1802,7 +1798,7 @@
 "들)이 허용된다."
 
 #. Tag: programlisting
-#: query_hql.xml:829
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1812,7 +1808,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1822,7 +1818,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:833
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1832,7 +1828,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:835
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1842,7 +1838,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:837
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1850,36 +1846,37 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:839
-#, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 "HQL 서브질의들이 select 절 또는 where 절 내에서만 일어날 수 있음을 노트하라."
 
 #. Tag: para
-#: query_hql.xml:843
-#, no-c-format
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "서브질의들은 또한 <literal>row value constructor</literal> 구문을 활용할 수 "
 "있다. 상세한 것은 <xref linkend=\"queryhql-tuple\"/>를 보라."
 
 #. Tag: title
-#: query_hql.xml:851
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr "HQL 예제들"
 
 #. Tag: para
-#: query_hql.xml:853
-#, no-c-format
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "Hibernate 질의들은 매우 강력하고 복잡할 수 있다. 사실, 질의 언어의 힘은 "
 "Hibernate의 주요 판매 포인트들 중 하나이다. 다음은 내가 최근의 프로젝트에서 "
@@ -1887,16 +1884,16 @@
 "의 질의들은 이것들보다 훨씬 간단하다는 점을 노트하라!"
 
 #. Tag: para
-#: query_hql.xml:859
-#, no-c-format
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "다음 질의는 특정 고객에 대한 모든 지불되지 않은 주문들의 주문 id, 항목들의 개"
 "수, 그리고 주문의 전체 합계값 그리고 주어진 최소 전체 합계를 전체 합계값에 따"
@@ -1907,7 +1904,7 @@
 "지워지지 않은) subselect를 갖고 있다."
 
 #. Tag: programlisting
-#: query_hql.xml:868
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1931,7 +1928,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:870
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1941,7 +1938,7 @@
 "의 질의는 실제로 다음과 같았다:"
 
 #. Tag: programlisting
-#: query_hql.xml:875
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1960,7 +1957,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:908
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -1978,7 +1975,7 @@
 "subselect를 가진 SQL 질의로 변환된다."
 
 #. Tag: programlisting
-#: query_hql.xml:885
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1999,17 +1996,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:887
-#, no-c-format
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "만일 내가 <literal>statusChanges</literal> 콜렉션을 set가 아닌 list로 매핑했"
 "다면, 그 질의는 작성하기가 훨씬 더 간단했을 것이다."
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2023,7 +2020,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:925
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -2043,7 +2040,7 @@
 "의 SQL 질의로 번역된다."
 
 #. Tag: programlisting
-#: query_hql.xml:903
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2056,7 +2053,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:905
+#: query_hql.xml:936
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
@@ -2065,7 +2062,7 @@
 "있을 것이다."
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2079,40 +2076,39 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:914
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "대량 update와 delete"
 
 #. Tag: para
-#: query_hql.xml:916
-#, no-c-format
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "HQL은 이제 <literal>update</literal>, <literal>delete</literal> 그리고 "
 "<literal>insert ... select ...</literal> 문장들을 지원한다. 상세한 것은 "
 "<xref linkend=\"batch-direct\"/>를 보라."
 
 #. Tag: title
-#: query_hql.xml:924
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "팁들 &amp; 트릭들"
 
 #. Tag: para
-#: query_hql.xml:926
-#, no-c-format
-msgid ""
-"You can count the number of query results without actually returning them:"
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr ""
 "당신은 실제로 질의 결과들을 반환하지 않고서 그것들(질의 결과들)의 개수를 카운"
 "트할 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:930
+#: query_hql.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2120,14 +2116,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:932
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
 "콜렉션의 크기에 따라 결과를 순서(ordering)지우려면, 다음 질의를 사용하라:"
 
 #. Tag: programlisting
-#: query_hql.xml:936
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2138,7 +2134,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:938
+#: query_hql.xml:969
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2148,21 +2144,21 @@
 "where 절 내에 selection 사이즈에 대한 조건을 위치지울 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:943
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:945
-#, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr ""
 "만일 당신의 데이터베이스가 subselect를 지원하지 않을 경우, 다음 질의를 사용하"
 "라:"
 
 #. Tag: programlisting
-#: query_hql.xml:949
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2173,17 +2169,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:951
-#, no-c-format
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "이 해결책이 inner 조인 때문에 0개의 메시지를 가진 <literal>User</literal>를 "
 "반환할 수 없으므로, 다음 형식이 또한 유용하다:"
 
 #. Tag: programlisting
-#: query_hql.xml:956
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2194,14 +2190,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:958
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
 "하나의 JavaBean의 프로퍼티들은 명명된 질의 파라미터들에 바인드될 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:962
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2211,7 +2207,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:964
+#: query_hql.xml:996
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2221,7 +2217,7 @@
 "하는 것이 가능하다:"
 
 #. Tag: programlisting
-#: query_hql.xml:968
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2232,15 +2228,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:970
-#, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "콜렉션 요소들은 질의 필터를 사용하여 순서(ordering)지워지거나 그룹지워질 수 "
 "도 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:974
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2250,13 +2246,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:976
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "당신은 콜렉션을 초기화 하지 않고서 그것(콜렉션)의 크기를 찾을 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:1012
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2264,37 +2260,37 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:985
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr "컴포넌트들"
 
 #. Tag: para
-#: query_hql.xml:987
-#, no-c-format
+#: query_hql.xml:1019
+#, fuzzy, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 "컴포넌트들은 단지 간단한 값 유형들이 HQL 질의들 내에 사용될 수 있는 모든 방법"
 "으로 사용될 수 있다. 그것들은 <literal>select</literal> 절 내에 나타날 수 있"
 "다."
 
 #. Tag: programlisting
-#: query_hql.xml:992 query_hql.xml:1038
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:993
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:995
+#: query_hql.xml:1027
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2304,37 +2300,37 @@
 "literal> 절 내에 사용될 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:1000
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1001
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1003
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr "컴포넌트들은 또한 <literal>order by</literal> 절 내에 사용될 수 있다:"
 
 #. Tag: programlisting
-#: query_hql.xml:1007
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1008
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1010
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2344,20 +2340,20 @@
 "\">row value constructors</xref>에 있다."
 
 #. Tag: title
-#: query_hql.xml:1016
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr "Row value constructor 구문"
 
 #. Tag: para
-#: query_hql.xml:1018
-#, no-c-format
+#: query_hql.xml:1050
+#, fuzzy, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 "HQL은 ANSI SQL <literal>row value constructor</literal> 구문(종종 "
 "<literal>tuple</literal> 구문이라 명명된다)의 사용을 지원한다. 비록 데이터베"
@@ -2366,7 +2362,7 @@
 "트를 정의하는 Person 엔티티를 검토하자:"
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1057
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2374,23 +2370,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
-#, no-c-format
+#: query_hql.xml:1059
+#, fuzzy, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 "비록 약간 장황스럽지만 그것은 유효한 구문이다. 이것을 약간 더 간결하게 만들"
 "고 <literal>row value constructor</literal> 구문을 사용하는 것이 좋다:"
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1066
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2399,18 +2395,17 @@
 "<literal>select</literal>절 내에 이것을 지정하는 것이 또한 유용할 수 있다:"
 
 #. Tag: para
-#: query_hql.xml:1040
-#, no-c-format
+#: query_hql.xml:1072
+#, fuzzy, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 "<literal>row value constructor</literal> 구문을 사용하는 또 다른 경우는 다중 "
 "값들에 대해 비교할 필요가 있는 서브 질의들을 사용할 때이다:"
 
 #. Tag: programlisting
-#: query_hql.xml:1045
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2420,12 +2415,24 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1047
-#, no-c-format
+#: query_hql.xml:1079
+#, fuzzy, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
 "만일 당신이 이 구문을 사용하고자 원할 경우에 고려해야 할 한 가지는 질의가 메"
 "타데이터 내에 있는 컴포넌트 서브-속성들의 순서에 종속될 것이라는 점이다."
+
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "대개 당신은 한 개의 <emphasis>alias</emphasis>를 할당할 필요가 있을 것이"
+#~ "다. 왜냐하면 당신은 질의의 다른 부분들에서 <literal>Cat</literal>을 참조하"
+#~ "고자 원할 것이기 때문이다."
+
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "또는 실제 typesafe 자바 객체로서,"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,17 +11,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_sql.xml:5
+#: query_sql.xml:29
 #, no-c-format
 msgid "Native SQL"
 msgstr "Native SQL"
 
 #. Tag: para
-#: query_sql.xml:7
-#, no-c-format
+#: query_sql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -33,49 +33,49 @@
 "료한 이전 경로를 제공한다."
 
 #. Tag: para
-#: query_sql.xml:13
-#, no-c-format
+#: query_sql.xml:37
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3은 또한 모든 create, update, delete, load 오퍼레이션들에 대해 (내"
 "장 프로시저들을 포함하여) 손으로 작성된 SQL을 지정하는 것을 당신에게 허용해준"
 "다."
 
 #. Tag: title
-#: query_sql.xml:17
+#: query_sql.xml:41
 #, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "<literal>SQLQuery</literal> 사용하기"
 
 #. Tag: para
-#: query_sql.xml:19
-#, no-c-format
+#: query_sql.xml:43
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "native SQL 질의들의 실행은 <literal>SQLQuery</literal> 인터페이스를 통해 제어"
 "되며, 그것은 <literal>Session.createSQLQuery()</literal>을 호출하여 획득된"
 "다. 다음은 이 API를 질의에 사용하는 방법을 설명한다."
 
 #. Tag: title
-#: query_sql.xml:25
+#: query_sql.xml:49
 #, no-c-format
 msgid "Scalar queries"
 msgstr "스칼라 질의들"
 
 #. Tag: para
-#: query_sql.xml:27
+#: query_sql.xml:51
 #, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr "가장 기본적인 SQL 질의는 스칼라들(값들)의 목록을 얻는 것이다."
 
 #. Tag: programlisting
-#: query_sql.xml:30
+#: query_sql.xml:54
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
@@ -84,11 +84,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:32
-#, no-c-format
+#: query_sql.xml:56
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "이것들은 둘다 CATS 테이블 내에 있는 각각의 컬럼에 대한 스칼라 값들을 가진 "
@@ -96,19 +96,19 @@
 "제 순서와 타입들을 도출하는데 ResultSetMetadata를 사용할 것이다."
 
 #. Tag: para
-#: query_sql.xml:37
-#, no-c-format
+#: query_sql.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "<literal>ResultSetMetadata</literal> 사용의 오버헤드를 피하거나 간단하게는 반"
 "환되는 것을 보다 명시적이게끔 하기 위해 우리는 <literal>addScalar()</literal>"
 "를 사용할 수 있다."
 
 #. Tag: programlisting
-#: query_sql.xml:41
+#: query_sql.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -119,29 +119,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:43 query_sql.xml:89 query_sql.xml:170 query_sql.xml:321
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, no-c-format
 msgid "This query specified:"
 msgstr "이 질의는 다음을 지정했다:"
 
 #. Tag: para
-#: query_sql.xml:47 query_sql.xml:93 query_sql.xml:325
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr "SQL 질의 문자열"
 
 #. Tag: para
-#: query_sql.xml:51
+#: query_sql.xml:75
 #, no-c-format
 msgid "the columns and types to return"
 msgstr "반환할 컬럼들과 타입들"
 
 #. Tag: para
-#: query_sql.xml:55
-#, no-c-format
+#: query_sql.xml:79
+#, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
-"<literal>ResultSetMetdata</literal> but will instead explicitly get the ID, "
+"This will return Object arrays, but now it will not use "
+"<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
 "be returned, even though the query is using <literal>*</literal> and could "
@@ -155,7 +155,7 @@
 "세 개의 컬럼들 만이 반환될 것임을 의미한다."
 
 #. Tag: para
-#: query_sql.xml:63
+#: query_sql.xml:87
 #, no-c-format
 msgid ""
 "It is possible to leave out the type information for all or some of the "
@@ -163,7 +163,7 @@
 msgstr "스칼라들 중 몇몇 또는 전부에 대한 타입 정보를 남겨두는 것이 가능하다."
 
 #. Tag: programlisting
-#: query_sql.xml:66
+#: query_sql.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -174,24 +174,24 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:68
-#, no-c-format
+#: query_sql.xml:92
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "이것은 본질적으로 앞의 것과 동일한 질의이지만, 이제 "
 "<literal>ResultSetMetaData</literal>는 ID의 타입이 명시적으로 지정되어 있으므"
 "로 NAME과 BIRTHDATE의 타입을 결정하는데 사용된다."
 
 #. Tag: para
-#: query_sql.xml:72
-#, no-c-format
+#: query_sql.xml:96
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "java.sql.Types returned from ResultSetMetaData이 Hibernate 타입들로 매핑되는 "
@@ -201,13 +201,13 @@
 "시키는 것이 가능하다."
 
 #. Tag: title
-#: query_sql.xml:80
+#: query_sql.xml:104
 #, no-c-format
 msgid "Entity queries"
 msgstr "Entity 질의들"
 
 #. Tag: para
-#: query_sql.xml:82
+#: query_sql.xml:106
 #, no-c-format
 msgid ""
 "The above queries were all about returning scalar values, basically "
@@ -220,7 +220,7 @@
 "를 통해 native sql 질의로부터 엔티티 객체들을 얻는 방법을 보여준다."
 
 #. Tag: programlisting
-#: query_sql.xml:87
+#: query_sql.xml:111
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.class);\n"
@@ -230,13 +230,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:97
+#: query_sql.xml:121
 #, no-c-format
 msgid "the entity returned by the query"
 msgstr "그 질의에 의해 반환되는 엔티티"
 
 #. Tag: para
-#: query_sql.xml:101
+#: query_sql.xml:125
 #, no-c-format
 msgid ""
 "Assuming that Cat is mapped as a class with the columns ID, NAME and "
@@ -247,7 +247,7 @@
 "둘다 각각의 요소가 하나의 Cat 엔티티인 하나의 List를 반환할 것이다."
 
 #. Tag: para
-#: query_sql.xml:105
+#: query_sql.xml:129
 #, no-c-format
 msgid ""
 "If the entity is mapped with a <literal>many-to-one</literal> to another "
@@ -265,7 +265,7 @@
 "명시적인 것을 더 선호한다:"
 
 #. Tag: programlisting
-#: query_sql.xml:113
+#: query_sql.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID FROM CATS"
@@ -274,19 +274,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:115
+#: query_sql.xml:139
 #, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr "이것은 cat.getDog()이 고유하게 기능하는 것을 허용한다."
 
 #. Tag: title
-#: query_sql.xml:119
+#: query_sql.xml:143
 #, no-c-format
 msgid "Handling associations and collections"
 msgstr "연관들과 콜렉션들을 처리하기"
 
 #. Tag: para
-#: query_sql.xml:121
+#: query_sql.xml:145
 #, no-c-format
 msgid ""
 "It is possible to eagerly join in the <literal>Dog</literal> to avoid the "
@@ -300,7 +300,7 @@
 "션 내에서 조인시키는 것을 당신에게 허용해준다."
 
 #. Tag: programlisting
-#: query_sql.xml:126
+#: query_sql.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID, D_ID, "
@@ -311,15 +311,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:128
-#, no-c-format
+#: query_sql.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "이 예제에서 반환되는 <literal>Cat</literal>들은 데이터베이스에 대한 임의의 특"
 "별한 라운드크립 없이 전체적으로 초기화된 그것들의 <literal>dog</literal> 프로"
@@ -329,7 +329,7 @@
 "우, 콜렉션들에 대해 동일한 eager joining을 행하는 것이 가능하다."
 
 #. Tag: programlisting
-#: query_sql.xml:136
+#: query_sql.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_NAME, "
@@ -340,13 +340,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:138
-#, no-c-format
+#: query_sql.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "이 단계에서 우리는 Hibernate에서 native 질의들을 사용가능하도록 만들기 위해 "
 "sql 질의들을 강화시키지는 것을 시작하지 않고서도 native 질의들로서 가능한 것"
@@ -354,18 +354,18 @@
 "또는 디폴트 alias/column 이름들이 충분하지 않을 때 발생하기 시작한다."
 
 #. Tag: title
-#: query_sql.xml:146
+#: query_sql.xml:170
 #, no-c-format
 msgid "Returning multiple entities"
 msgstr "여러 개의 엔티티들을 반환하기"
 
 #. Tag: para
-#: query_sql.xml:148
-#, no-c-format
+#: query_sql.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "지금까지 결과 셋 컬럼 이름들은 매핑 문서 내에 지정된 컬럼 이름들과 동일하다"
@@ -374,7 +374,7 @@
 "다."
 
 #. Tag: para
-#: query_sql.xml:153
+#: query_sql.xml:177
 #, no-c-format
 msgid ""
 "Column alias injection is needed in the following query (which most likely "
@@ -382,7 +382,7 @@
 msgstr "컬럼 alias 주입은 다음 질의(아마 실패할 것이다)에서 필요하다:"
 
 #. Tag: programlisting
-#: query_sql.xml:156
+#: query_sql.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m WHERE c."
@@ -393,15 +393,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:158
-#, no-c-format
+#: query_sql.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specificed in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "이 질의의 목적은 단위 행 당 두 개의 Cat 인스턴스들, 하나의 cat 그리고 그것의 "
 "mother를 반환하는 것이다. 왜냐하면 그것들이 동일한 컬럼 이름들로 매핑되어 있"
@@ -410,13 +410,13 @@
 "\" 등의 형식일 것이다."
 
 #. Tag: para
-#: query_sql.xml:165
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "다음 형식은 컬럼 이름 중복 취약점을 갖지 않는다:"
 
 #. Tag: programlisting
-#: query_sql.xml:168
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -427,7 +427,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:174
+#: query_sql.xml:202
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -436,23 +436,22 @@
 "컬럼 alias들을 주입하기 위한 Hibernate용 placeholder들을 가진 SQL 질의 문자열"
 
 #. Tag: para
-#: query_sql.xml:179
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr "그 질의에 의해 반환되는 엔티티들"
 
 #. Tag: para
-#: query_sql.xml:183
-#, no-c-format
+#: query_sql.xml:211
+#, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicity, but even in "
-"this case we let Hibernate inject the SQL column aliases for each property. "
-"The placeholder for a column alias is just the property name qualified by "
-"the table alias. In the following example, we retrieve Cats and their "
-"mothers from a different table (cat_log) to the one declared in the mapping "
-"metadata. Notice that we may even use the property aliases in the where "
-"clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "위에 사용된 {cat.*} 과 {mother.*} 표기는 \"모든 프로퍼티들\"에 대한 생략이"
 "다. 다른 방법으로 당신은 컬럼들을 명시적으로 열거할 수도 있지만, 이 경우에 우"
@@ -463,7 +462,7 @@
 "좋다면 심지어 where 절 내에 프로퍼티 alias를 사용할 수도 있음을 주지하라."
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -478,19 +477,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:195
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr "alias 참조와 프로퍼티 참조"
 
 #. Tag: para
-#: query_sql.xml:197
-#, no-c-format
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "대부분의 경우에 위의 alias 주입이 필요하지만, composite 프로퍼티들, 상속 판별"
 "자들 (inheritance discriminators), 콜렉션 등과 같은 보다 복잡한 매핑들과 관련"
@@ -498,233 +497,234 @@
 "데 사용될 몇몇 특별한 alias들이 존재한다."
 
 #. Tag: para
-#: query_sql.xml:202
-#, no-c-format
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "다음 테이블은 alias 주입을 사용하는 다른 가능성들을 보여준다. 노트: 결과 내"
 "에 있는 alias 이름들이 예제이며, 각각의 alias는 사용될 때 하나의 유일한 이름"
 "과 아마 다른 이름을 가질 것이다."
 
 #. Tag: title
-#: query_sql.xml:208
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr "alias 주입 이름들"
 
 #. Tag: entry
-#: query_sql.xml:219
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr "설명"
 
 #. Tag: entry
-#: query_sql.xml:221
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr "구문"
 
 #. Tag: entry
-#: query_sql.xml:223
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr "예제"
 
 #. Tag: entry
-#: query_sql.xml:229
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr "간단한 프로퍼티"
 
 #. Tag: literal
-#: query_sql.xml:231
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
 #. Tag: literal
-#: query_sql.xml:233
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:237
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr "composite 프로퍼티"
 
 #. Tag: literal
-#: query_sql.xml:239
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:241
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
 #. Tag: entry
-#: query_sql.xml:246
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "엔티티의 판별자(Discriminator)"
 
 #. Tag: literal
-#: query_sql.xml:248
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:250
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:254
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr "엔티티의 모든 프로퍼티들"
 
 #. Tag: literal
-#: query_sql.xml:256 query_sql.xml:304
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:258
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:262
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr "콜렉션 키"
 
 #. Tag: literal
-#: query_sql.xml:264
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:266
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr "콜렉션의 id"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr "콜렉션의 요소"
 
 #. Tag: literal
-#: query_sql.xml:280
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:286
-#, no-c-format
-msgid "roperty of the element in the collection"
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "콜렉션 내에 있는 요소의 프로퍼티"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "콜렉션 내에 있는 요소의 모든 프로퍼티들"
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr "콜렉션의 모든 프로퍼티들"
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:315
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "non-managed 엔티티들을 반환하기"
 
 #. Tag: para
-#: query_sql.xml:317
-#, no-c-format
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "native sql 질의에 ResultTransformer를 적용하는 것이 가능하다. 예를 들어 non-"
 "managed 엔티티들을 반환하기 위해 ResultTransformer를 허용하는 것."
 
 #. Tag: programlisting
-#: query_sql.xml:319
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -732,13 +732,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:329
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr "결과 변환자(transformer)"
 
 #. Tag: para
-#: query_sql.xml:333
+#: query_sql.xml:361
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -750,37 +750,37 @@
 "literal>의 리스트를 반환할 것이다."
 
 #. Tag: title
-#: query_sql.xml:340
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "상속 처리하기"
 
 #. Tag: para
-#: query_sql.xml:342
-#, no-c-format
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "상속의 부분으로서 매핑되는 엔티티들을 질의하는 native sql 질의들은 baseclass"
 "의 모든 프로퍼티들을 포함해야 하고 그 모든 것이 서브클래스화 되어야 한다."
 
 #. Tag: title
-#: query_sql.xml:348
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr "파라미터들"
 
 #. Tag: para
-#: query_sql.xml:350
-#, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr ""
 "Native sql 질의들은 위치 파라미터들 뿐만 아니라 명명된 파라미터들을 지원한다:"
 
 #. Tag: programlisting
-#: query_sql.xml:353
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -793,17 +793,17 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:361
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "명명된 SQL 질의들"
 
 #. Tag: para
-#: query_sql.xml:363
-#, no-c-format
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "명명된 SQL 질의들은 HQL 질의와 동일한 방법으로 매핑 문서 속에 정의될 수 있고 "
@@ -811,7 +811,7 @@
 "호출을 필요로 하지 <emphasis>않는다</emphasis>."
 
 #. Tag: programlisting
-#: query_sql.xml:368
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -825,7 +825,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:370
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -835,19 +835,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:372
-#, no-c-format
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "<literal>&lt;return-join&gt;</literal> 요소와 <literal>&lt;load-"
 "collection&gt;</literal> 요소는 연관들을 조인시키고 콜렉션들을 각각 초기화 시"
 "키는 질의들을 정의하는데 사용된다."
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -868,7 +868,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:379
+#: query_sql.xml:406
 #, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
@@ -880,7 +880,7 @@
 "한다:"
 
 #. Tag: programlisting
-#: query_sql.xml:383
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -893,12 +893,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:385
-#, no-c-format
+#: query_sql.xml:412
+#, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them accross several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "당신은 여러 개의 명명된 질의들을 가로질러 재사용하거나 "
 "<literal>setResultSetMapping()</literal> API를 통해 결과셋 매핑정보들을 재사"
@@ -906,7 +907,7 @@
 "을 구체화 시킬 수 있다."
 
 #. Tag: programlisting
-#: query_sql.xml:390
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -930,17 +931,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:392
-#, no-c-format
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr ""
 "다른방법으로 당신은 당신의 hbm 파일들 내에 직접 자바 코드로 된 결과셋 매핑 정"
 "보를 사용할 수 있다."
 
 #. Tag: programlisting
-#: query_sql.xml:395
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -952,18 +953,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:398
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr "명시적으로 column/alias 이름들을 지정하는데 return-property 사용하기"
 
 #. Tag: para
-#: query_sql.xml:401
-#, no-c-format
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "Hibernate로 하여금 그것 자신의 alias들을 끼워넣도록 하기 위해 <literal>{}</"
 "literal>-구문을 사용하는 것 대신에, <literal>&lt;return-property&gt;</"
@@ -971,7 +972,7 @@
 "로 알려줄 수 있다."
 
 #. Tag: programlisting
-#: query_sql.xml:406
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -989,11 +990,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:408
-#, no-c-format
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal>는 또한 다중 컬럼들에 대해 동작한"
@@ -1001,7 +1002,7 @@
 "<literal>{}</literal>-구문을 가진 제약을 해결해준다."
 
 #. Tag: programlisting
-#: query_sql.xml:413
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -1022,12 +1023,12 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:415
-#, no-c-format
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "이 예제에서 우리는 끼워넣기(injection)를 위해 <literal>{}</literal>-구문과 함"
 "께 <literal>&lt;return-property&gt;</literal>를 사용했음을 주목하라. 사용자들"
@@ -1035,7 +1036,7 @@
 "용해줌으로써."
 
 #. Tag: para
-#: query_sql.xml:420
+#: query_sql.xml:447
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1046,20 +1047,20 @@
 "한다."
 
 #. Tag: title
-#: query_sql.xml:426
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "질의를 위한 내장 프로시저 사용하기"
 
 #. Tag: para
-#: query_sql.xml:428
-#, no-c-format
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernate 3은 내장 프로시저들과 함수들을 통한 질의 지원을 도입한다. 대부분의 "
 "다음 문서는 양자 모두에 동일하게 적용된다. 내장 프로시저/함수는 Hibernate와 "
@@ -1067,7 +1068,7 @@
 "한다. Oracle9 이상의 버전에서 그런 내장 프로시저에 대한 예제는 다음과 같다:"
 
 #. Tag: programlisting
-#: query_sql.xml:434
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1085,7 +1086,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:436
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
@@ -1093,7 +1094,7 @@
 "query)를 통해 그것을 매핑할 필요가 있다."
 
 #. Tag: programlisting
-#: query_sql.xml:439
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1114,30 +1115,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:441
-#, no-c-format
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "내장 프로시저들은 현재 스칼라들과 엔티티들 만을 반환함을 주목하라. "
 "<literal>&lt;return-join&gt;</literal>과 <literal>&lt;load-collection&gt;</"
 "literal>은 지원되지 않는다."
 
 #. Tag: title
-#: query_sql.xml:446
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "내장 프로시저들을 사용하는 규칙들/제약들"
 
 #. Tag: para
-#: query_sql.xml:448
-#, no-c-format
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1150,20 +1151,20 @@
 "을 갖고 있기 때문에, 규칙들은 각각의 데이터베이스에 따라 차이가 난다."
 
 #. Tag: para
-#: query_sql.xml:455
-#, no-c-format
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "내장 프로시저 질의들은 <literal>setFirstResult()/setMaxResults()</literal>로"
 "서 쪽매김 될 수 없다."
 
 #. Tag: para
-#: query_sql.xml:458
-#, no-c-format
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
@@ -1172,20 +1173,20 @@
 "parameters&gt;}</literal>. Native 호출 구문은 지원되지 않는다."
 
 #. Tag: para
-#: query_sql.xml:463
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "Oracle의 경우 다음 규칙들이 적용된다:"
 
 #. Tag: para
-#: query_sql.xml:467
-#, no-c-format
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "하나의 함수는 하나의 결과 셋을 반환해야 한다. 프로시저의 첫 번째 파라미터는 "
 "하나의 결과 셋을 반환하는 하나의 <literal>OUT</literal>이어야 한다. 이것은 "
@@ -1194,19 +1195,19 @@
 "는데, Oracle 보고서를 보라."
 
 #. Tag: para
-#: query_sql.xml:476
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "Sybase 또는 MS SQL server의 경우 다음 규칙들이 적용된다:"
 
 #. Tag: para
-#: query_sql.xml:480
-#, no-c-format
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "프로시저는 한 개의 결과 셋을 반환해야 한다. 이들 서버들이 여러 개의 결과셋들"
 "과 업데이트 카운트들을 반환 할수 있다/할 것이이므로, Hibernate는 결과들을 반"
@@ -1214,7 +1215,7 @@
 "이다. 그 밖의 모든 것은 폐기될 것이다."
 
 #. Tag: para
-#: query_sql.xml:488
+#: query_sql.xml:515
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1225,13 +1226,13 @@
 "이 아니다."
 
 #. Tag: title
-#: query_sql.xml:498
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "create, update 그리고 delete를 위한 맞춤형 SQL"
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:527
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1249,7 +1250,7 @@
 "을 오버라이드 시킨다:"
 
 #. Tag: programlisting
-#: query_sql.xml:508
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1265,19 +1266,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:510
-#, no-c-format
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "SQL이 당신의 데이터베이스 내에서 직접 실행되어서, 당신이 좋아하는 임의의 "
 "dialect를 사용하는 것이 자유롭다. 만일 당신이 데이터베이스 지정적인 SQL을 사"
 "용할 경우 이것은 물론 당신의 매핑의 이식성을 감소시킬 것이다."
 
 #. Tag: para
-#: query_sql.xml:514
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1286,7 +1287,7 @@
 "만일 <literal>callable</literal> 속성이 설정되면 내장 프로시저들이 지원된다:"
 
 #. Tag: programlisting
-#: query_sql.xml:517
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1302,25 +1303,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:519
-#, no-c-format
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr ""
 "위치 파라미터들은 Hibernate가 그것들을 기대하는 것과 같은 순서가 되어야 하므"
 "로, 위치 파라미터들의 순서는 현재 절대적으로 중요하다."
 
 #. Tag: para
-#: query_sql.xml:522
-#, no-c-format
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "당신은 <literal>org.hiberate.persister.entity</literal> 레벨로 디버그 로깅을 "
 "사용 가능하게 함으로써 예상된 순서를 볼 수 있다. 이 레벨을 이용 가능하게 하"
@@ -1330,14 +1331,13 @@
 "염두에 두라.)"
 
 #. Tag: para
-#: query_sql.xml:529
-#, no-c-format
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "Hibernate가 문장의 성공을 위해 몇몇 실행 시 체크들을 행하므로, 내장 프로시저"
 "들은 대부분의 경우들(읽기:다른 경우들 보다 그것을 더 잘 행한다)에서 insert되"
@@ -1346,7 +1346,7 @@
 "킨다:"
 
 #. Tag: programlisting
-#: query_sql.xml:535
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1366,20 +1366,20 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:539
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "로딩을 위한 맞춤형 SQL"
 
 #. Tag: para
-#: query_sql.xml:541
-#, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 "당신은 또한 엔티티 로딩을 위한 당신 자신의 SQL (또는 HQL)을 선언할 수도 있다:"
 
 #. Tag: programlisting
-#: query_sql.xml:544
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1392,17 +1392,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
-#, no-c-format
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr ""
 "이것은 앞서 논의했듯이 단지 명명된 질의 선언이다. 당신은 class 매핑 속에 이 "
 "명명된 질의를 참조할 수 있다:"
 
 #. Tag: programlisting
-#: query_sql.xml:549
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1415,19 +1415,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:551
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr "이것은 심지어 내장 프로시저들에 동작한다."
 
 #. Tag: para
-#: query_sql.xml:553
-#, no-c-format
-msgid "You may even define a query for collection loading:"
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr "당신은 콜렉션 로딩을 위한 한 개의 질의를 정의할 수도 있다:"
 
 #. Tag: programlisting
-#: query_sql.xml:555
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1438,7 +1438,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:557
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1451,17 +1451,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:559
-#, no-c-format
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr ""
 "당신은 심지어 조인 페칭에 의해 하나의 콜렉션을 로드시키는 하나의 엔티티를 정"
 "의할 수 있다:"
 
 #. Tag: programlisting
-#: query_sql.xml:562
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: session_api.xml:5
+#: session_api.xml:29
 #, no-c-format
 msgid "Working with objects"
 msgstr "객체들로 작업하기"
 
 #. Tag: para
-#: session_api.xml:7
-#, no-c-format
+#: session_api.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "Hibernate는 기본 데이터베이스 관리 시스템의 상세로부터 개발자들을 은폐시켜줄 "
 "뿐만 아니라, 또한 객체들에 대한 <emphasis>상태 관리</emphasis>를 제공하는 하"
@@ -34,7 +34,7 @@
 "케이션들에서 영속에 관한 매우 고유한 객체-지향적 관점이다."
 
 #. Tag: para
-#: session_api.xml:16
+#: session_api.xml:40
 #, no-c-format
 msgid ""
 "In other words, Hibernate application developers should always think about "
@@ -49,27 +49,27 @@
 "리케이션 개발자와 유일하게 관련된다."
 
 #. Tag: title
-#: session_api.xml:24
+#: session_api.xml:48
 #, no-c-format
 msgid "Hibernate object states"
 msgstr "Hibernate 객체 상태들"
 
 #. Tag: para
-#: session_api.xml:26
+#: session_api.xml:50
 #, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr "Hibernate 다음 객체 상태들을 정의하고 지원한다:"
 
 #. Tag: para
-#: session_api.xml:32
-#, no-c-format
+#: session_api.xml:56
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -84,15 +84,15 @@
 "<literal>Session</literal>을 사용하라."
 
 #. Tag: para
-#: session_api.xml:44
-#, no-c-format
+#: session_api.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -105,8 +105,8 @@
 "나 <literal>DELETE</literal> 문장들을 수작업으로 실행하지 않는다."
 
 #. Tag: para
-#: session_api.xml:55
-#, no-c-format
+#: session_api.xml:79
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -115,8 +115,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>Detached</emphasis> - 하나의 detached 인스턴스는 영속화 되었지만, "
 "그것의 <literal>Session</literal>이 닫혀진 객체이다. 물론 그 객체에 대한 참조"
@@ -128,23 +128,23 @@
 "emphasis>, 즉 사용자의 관점의 작업 단위라고 부른다."
 
 #. Tag: para
-#: session_api.xml:69
-#, no-c-format
+#: session_api.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "이제 우리는 상태들과 상태 전이(transition)들(그리고 전이를 트리거 시키는 "
 "Hibernate 메소드들)을 상세하게 논의할 것이다."
 
 #. Tag: title
-#: session_api.xml:77
+#: session_api.xml:101
 #, no-c-format
 msgid "Making objects persistent"
 msgstr "객체들을 영속화 시키기"
 
 #. Tag: para
-#: session_api.xml:79
+#: session_api.xml:103
 #, no-c-format
 msgid ""
 "Newly instantiated instances of a a persistent class are considered "
@@ -156,7 +156,7 @@
 "transient 인스턴스를 <emphasis>영속화</emphasis> 시킬 수 있다:"
 
 #. Tag: programlisting
-#: session_api.xml:86
+#: session_api.xml:110
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
@@ -167,15 +167,15 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:88
-#, no-c-format
+#: session_api.xml:112
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -188,11 +188,11 @@
 "()</literal>를 사용할 수도 있다."
 
 #. Tag: para
-#: session_api.xml:100
-#, no-c-format
+#: session_api.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -208,7 +208,7 @@
 "extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:111
+#: session_api.xml:135
 #, no-c-format
 msgid ""
 "<literal>save()</literal> does guarantee to return an identifier. If an "
@@ -224,17 +224,17 @@
 "running conversation with an extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:121
-#, no-c-format
+#: session_api.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr ""
 "다른 방법으로, 당신은 <literal>save()</literal>의 오버로드된 버전을 사용하여 "
 "식별자를 할당할 수 있다."
 
 #. Tag: programlisting
-#: session_api.xml:126
+#: session_api.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
@@ -247,12 +247,12 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:128
-#, no-c-format
+#: session_api.xml:152
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -267,13 +267,13 @@
 "<literal>NOT NULL</literal> 컨스트레인트를 위배할 수도 있다."
 
 #. Tag: para
-#: session_api.xml:138
-#, no-c-format
+#: session_api.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "당신이 연관된 객체들을 자동적으로 저장시키는데 Hibernate의 "
@@ -284,19 +284,19 @@
 "논의된다."
 
 #. Tag: title
-#: session_api.xml:149
+#: session_api.xml:173
 #, no-c-format
 msgid "Loading an object"
 msgstr "객체를 로드시키기"
 
 #. Tag: para
-#: session_api.xml:151
-#, no-c-format
+#: session_api.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "<literal>Session</literal>의 <literal>load()</literal> 메소드들은 만일 당신"
 "이 그것(영속 인스턴스)의 식별자들을 이미 알고 있을 경우에 영속 인스턴스를 검"
@@ -305,13 +305,13 @@
 "스턴스 속으로 로드시킬 것이다."
 
 #. Tag: programlisting
-#: session_api.xml:158
+#: session_api.xml:182
 #, no-c-format
 msgid "<![CDATA[Cat fritz = (Cat) sess.load(Cat.class, generatedId);]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:160
+#: session_api.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[// you need to wrap primitive identifiers\n"
@@ -321,13 +321,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:162
+#: session_api.xml:186
 #, no-c-format
 msgid "Alternatively, you can load state into a given instance:"
 msgstr "다른 방법으로 당신은 주어진 인스턴스 속으로 상태를 로드시킬 수 있다:"
 
 #. Tag: programlisting
-#: session_api.xml:166
+#: session_api.xml:190
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -337,17 +337,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:168
-#, no-c-format
+#: session_api.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "만일 일치하는 데이터베이스 행이 존재하지 않을 경우에 <literal>load()</"
 "literal>가 unrecoverable(복구 불가능한) 예외상황을 던질 것임을 노트하라. 만"
@@ -360,11 +360,11 @@
 "허용해준다."
 
 #. Tag: para
-#: session_api.xml:179
-#, no-c-format
+#: session_api.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "만일 당신이 하나의 일치하는 행이 존재하는지를 확신할 수 없을 경우, 당신은 "
@@ -373,7 +373,7 @@
 "null을 반환한다."
 
 #. Tag: programlisting
-#: session_api.xml:185
+#: session_api.xml:209
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id);\n"
@@ -385,10 +385,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:187
-#, no-c-format
+#: session_api.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -397,19 +397,19 @@
 "는 API 문서를 보라."
 
 #. Tag: programlisting
-#: session_api.xml:192
+#: session_api.xml:216
 #, no-c-format
 msgid "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id, LockMode.UPGRADE);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:194
-#, no-c-format
+#: session_api.xml:218
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "어떤 연관된 인스턴스들이나 포함된 콜렉션들은 당신이 그 연관에 대한 케스케이"
 "드 스타일로서 <literal>lock</literal> 또는 <literal>all</literal>을 지정하도"
@@ -417,7 +417,7 @@
 "라."
 
 #. Tag: para
-#: session_api.xml:201
+#: session_api.xml:225
 #, no-c-format
 msgid ""
 "It is possible to re-load an object and all its collections at any time, "
@@ -429,7 +429,7 @@
 "객체의 프로퍼티들 중 어떤 것을 초기화 시키는데 사용될 때 이것이 유용하다."
 
 #. Tag: programlisting
-#: session_api.xml:207
+#: session_api.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
@@ -438,13 +438,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:209
-#, no-c-format
+#: session_api.xml:233
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "중요한 질문이 대개 이 지점에서 나타난다: Hibernate는 데이터베이로부터 그것을 "
 "얼마나 많이 로드시키고 그리고 얼마나 많은 SQL <literal>SELECT</literal>들이 "
@@ -452,19 +452,19 @@
 "linkend=\"performance-fetching\"/>에 설명되어 있다."
 
 #. Tag: title
-#: session_api.xml:219
+#: session_api.xml:243
 #, no-c-format
 msgid "Querying"
 msgstr "질의하기"
 
 #. Tag: para
-#: session_api.xml:221
-#, no-c-format
+#: session_api.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -476,13 +476,13 @@
 "native SQL 속에 당신의 질의를 표현할 수도 있다."
 
 #. Tag: title
-#: session_api.xml:231
+#: session_api.xml:255
 #, no-c-format
 msgid "Executing queries"
 msgstr "질의들을 실행하기"
 
 #. Tag: para
-#: session_api.xml:233
+#: session_api.xml:257
 #, no-c-format
 msgid ""
 "HQL and native SQL queries are represented with an instance of <literal>org."
@@ -498,7 +498,7 @@
 "다:"
 
 #. Tag: programlisting
-#: session_api.xml:240
+#: session_api.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
@@ -528,17 +528,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:242
-#, no-c-format
+#: session_api.xml:266
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "하나의 질의는 대개 <literal>list()</literal>를 호출하여 실행되고, 질의의 결과"
 "는 메모리 내에서 하나의 콜렉션 속으로 전체적으로 로드될 것이다. 하나의 질의"
@@ -550,20 +550,20 @@
 "들 중복들을 간단하게 필터링할 수 있다."
 
 #. Tag: title
-#: session_api.xml:254
+#: session_api.xml:278
 #, no-c-format
 msgid "Iterating results"
 msgstr "결과들을 반복하기"
 
 #. Tag: para
-#: session_api.xml:256
-#, no-c-format
+#: session_api.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -580,7 +580,7 @@
 "의 접속을 필요로 할 수 있다."
 
 #. Tag: programlisting
-#: session_api.xml:268
+#: session_api.xml:292
 #, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
@@ -599,23 +599,23 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:272
+#: session_api.xml:296
 #, no-c-format
 msgid "Queries that return tuples"
 msgstr "튜플들을 반환하는 질의들"
 
 #. Tag: para
-#: session_api.xml:274
-#, no-c-format
+#: session_api.xml:298
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "Hibernate 질의들은 때때로 객체들의 튜플들을 반환하고, 그 경우에 각각의 튜플"
 "은 배열로서 반환된다:"
 
 #. Tag: programlisting
-#: session_api.xml:279
+#: session_api.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
@@ -633,18 +633,18 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:284
+#: session_api.xml:308
 #, no-c-format
 msgid "Scalar results"
 msgstr "스칼라 결과들"
 
 #. Tag: para
-#: session_api.xml:286
-#, no-c-format
+#: session_api.xml:310
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "질의들은 <literal>select</literal> 절 내에 하나의 클래스에 대한 하나의 프로퍼"
 "티를 지정할 수 있다. 그것들은 심지어 SQL 집계 함수들을 호출할 수도 있다. 프로"
@@ -652,7 +652,7 @@
 "이 아닌 것으)로 간주된다."
 
 #. Tag: programlisting
-#: session_api.xml:292
+#: session_api.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
@@ -672,20 +672,20 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:297
+#: session_api.xml:321
 #, no-c-format
 msgid "Bind parameters"
 msgstr "바인드 프라미터들"
 
 #. Tag: para
-#: session_api.xml:299
-#, no-c-format
+#: session_api.xml:323
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "<literal>Query</literal> 상의 메소드들은 명명된 파라미터들 또는 JDBC-스타일"
 "의 <literal>?</literal> 파라미터들에 바인딩 값들을 제공한다. <emphasis>JDBC와"
@@ -694,26 +694,26 @@
 "다. 명명된 파라미터들의 장점들은 다음과 같다:"
 
 #. Tag: para
-#: session_api.xml:309
+#: session_api.xml:333
 #, no-c-format
 msgid ""
 "named parameters are insensitive to the order they occur in the query string"
 msgstr "명명된 파라미터들은 그것들이 질의 문자열 내에 발생하는 순서에 관계없다"
 
 #. Tag: para
-#: session_api.xml:315
-#, no-c-format
-msgid "they may occur multiple times in the same query"
+#: session_api.xml:339
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "그것들은 동일한 질의 내에서 여러 번 발생할 수 있다"
 
 #. Tag: para
-#: session_api.xml:320
+#: session_api.xml:344
 #, no-c-format
 msgid "they are self-documenting"
 msgstr "그것은 자기-설명적이다"
 
 #. Tag: programlisting
-#: session_api.xml:326
+#: session_api.xml:350
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter (preferred)\n"
@@ -724,7 +724,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:328
+#: session_api.xml:352
 #, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
@@ -734,7 +734,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:330
+#: session_api.xml:354
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
@@ -748,25 +748,25 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:335
+#: session_api.xml:359
 #, no-c-format
 msgid "Pagination"
 msgstr "쪽매김"
 
 #. Tag: para
-#: session_api.xml:337
-#, no-c-format
+#: session_api.xml:361
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "만일 당신이 당신의 결과 셋에 경계(당신이 검색하고자 원하는 최대 개수 그리고/"
 "또는 당신이 검색하고자 원하는 첫 번째 행)을 지정할 필요가 있다면 당신은 "
 "<literal>Query</literal> 인터페이스의 메소드들을 사용해야 한다:"
 
 #. Tag: programlisting
-#: session_api.xml:343
+#: session_api.xml:367
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"from DomesticCat cat\");\n"
@@ -776,7 +776,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:345
+#: session_api.xml:369
 #, no-c-format
 msgid ""
 "Hibernate knows how to translate this limit query into the native SQL of "
@@ -786,19 +786,19 @@
 "있다."
 
 #. Tag: title
-#: session_api.xml:353
+#: session_api.xml:377
 #, no-c-format
 msgid "Scrollable iteration"
 msgstr "스크롤 가능한 iteration"
 
 #. Tag: para
-#: session_api.xml:355
-#, no-c-format
+#: session_api.xml:379
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "당신의 JDBC 드라이버가 스크롤 가능한 <literal>ResultSet</literal>들을 지원할 "
 "경우, <literal>Query</literal> 인터페이스는 <literal>ScrollableResults</"
@@ -806,7 +806,7 @@
 "게이션을 허용해준다."
 
 #. Tag: programlisting
-#: session_api.xml:362
+#: session_api.xml:386
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"select cat.name, cat from DomesticCat "
@@ -836,11 +836,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:364
-#, no-c-format
+#: session_api.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "열려진 데이터베이스 커넥션(과 커서)가 이 기능에 필요함을 노트하고, 만일 당신"
@@ -848,25 +848,25 @@
 "<literal>setFirstResult()</literal>를 사용하라."
 
 #. Tag: title
-#: session_api.xml:373
+#: session_api.xml:397
 #, no-c-format
 msgid "Externalizing named queries"
 msgstr "명명된 질의들을 구체화 시키기"
 
 #. Tag: para
-#: session_api.xml:375
-#, no-c-format
+#: session_api.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "당신은 또한 매핑 문서 속에 명명된 질의들을 정의할 수 있다.(만일 당신의 질의"
 "가 마크업으로서 해석될 수 있는 문자들을 포함할 경우에 <literal>CDATA</"
 "literal> 섹션을 사용하는 것을 기억하라))"
 
 #. Tag: programlisting
-#: session_api.xml:381
+#: session_api.xml:405
 #, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
@@ -877,13 +877,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:383
+#: session_api.xml:407
 #, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr "파라미터 바인딩과 실행은 프로그램 상으로 행해진다:"
 
 #. Tag: programlisting
-#: session_api.xml:387
+#: session_api.xml:411
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
@@ -893,26 +893,26 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:389
-#, no-c-format
+#: session_api.xml:413
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "실제 프로그램 코드는 사용되는 질의 언어에 독립적이고, 당신은 또한 메타데이터"
 "로 native SQL 질의들을 정의할 수도 있거나 그것들을 매핑 파일들 속에 기존 질의"
 "들을 위치지움으로써 기존 질의들을 Hibernate로 이전시킬 수도 있음을 노트하라."
 
 #. Tag: para
-#: session_api.xml:395
-#, no-c-format
+#: session_api.xml:419
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "또한 <literal>&lt;hibernate-mapping&gt;</literal> 요소 내에서 하나의 질의 선"
 "언은 그 질의에 대한 전역 유일 이름을 필요로 하고, 반면에 <literal>&lt;"
@@ -921,17 +921,17 @@
 "ByNameAndMaximumWeight</literal>."
 
 #. Tag: title
-#: session_api.xml:408
+#: session_api.xml:432
 #, no-c-format
 msgid "Filtering collections"
 msgstr "콜렉션들을 필터링 하기"
 
 #. Tag: para
-#: session_api.xml:409
-#, no-c-format
+#: session_api.xml:433
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "콜렉션 <emphasis>필터</emphasis>는 영속 콜렉션 또는 배열에 적용될 수 있는 질"
@@ -939,7 +939,7 @@
 "<literal>this</literal>를 참조할 수 있다."
 
 #. Tag: programlisting
-#: session_api.xml:415
+#: session_api.xml:439
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
@@ -951,31 +951,31 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:417
-#, no-c-format
+#: session_api.xml:441
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "반환되는 콜렉션은 하나의 bag으로 간주되고, 그것은 주어진 콜렉션에 대한 사본이"
 "다. 원래의 콜렉션은 변경되지 않는다 (이것은 이름 \"filter\"의 의미와는 정반대"
 "이지만, 예상되는 행위와 일치된다)."
 
 #. Tag: para
-#: session_api.xml:423
-#, no-c-format
+#: session_api.xml:447
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "필터들은 <literal>from</literal> 절을 필요로 하지 않음을 관찰하라(필요할 경우"
 "에 필터들이 한 개의 from 절을 가질 수 있을지라도). 필터들은 콜렉션 요소들 자"
 "체들을 반환하는 것으로 한정되지 않는다."
 
 #. Tag: programlisting
-#: session_api.xml:428
+#: session_api.xml:452
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
@@ -985,17 +985,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:430
-#, no-c-format
+#: session_api.xml:454
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "심지어 하나의 공백의 필터 질의도 예를 들어 거대한 콜렉션 내에 있는 요소들의 "
 "부분집합들을 로드시키는데 유용하다:"
 
 #. Tag: programlisting
-#: session_api.xml:435
+#: session_api.xml:459
 #, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
@@ -1005,17 +1005,17 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:440
+#: session_api.xml:464
 #, no-c-format
 msgid "Criteria queries"
 msgstr "Criteria 질의들"
 
 #. Tag: para
-#: session_api.xml:442
-#, no-c-format
+#: session_api.xml:466
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1024,7 +1024,7 @@
 "들 경우들을 위한 직관적인 <literal>Criteria</literal> query API를 제공한다:"
 
 #. Tag: programlisting
-#: session_api.xml:448
+#: session_api.xml:472
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = session.createCriteria(Cat.class);\n"
@@ -1034,7 +1034,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:450
+#: session_api.xml:474
 #, no-c-format
 msgid ""
 "The <literal>Criteria</literal> and the associated <literal>Example</"
@@ -1045,20 +1045,20 @@
 "linkend=\"querycriteria\"/>에서 상세하게 논의된다."
 
 #. Tag: title
-#: session_api.xml:458
+#: session_api.xml:482
 #, no-c-format
 msgid "Queries in native SQL"
 msgstr "native SQL에서 질의들"
 
 #. Tag: para
-#: session_api.xml:460
-#, no-c-format
+#: session_api.xml:484
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "당신은 <literal>createSQLQuery()</literal>를 사용하여 SQL 속에 하나의 질의를 "
 "표현할 수 있고, Hibernate로 하여금 결과 셋들로부터 객체들로의 매핑을 처리하도"
@@ -1068,7 +1068,7 @@
 "들을 중괄호들 속에 포함시켜야 한다:"
 
 #. Tag: programlisting
-#: session_api.xml:468
+#: session_api.xml:492
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
@@ -1078,7 +1078,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:470
+#: session_api.xml:494
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
@@ -1091,10 +1091,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:472
-#, no-c-format
+#: session_api.xml:496
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1103,24 +1103,24 @@
 "찾을 수 있다."
 
 #. Tag: title
-#: session_api.xml:483
+#: session_api.xml:507
 #, no-c-format
 msgid "Modifying persistent objects"
 msgstr "영속 객체들을 변경하기"
 
 #. Tag: para
-#: session_api.xml:485
-#, no-c-format
+#: session_api.xml:509
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "<emphasis>트랜잭션 상의 영속 인스턴스들</emphasis> (예를들면. "
 "<literal>Session</literal>에 의해 로드되고, 저장되고, 생성되거나 질의된 객체"
@@ -1133,7 +1133,7 @@
 "시키고 나서, 그것을 직접 처리하는 것이다:"
 
 #. Tag: programlisting
-#: session_api.xml:496
+#: session_api.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat cat = (DomesticCat) sess.load( Cat.class, new Long"
@@ -1143,14 +1143,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:498
-#, no-c-format
+#: session_api.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "때때로 이 프로그래밍 모형은 불충분하다. 왜냐하면 그것은 동일한 세션 내에서 "
 "(객체를 로드시키는) SQL <literal>SELECT</literal>와 (그것의 업데이트된 상태"
@@ -1158,19 +1157,19 @@
 "이다. 그러므로 Hibernate는 detached 인스턴스들을 사용하는 대안적인 접근법을 "
 "제공한다."
 
-#. Tag: emphasis
-#: session_api.xml:506
+#. Tag: para
+#: session_api.xml:529
 #, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "Hibernate는 <placeholder-1/> 문장 또는 <placeholder-2/> 문장의 직접적인 실행"
@@ -1184,13 +1183,13 @@
 "이션 트릭들에 대해서는 <xref linkend=\"batch\"/>을 보라."
 
 #. Tag: title
-#: session_api.xml:521
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "detached 객체들을 변경시키기"
 
 #. Tag: para
-#: session_api.xml:523
+#: session_api.xml:548
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1206,7 +1205,7 @@
 "터를 사용한다."
 
 #. Tag: para
-#: session_api.xml:530
+#: session_api.xml:555
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1218,7 +1217,7 @@
 "써 이 모형을 지원한다:"
 
 #. Tag: programlisting
-#: session_api.xml:536
+#: session_api.xml:561
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1235,7 +1234,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:538
+#: session_api.xml:563
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1247,16 +1246,16 @@
 "이 그것을 다시 재첨부하려고 시도할 때, 예외상황이 던져졌을 것이다."
 
 #. Tag: para
-#: session_api.xml:544
-#, no-c-format
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "만일 그 세션이 동일한 식별자를 가진 영속 인스턴스를 이미 포함하지 않음을 당신"
 "이 확신하는 경우에는 <literal>update()</literal>를 사용하고, 만일 당신이 세션"
@@ -1267,14 +1266,14 @@
 "첫 번째 메소드이다."
 
 #. Tag: para
-#: session_api.xml:553
-#, no-c-format
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "어플리케이션은 만일 그것이 detached 인스턴스들의 상태가 또한 업데이트 되는 것"
 "을 원할 경우에<emphasis>만</emphasis> 주어진 detached 인스턴스로부터 도달 가"
@@ -1283,19 +1282,19 @@
 "하여 자동화 될 수 있고, <xref linkend=\"objectstate-transitive\"/>를 보라."
 
 #. Tag: para
-#: session_api.xml:560
-#, no-c-format
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "<literal>lock()</literal> 메소드는 또한 하나의 객체를 새로운 세션에 대해 다"
 "시 연관시키는것을 어플리케이션에게 허용해준다. 하지만 detached 인스턴스는 변"
 "경되지 않아야 한다!"
 
 #. Tag: programlisting
-#: session_api.xml:565
+#: session_api.xml:590
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1307,11 +1306,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:567
-#, no-c-format
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1320,7 +1319,7 @@
 "첨부는 <literal>lock()</literal>에 대한 유일한 쓰임새는 아니다."
 
 #. Tag: para
-#: session_api.xml:574
+#: session_api.xml:599
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1330,13 +1329,13 @@
 "에서 논의된다."
 
 #. Tag: title
-#: session_api.xml:581
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "자동적인 상태 검출"
 
 #. Tag: para
-#: session_api.xml:583
+#: session_api.xml:608
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1350,7 +1349,7 @@
 "는 이 기능을 구현한다."
 
 #. Tag: programlisting
-#: session_api.xml:590
+#: session_api.xml:615
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1368,7 +1367,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:592
+#: session_api.xml:617
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1386,7 +1385,7 @@
 "코 사용하지 않을 것이다."
 
 #. Tag: para
-#: session_api.xml:600
+#: session_api.xml:625
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1396,31 +1395,31 @@
 "음 시나리오에서 사용된다:"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "어플리케이션이 첫 번째 세션 내에 객체를 로드시킨다"
 
 #. Tag: para
-#: session_api.xml:612
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "객체가 UI 티어로 전달된다"
 
 #. Tag: para
-#: session_api.xml:617
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "몇몇 변경들이 그 객체에 행해진다"
 
 #. Tag: para
-#: session_api.xml:622
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "객체가 비지니스 로직 티어로 전달된다"
 
 #. Tag: para
-#: session_api.xml:627
+#: session_api.xml:652
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1430,20 +1429,20 @@
 "들 변경들을 영속화 시킨다"
 
 #. Tag: para
-#: session_api.xml:634
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal>는 다음을 행한다:"
 
 #. Tag: para
-#: session_api.xml:640
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr ""
 "만일 객체가 이 세션 내에서 이미 영속화 되어 있을 경우, 아무것도 행하지 않는다"
 
 #. Tag: para
-#: session_api.xml:645
+#: session_api.xml:670
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1453,7 +1452,7 @@
 "진다"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
@@ -1461,7 +1460,7 @@
 "literal> 시킨다"
 
 #. Tag: para
-#: session_api.xml:656
+#: session_api.xml:681
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1471,11 +1470,11 @@
 "<literal>save()</literal> 시킨다"
 
 #. Tag: para
-#: session_api.xml:662
-#, no-c-format
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1485,19 +1484,19 @@
 "literal> 시킨다"
 
 #. Tag: para
-#: session_api.xml:670
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr "그 밖의 경우 그 객체를 <literal>update()</literal> 시킨다"
 
 #. Tag: para
-#: session_api.xml:676
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "그리고 <literal>merge()</literal>는 매우 다르다:"
 
 #. Tag: para
-#: session_api.xml:682
+#: session_api.xml:707
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1508,7 +1507,7 @@
 "어진 객체의 상태를 영속 인스턴스 상으로 복사한다"
 
 #. Tag: para
-#: session_api.xml:689
+#: session_api.xml:714
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1519,13 +1518,13 @@
 "다"
 
 #. Tag: para
-#: session_api.xml:695
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "영속 인스턴스가 반환된다"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:725
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1534,19 +1533,19 @@
 "주어진 인스턴스는 세션과 연관되지 않고, 그것은 detached 상태에 머무른다"
 
 #. Tag: title
-#: session_api.xml:710
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "영속 객체들을 삭제하기"
 
 #. Tag: para
-#: session_api.xml:712
-#, no-c-format
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "<literal>Session.delete()</literal>는 데이터베이스로부터 객체의 상태를 제거"
 "할 것이다. 물론 당신의 어플리케이션은 여전히 detached 객체에 대한 참조를 소유"
@@ -1554,19 +1553,19 @@
 "생각하는 것이 최상이다."
 
 #. Tag: programlisting
-#: session_api.xml:719
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:721
-#, no-c-format
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "당신은 foreign 키 컨스트레인트 위배들에 대한 위험성 없이 당신이 좋아하는 어"
 "떤 순서로 객체들을 삭제할 수도 있다. 잘못된 순서로 객체들을 삭제함으로써 "
@@ -1575,16 +1574,16 @@
 "는 것을 잊은 경우."
 
 #. Tag: title
-#: session_api.xml:732
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "두 개의 다른 데이터저장소들 사이에 객체들을 복제하기"
 
 #. Tag: para
-#: session_api.xml:734
-#, no-c-format
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1592,7 +1591,7 @@
 "을 다른 저장소 속에 영속화 시키는 것을 가능하도록 만드는 것이 종종 유용하다."
 
 #. Tag: programlisting
-#: session_api.xml:740
+#: session_api.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1611,50 +1610,50 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:742
-#, no-c-format
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "<literal>ReplicationMode</literal>는 <literal>replicate()</literal>가 데이터"
 "베이스 내에 있는 기존의 행들과의 충돌을 처리하게될 방법을 결정한다."
 
 #. Tag: para
-#: session_api.xml:749
-#, no-c-format
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.IGNORE</literal> - 동일한 식별자를 가진 기존 데이터"
 "베이스 행이 존재할 경우에 그 객체를 무시한다"
 
 #. Tag: para
-#: session_api.xml:755
-#, no-c-format
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.OVERWRITE</literal> - 동일한 식별자를 가진 어떤 기존"
 "의 데이터베이스 행을 덮어 쓴다"
 
 #. Tag: para
-#: session_api.xml:761
-#, no-c-format
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.EXCEPTION</literal> - 만일 동일한 식별자를 가진 기"
 "존 데이터베이스 행이 존재할 경우에 예외상황을 던진다"
 
 #. Tag: para
-#: session_api.xml:767
-#, no-c-format
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1662,7 +1661,7 @@
 "버전 번호 보다 이전의 것이면 덮어쓰고, 그 밖의 경우에 그 객체를 무시한다"
 
 #. Tag: para
-#: session_api.xml:775
+#: session_api.xml:800
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1675,19 +1674,19 @@
 "션들 동안에 행해진 변경들을 롤백시키기 등을 포함한다."
 
 #. Tag: title
-#: session_api.xml:784
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Session을 flush 시키기"
 
 #. Tag: para
-#: session_api.xml:786
-#, no-c-format
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "시간이 지남에 따라 <literal>Session</literal>은 JDBC 커넥션의 상태와 메모리 "
 "내에 보관된 객체들의 상태를 동기화 시키는데 필요한 SQL 문장들을 실행시킬 것이"
@@ -1695,93 +1694,92 @@
 "다"
 
 #. Tag: para
-#: session_api.xml:795
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr "몇몇 질의들이 실행되기 전에"
 
 #. Tag: para
-#: session_api.xml:800
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr "<literal>org.hibernate.Transaction.commit()</literal> 시점에서"
 
 #. Tag: para
-#: session_api.xml:805
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "<literal>Session.flush()</literal> 시점에서"
 
 #. Tag: para
-#: session_api.xml:811
-#, no-c-format
-msgid "The SQL statements are issued in the following order"
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "SQL 문장들이 다음 순서로 실행 명령이 내려진다"
 
 #. Tag: para
-#: session_api.xml:817
-#, no-c-format
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "대응하는 객체들이 <literal>Session.save()</literal>를 사용하여 저장되었던 것"
 "과 같은 순서로, 모든 엔티티 삽입들"
 
 #. Tag: para
-#: session_api.xml:823
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr "모든 엔티티 업데이트들"
 
 #. Tag: para
-#: session_api.xml:828
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr "모든 콜렉션 삭제들"
 
 #. Tag: para
-#: session_api.xml:833
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "모든 콜렉션 요소 삭제들, 업데이트들 그리고 삽입들"
 
 #. Tag: para
-#: session_api.xml:838
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr "모든 콜렉션 삽입들"
 
 #. Tag: para
-#: session_api.xml:843
-#, no-c-format
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "대응하는 객체들이 <literal>Session.delete()</literal>를 사용하여 삭제되었던 "
 "것과 같은 순서로 모든 엔티티 삭제들."
 
 #. Tag: para
-#: session_api.xml:850
-#, no-c-format
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(한가지 예외는 객체들이 저장될 때 <literal>native</literal> ID 생성을 사용하"
 "는 객체들이 insert 되는 점이다.)"
 
 #. Tag: para
-#: session_api.xml:855
-#, no-c-format
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "당신이 명시적으로 <literal>flush()</literal> 시킬 때를 제외하면, "
 "<literal>Session</literal>이 JDBC 호출들을 실행시키는 <emphasis>시점</"
@@ -1791,17 +1789,17 @@
 "반환하지 않을 것임을 보장한다."
 
 #. Tag: para
-#: session_api.xml:863
-#, no-c-format
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "flush가 너무 자주 발생하지 않도록 디폴트 행위를 변경하는 것이 가능하다. "
 "<literal>FlushMode</literal> 클래스는 세 개의 다른 모드들을 정의한다: 오직 커"
@@ -1813,7 +1811,7 @@
 "(<xref linkend=\"transactions-optimistic-longsession\"/>를 보라)."
 
 #. Tag: programlisting
-#: session_api.xml:873
+#: session_api.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1833,7 +1831,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:875
+#: session_api.xml:900
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1847,13 +1845,13 @@
 "\"/>에서 그것을 논의한다."
 
 #. Tag: title
-#: session_api.xml:884
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "Transitive persistence(전이 영속)"
 
 #. Tag: para
-#: session_api.xml:886
+#: session_api.xml:911
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1865,17 +1863,17 @@
 "식 관계이다. 다음 예제를 검토하자:"
 
 #. Tag: para
-#: session_api.xml:892
-#, no-c-format
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "만일 부모/자식 관계에서 자식들이 값(value) 타입(예를 들면. 주소들 또는 문자열"
 "들을 가진 하나의 콜렉션)일 경우, 그것들의 생명주기는 부모에 의존할 것이고 상"
@@ -1887,12 +1885,12 @@
 "스로부터 그 자식을 삭제시킨다."
 
 #. Tag: para
-#: session_api.xml:903
-#, no-c-format
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1908,7 +1906,7 @@
 "다."
 
 #. Tag: para
-#: session_api.xml:912
+#: session_api.xml:937
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1928,29 +1926,29 @@
 "시해야 한다. 예를 들면:"
 
 #. Tag: programlisting
-#: session_api.xml:921
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:923
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "케스케이딩 스타일들이 결합될 수도 있다:"
 
 #. Tag: programlisting
-#: session_api.xml:927
+#: session_api.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:929
-#, no-c-format
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -1961,7 +1959,7 @@
 "을 것임을 지정한다."
 
 #. Tag: para
-#: session_api.xml:935
+#: session_api.xml:960
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -1974,16 +1972,16 @@
 "로부터 제거되는 임의의 자식 객체에 적용되어야 함을 나타낸다."
 
 #. Tag: para
-#: session_api.xml:942
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr "권장사항들 :"
 
 #. Tag: para
-#: session_api.xml:948
-#, no-c-format
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -1994,7 +1992,7 @@
 "one-to-many&gt;</literal> 연관에 대해 종종 유용하다."
 
 #. Tag: para
-#: session_api.xml:956
+#: session_api.xml:981
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -2006,7 +2004,7 @@
 "<emphasis>생명 주기 객체</emphasis>로 만들어라."
 
 #. Tag: para
-#: session_api.xml:963
+#: session_api.xml:988
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -2021,7 +2019,7 @@
 "하라."
 
 #. Tag: para
-#: session_api.xml:971
+#: session_api.xml:996
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -2035,12 +2033,12 @@
 "타일의 관계로 마크한다."
 
 #. Tag: para
-#: session_api.xml:977
-#, no-c-format
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -2054,7 +2052,7 @@
 "케이딩 오퍼레이션의 정확한 의미는 다음과 같다:"
 
 #. Tag: para
-#: session_api.xml:988
+#: session_api.xml:1013
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -2064,7 +2062,7 @@
 "<literal>persist()</literal>에 전달된다"
 
 #. Tag: para
-#: session_api.xml:994
+#: session_api.xml:1019
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -2074,7 +2072,7 @@
 "<literal>merge()</literal>에 전달된다"
 
 #. Tag: para
-#: session_api.xml:1000
+#: session_api.xml:1025
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2086,7 +2084,7 @@
 "<literal>saveOrUpdate()</literal>에 전달된다"
 
 #. Tag: para
-#: session_api.xml:1006
+#: session_api.xml:1031
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2096,7 +2094,7 @@
 "<literal>saveOrUpdate()</literal>에 전달된다"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1037
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2105,7 +2103,7 @@
 "만일 부모가 삭제될 경우, 모든 자식들이 <literal>delete()</literal>에 전달된다"
 
 #. Tag: para
-#: session_api.xml:1017
+#: session_api.xml:1042
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2120,13 +2118,13 @@
 "우 자식이 삭제된다."
 
 #. Tag: para
-#: session_api.xml:1026
-#, no-c-format
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2138,21 +2136,21 @@
 "flush 동안에 도달 가능한 모든 연관된 엔티티들에 대해 이행적(transitive)이다."
 
 #. Tag: title
-#: session_api.xml:1038
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr "메타데이터 사용하기"
 
 #. Tag: para
-#: session_api.xml:1040
-#, no-c-format
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "Hibernate는 모든 엔티티와 값(value) 타입들을 가진 매우 풍부한 메타-레벨 모형"
 "을 필요로 한다. 시간이 지남에 따라, 이 모형은 어플리케이션 그 자체에 매우 유"
@@ -2162,12 +2160,12 @@
 "copy 알고리즘을 구현하는데 Hibernate의 메타데이터를 사용할 수도 있다."
 
 #. Tag: para
-#: session_api.xml:1047
-#, no-c-format
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "Hibernate는 <literal>ClassMetadata</literal> 인터페이스와 "
@@ -2176,7 +2174,7 @@
 "인스턴스들은 <literal>SessionFactory</literal>로부터 얻어질 수도 있다."
 
 #. Tag: programlisting
-#: session_api.xml:1054
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,26 +11,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: toolset_guide.xml:5
+#: toolset_guide.xml:29
 #, no-c-format
 msgid "Toolset Guide"
 msgstr "도구셋 안내"
 
 #. Tag: para
-#: toolset_guide.xml:7
-#, no-c-format
+#: toolset_guide.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "Hibernate에 대한 라운드트립 엔지니어링은 Eclipse 플러그인 세트, 명령라인 도구"
 "들, 뿐만 아니라 Ant 태스크들을 사용하여 가능하다."
 
 #. Tag: para
-#: toolset_guide.xml:12
-#, no-c-format
+#: toolset_guide.xml:36
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -39,13 +39,13 @@
 "하고 있다:"
 
 #. Tag: para
-#: toolset_guide.xml:18
-#, no-c-format
+#: toolset_guide.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>매핑 편집기:</emphasis> 자동 완성 기능과 구문 강조를 지원하는 "
 "Hibernate XML 매핑 파일들에 대한 편집기. 그것은 또한 통상의 XML 편집기 보다 "
@@ -53,14 +53,14 @@
 "론적 자동 완성 기능을 지원한다."
 
 #. Tag: para
-#: toolset_guide.xml:23
-#, no-c-format
+#: toolset_guide.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>콘솔:</emphasis> 콘솔은 Eclipse에서 새로운 뷰이다. 당신의 콘솔 구성"
 "들에 대한 tree overview에 덧붙여, 당신은 또한 당신의 영속 클래스들과 그것들"
@@ -69,15 +69,14 @@
 "해준다."
 
 #. Tag: para
-#: toolset_guide.xml:30
-#, no-c-format
+#: toolset_guide.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>개발 마법사들:</emphasis> 몇몇 마법사들이 Hibernate Eclipse 도구들"
 "에 제공된다; 당신은 Hibernate 구성 (cfg.xml) 파일들을 빠르게 생성시키는데 마"
@@ -85,47 +84,41 @@
 "과 Hibernate 매핑 파일들로 완전하게 리버스 엔지니어링할 수도 있다. 리버스 엔"
 "지니어링 마법사는 맞춤 가능한 템플릿들을 제공한다."
 
-#. Tag: emphasis
-#: toolset_guide.xml:38
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr "Ant 태스크들:"
-
 #. Tag: para
-#: toolset_guide.xml:43
-#, no-c-format
+#: toolset_guide.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "추가 정보는 <emphasis>Hibernate Tools</emphasis> 패키지와 그것의 문서를 참조"
 "하길 바란다."
 
 #. Tag: para
-#: toolset_guide.xml:48
-#, no-c-format
+#: toolset_guide.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "하지만 Hibernate 메인 패키지는 통합 도구에 번들화 되어 있다(그것은 심지어 플"
 "라이 상에서 Hibernate \"내에서\" 사용될 수 있다): <emphasis>SchemaExport</"
 "emphasis> 별칭은 <literal>hbm2ddl</literal>."
 
 #. Tag: title
-#: toolset_guide.xml:55
+#: toolset_guide.xml:79
 #, no-c-format
 msgid "Automatic schema generation"
 msgstr "자동적인 스키마 생성"
 
 #. Tag: para
-#: toolset_guide.xml:57
-#, no-c-format
+#: toolset_guide.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "DDL은 Hibernate 유틸리티에 의해 당신의 매핑 파일들로부터 생성될 수 있다. 생성"
@@ -134,37 +127,39 @@
 "식별자 생성기들에 대해 생성된다."
 
 #. Tag: para
-#: toolset_guide.xml:64
-#, no-c-format
+#: toolset_guide.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "DDL이 매우 벤더에 특정하므로, 이 도구를 사용할 때 당신은 <literal>hibernate."
 "dialect</literal> 프로퍼티를 통해 한 개의 SQL <literal>Dialect</literal>를 지"
 "정<emphasis>해야 한다</emphasis>."
 
 #. Tag: para
-#: toolset_guide.xml:70
-#, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+#: toolset_guide.xml:94
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr ""
 "먼저 생성된 스키마를 개선시키기 위해 당신의 매핑 파일들을 맞춤화 시켜라."
 
 #. Tag: title
-#: toolset_guide.xml:75
+#: toolset_guide.xml:99
 #, no-c-format
 msgid "Customizing the schema"
 msgstr "스키마 맞춤화 시키기"
 
 #. Tag: para
-#: toolset_guide.xml:77
-#, no-c-format
+#: toolset_guide.xml:101
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "많은 Hibernate 매핑 요소들은 <literal>length</literal>로 명명된 옵션 속성을 "
@@ -175,25 +170,25 @@
 "으로서 컬럼이 길이, 정밀도, 크기를 설정할 수 있다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:84
+#: toolset_guide.xml:108
 #, no-c-format
 msgid "<![CDATA[<property name=\"zip\" length=\"5\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:85
+#: toolset_guide.xml:109
 #, no-c-format
 msgid "<![CDATA[<property name=\"balance\" precision=\"12\" scale=\"2\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:87
-#, no-c-format
+#: toolset_guide.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "몇몇 태그들은 또한 (테이블 컬럼들에 대한 <literal>NOT NULL</literal> 컨스트레"
 "인트를 생성시키는) <literal>not-null</literal> 속성과 (테이블 컬럼들에 대한 "
@@ -201,14 +196,14 @@
 "literal> 속성을 수용한다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:93
+#: toolset_guide.xml:117
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:95
+#: toolset_guide.xml:119
 #, no-c-format
 msgid ""
 "<![CDATA[<element column=\"serialNumber\" type=\"long\" not-null=\"true\" "
@@ -216,14 +211,14 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:97
-#, no-c-format
+#: toolset_guide.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "<literal>unique-key</literal> 속성은 하나의 유일 키 컨스트레인트로 컬럼들을 "
 "그룹지우는데 사용될 수도 있다. 현재 <literal>unique-key</literal> 속성의 지정"
@@ -231,7 +226,7 @@
 "emphasis>, 오직 매핑 파일 내에서 컬럼들을 그룹 지우는데 사용된다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:105
+#: toolset_guide.xml:129
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"org\" column=\"orgId\" unique-key="
@@ -240,19 +235,19 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:107
-#, no-c-format
+#: toolset_guide.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "<literal>index</literal> 속성은 매핑된 컬럼 또는 컬럼들을 사용하여 생성될 인"
 "덱스의 이름을 지정한다. 간단하게 동일한 인덱스 이름을 지정함으로써 여러 컬럼"
 "들이 동일한 인덱스 내로 그룹지워질 수도 있다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:113
+#: toolset_guide.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
@@ -260,17 +255,17 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:115
-#, no-c-format
+#: toolset_guide.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "<literal>foreign-key</literal> 속성은 임의의 산출된 foreign 키 컨스트레인트"
 "의 이름을 오버라이드 시키는데 사용될 수 도 있다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:120
+#: toolset_guide.xml:144
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" foreign-key=\"FKFooBar\"/"
@@ -278,7 +273,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:122
+#: toolset_guide.xml:146
 #, no-c-format
 msgid ""
 "Many mapping elements also accept a child <literal>&lt;column&gt;</literal> "
@@ -288,7 +283,7 @@
 "허용한다. 이것은 특히 다중 컬럼 타입들을 매핑하는데 유용하다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:127
+#: toolset_guide.xml:151
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
@@ -301,12 +296,12 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:129
-#, no-c-format
+#: toolset_guide.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "다른 방법으로, 이들 요소들은 또한 자식 <literal>&lt;column&gt;</literal> 요소"
 "를 수용한다. 이것은 다중 컬럼 타입들에 특히 유용하다: <literal>default</"
@@ -315,7 +310,7 @@
 "동일한 값을 할당하게 될 것이다)."
 
 #. Tag: programlisting
-#: toolset_guide.xml:135
+#: toolset_guide.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
@@ -324,7 +319,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:137
+#: toolset_guide.xml:161
 #, no-c-format
 msgid ""
 "<![CDATA[<version name=\"version\" type=\"integer\" insert=\"false\">\n"
@@ -333,7 +328,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:139
+#: toolset_guide.xml:163
 #, no-c-format
 msgid ""
 "The <literal>sql-type</literal> attribute allows the user to override the "
@@ -343,7 +338,7 @@
 "폴트 매핑을 오버라이드 시키는 것을 사용자에게 허용해준다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:144
+#: toolset_guide.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
@@ -352,7 +347,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:146
+#: toolset_guide.xml:170
 #, no-c-format
 msgid ""
 "The <literal>check</literal> attribute allows you to specify a check "
@@ -362,7 +357,7 @@
 "허용해준다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:150
+#: toolset_guide.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"foo\" type=\"integer\">\n"
@@ -371,7 +366,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:152
+#: toolset_guide.xml:176
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Foo\" table=\"foos\" check=\"bar < 100.0\">\n"
@@ -380,152 +375,158 @@
 "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:156
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr "요약"
 
 #. Tag: entry
-#: toolset_guide.xml:163
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr "속성"
 
 #. Tag: entry
-#: toolset_guide.xml:164
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr "값들"
 
 #. Tag: entry
-#: toolset_guide.xml:165
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr "해석"
 
 #. Tag: literal
-#: toolset_guide.xml:170
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:171 toolset_guide.xml:176 toolset_guide.xml:181
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr "number"
 
 #. Tag: entry
-#: toolset_guide.xml:172
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr "컬럼 길이"
 
 #. Tag: literal
-#: toolset_guide.xml:175
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:177
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr "컬럼 decimal 정밀도"
 
 #. Tag: literal
-#: toolset_guide.xml:180
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:182
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr "컬럼 decimal 크기"
 
 #. Tag: literal
-#: toolset_guide.xml:185
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:186 toolset_guide.xml:191
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:187
-#, no-c-format
-msgid "specfies that the column should be non-nullable"
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "컬럼이 null이 아니어야 함을 지정한다"
 
 #. Tag: literal
-#: toolset_guide.xml:190
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:192
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "컬럼이 하나의 유일 컨스트레인트를 가져야함을 지정한다"
 
 #. Tag: literal
-#: toolset_guide.xml:195
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:196
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:197
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "(다중-컬럼) 인덱스의 이름을 지정한다"
 
 #. Tag: literal
-#: toolset_guide.xml:200
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:201
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:202
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "다중-컬럼 유일 컨스트레인트의 이름을 지정한다"
 
 #. Tag: literal
-#: toolset_guide.xml:205
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:206
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:207
+#: toolset_guide.xml:233
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -540,19 +541,19 @@
 "하라."
 
 #. Tag: literal
-#: toolset_guide.xml:217
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:218
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL column type"
 
 #. Tag: entry
-#: toolset_guide.xml:219
+#: toolset_guide.xml:245
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -561,37 +562,37 @@
 "디폴트 컬럼 타입을 오버라이드 시킨다 (<placeholder-1/> 요소의 속성에만)"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:226 toolset_guide.xml:233
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, no-c-format
 msgid "SQL expression"
 msgstr "SQL expression"
 
 #. Tag: entry
-#: toolset_guide.xml:227
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "컬럼에 대한 디폴트 값을 지정한다"
 
 #. Tag: literal
-#: toolset_guide.xml:232
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:234
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr "컬럼 또는 테이블에 대한 SQL check 컨스트레인트를 생성시킨다"
 
 #. Tag: para
-#: toolset_guide.xml:242
+#: toolset_guide.xml:268
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -601,7 +602,7 @@
 "하는 것을 당신에게 허용해준다."
 
 #. Tag: programlisting
-#: toolset_guide.xml:247
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -611,7 +612,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:249
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -622,23 +623,23 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:251
-#, no-c-format
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "이것은 (지원되는 경우) 생성된 DDL에서 <literal>comment on table</literal> 또"
 "는 <literal>comment on column</literal> 문장으로 귀결된다."
 
 #. Tag: title
-#: toolset_guide.xml:260
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr "도구 실행하기"
 
 #. Tag: para
-#: toolset_guide.xml:262
+#: toolset_guide.xml:288
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -648,7 +649,15 @@
 "고/하거나 DDL 문장들을 실행시킨다."
 
 #. Tag: para
-#: toolset_guide.xml:267
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr "<literal>SchemaExport</literal> 명령 라인 옵션들"
+
+#. Tag: para
+#: toolset_guide.xml:295
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -657,116 +666,116 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:273
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr "<literal>SchemaExport</literal> 명령 라인 옵션들"
 
 #. Tag: entry
-#: toolset_guide.xml:279 toolset_guide.xml:429 toolset_guide.xml:498
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr "옵션"
 
 #. Tag: entry
-#: toolset_guide.xml:280 toolset_guide.xml:367 toolset_guide.xml:430
-#: toolset_guide.xml:499
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
 #, no-c-format
 msgid "Description"
 msgstr "설명"
 
 #. Tag: literal
-#: toolset_guide.xml:285 toolset_guide.xml:435
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:286 toolset_guide.xml:436
-#, no-c-format
-msgid "don't output the script to stdout"
+#: toolset_guide.xml:314 toolset_guide.xml:464
+#, fuzzy, no-c-format
+msgid "do not output the script to stdout"
 msgstr "스크립트를 표준출력으로 출력하지 않는다"
 
 #. Tag: literal
-#: toolset_guide.xml:289
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:290
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr "오직 테이블들을 드롭시킨다"
 
 #. Tag: literal
-#: toolset_guide.xml:293
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:294
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr "오직 테이블들을 생성시킨다"
 
 #. Tag: literal
-#: toolset_guide.xml:297 toolset_guide.xml:439
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:298
-#, no-c-format
-msgid "don't export to the database"
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "데이터베이스로 내보내기 하지 않는다"
 
 #. Tag: literal
-#: toolset_guide.xml:301
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:302
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "ddl 스크립트를 파일로 출력한다"
 
 #. Tag: literal
-#: toolset_guide.xml:305 toolset_guide.xml:443 toolset_guide.xml:504
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
 #. Tag: entry
-#: toolset_guide.xml:306 toolset_guide.xml:444 toolset_guide.xml:505
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "<literal>hibernate.properties</literal> 내에서"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:451 toolset_guide.xml:512
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:310
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "XML 파일로부터 Hibernate 구성을 읽어들인다"
 
 #. Tag: literal
-#: toolset_guide.xml:313 toolset_guide.xml:447 toolset_guide.xml:508
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
 #. Tag: entry
-#: toolset_guide.xml:314 toolset_guide.xml:448 toolset_guide.xml:509
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -778,39 +787,39 @@
 "파일로부터 데이터베이스 프로퍼티들을 읽어들인다"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "생성된 SQL을 스크립트 내에 좋게 형식지운다"
 
 #. Tag: literal
-#: toolset_guide.xml:321
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=;"
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "스크립트를 위한 라인 경계의 끝을 설정한다"
 
 #. Tag: para
-#: toolset_guide.xml:328
-#, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 "당신은 당신의 어플리케이션 내에 <literal>SchemaExport</literal>를 삽입시킬 수"
 "도 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:332
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -818,19 +827,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:337
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr "프로퍼티들"
 
 #. Tag: para
-#: toolset_guide.xml:339
-#, no-c-format
-msgid "Database properties may be specified"
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "데이터베이스 프로퍼티들은 다음과 같이 지정될 수 있다"
 
 #. Tag: para
-#: toolset_guide.xml:345
+#: toolset_guide.xml:373
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -840,103 +849,103 @@
 "퍼티로서"
 
 #. Tag: para
-#: toolset_guide.xml:348
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "<literal>hibernate.properties</literal> 내에서"
 
 #. Tag: para
-#: toolset_guide.xml:351
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr "<literal>--properties</literal>를 가진 명명된 프로퍼티들 내에서"
 
 #. Tag: para
-#: toolset_guide.xml:355
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "필요한 프로퍼티들은 다음과 같다:"
 
 #. Tag: title
-#: toolset_guide.xml:360
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport 커넥션 프로퍼티들"
 
 #. Tag: entry
-#: toolset_guide.xml:366
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr "프로퍼티 이름"
 
 #. Tag: literal
-#: toolset_guide.xml:372
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:373
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "jdbc 드라이버 클래스"
 
 #. Tag: literal
-#: toolset_guide.xml:376
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:377
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr "jdbc url"
 
 #. Tag: literal
-#: toolset_guide.xml:380
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:381
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr "데이터베이스 사용자"
 
 #. Tag: literal
-#: toolset_guide.xml:384
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:385
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr "사용자 패스워드"
 
 #. Tag: literal
-#: toolset_guide.xml:388
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:389
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr "dialect"
 
 #. Tag: title
-#: toolset_guide.xml:398
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr "Ant 사용하기"
 
 #. Tag: para
-#: toolset_guide.xml:400
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
@@ -945,7 +954,7 @@
 "수 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:404
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -968,19 +977,18 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:409
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "점증하는 스키마 업데이트들"
 
 #. Tag: para
-#: toolset_guide.xml:411
-#, no-c-format
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "<literal>SchemaUpdate</literal> 도구는 \"점증하는\" 변경들을 가진 기존 스키마"
 "를 변경시킬 것이다. <literal>SchemaUpdate</literal>는 JDBC 메타데이터 API에 "
@@ -988,7 +996,7 @@
 "라."
 
 #. Tag: para
-#: toolset_guide.xml:417
+#: toolset_guide.xml:445
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -997,33 +1005,33 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:423
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal> 명령 라인 옵션들"
 
 #. Tag: entry
-#: toolset_guide.xml:440
-#, no-c-format
-msgid "don't export the script to the database"
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "스크립트를 데이터베이스로 내보내기 하지 않는다"
 
 #. Tag: entry
-#: toolset_guide.xml:452 toolset_guide.xml:513
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr "<placeholder-1/> 파일을 지정한다"
 
 #. Tag: para
-#: toolset_guide.xml:458
-#, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 "당신은 당신의 어플리케이션 내에 <literal>SchemaUpdate</literal>를 삽입시킬 "
 "수 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:462
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1031,20 +1039,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:467
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "점증하는 스키마 업데이트들에 Ant 사용하기"
 
 #. Tag: para
-#: toolset_guide.xml:469
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 "당신은 Ant 스크립트에서<literal>SchemaUpdate</literal>를 호출할 수 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:473
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1063,20 +1071,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:478
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr "스키마 유효성 검사"
 
 #. Tag: para
-#: toolset_guide.xml:480
-#, no-c-format
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "<literal>SchemaValidator</literal> 도구는 기존의 데이터베이스 스키마가 당신"
 "의 매핑 문서들과 \"일치하는지\"를 유효성 검사할 것이다. "
@@ -1085,7 +1093,7 @@
 "극히 유용하다."
 
 #. Tag: para
-#: toolset_guide.xml:486
+#: toolset_guide.xml:514
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1093,22 +1101,30 @@
 "<emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal> 명령 라인 옵션들"
+
 #. Tag: title
-#: toolset_guide.xml:492
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> 명령 라인 옵션들"
 
 #. Tag: para
-#: toolset_guide.xml:519
-#, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr ""
 "당신은 당신의 어플리케이션 내에 <literal>SchemaValidator</literal>을 삽입시"
 "킬 수 도 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:523
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1116,20 +1132,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:528
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "스키마 유효성 검사를 위해 Ant 사용하기"
 
 #. Tag: para
-#: toolset_guide.xml:530
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr ""
 "당신은 Ant 스크립트에서 <literal>SchemaValidator</literal>를 호출할 수 있다:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:534
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
@@ -1146,6 +1162,9 @@
 "</target>]]>"
 msgstr ""
 
+#~ msgid "Ant Tasks:"
+#~ msgstr "Ant 태스크들:"
+
 #~ msgid "&lt;one-to-one&gt;"
 #~ msgstr "&lt;one-to-one&gt;"
 

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,18 +12,18 @@
 
 #. Tag: title
 #: transactions.xml:29
-#, no-c-format
-msgid "Transactions And Concurrency"
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "트랜잭션들과 동시성"
 
 #. Tag: para
 #: transactions.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "Hibernate와 동시성 제어에 대한 가장 중요한 점은 이해하기가 매우 쉽다는 점이"
@@ -33,14 +33,13 @@
 
 #. Tag: para
 #: transactions.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "Hibernate는 메모리 내에서 객체들을 잠그지 않는다. 당신의 어플리케이션은 격리 "
 "레벨에 의해 정의된 대로 행위를 기대할 수 있다. 또한 transaction-영역의 캐시"
@@ -50,12 +49,12 @@
 
 #. Tag: para
 #: transactions.xml:46
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "자동적인 optimistic 동시성 제어를 위한 버전화에 덧붙여, Hibernate는 또한 "
 "<literal>SELECT FOR UPDATE</literal> 구문을 사용하여 행들에 대한 pessimistic "
@@ -64,9 +63,9 @@
 
 #. Tag: para
 #: transactions.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -84,12 +83,12 @@
 
 #. Tag: para
 #: transactions.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "<literal>SessionFactory</literal>는 모든 어플리케이션 쓰레드들에 의해 공유되"
 "도록 고안된 생성에 비용이 드는, 쓰레드안전(threadsafe) 객체이다. 그것은 대개 "
@@ -98,13 +97,13 @@
 
 #. Tag: para
 #: transactions.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "<literal>Session</literal>은 하나의 요청, 하나의 대화 , 하나의 작업 단위를 위"
 "해 한번만 사용되고 나서 폐기될 예정인, 비용이 들지 않는, 쓰레드 안전하지 않"
@@ -114,14 +113,13 @@
 
 #. Tag: para
 #: transactions.xml:76
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "이 그림을 완성하기 위해 당신은 또한 데이터베이스 트랜재션들에 대해 생각해야 "
 "한다. 데이터베이스 트랜잭션은 데이터베이스에서 잠금 다툼을 줄이기 위해 가능"
@@ -131,14 +129,14 @@
 "는 것은 대개 결코 좋은 설계는 아니다."
 
 #. Tag: para
-#: transactions.xml:85
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "하나의 작업 단위의 영역은 무엇인가? 하나의 Hibernate <literal>Session</"
 "literal>은 몇몇 데이터베이스 트랜잭션들에 걸칠 수 있는가 또는 이것은 영역들"
@@ -146,28 +144,43 @@
 "그리고 당신은 데이터베이스 트랜잭션 경계들을 어떻게 한정하는가?"
 
 #. Tag: title
-#: transactions.xml:93
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "작업 단위"
 
 #. Tag: para
-#: transactions.xml:95
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "첫번째로, <emphasis>session-per-operation</emphasis> anti-패턴을 사용하지 말"
@@ -187,19 +200,19 @@
 "씬 더 유지가능하고 확장적이다."
 
 #. Tag: para
-#: transactions.xml:111
+#: transactions.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is sent to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "다중 사용자 클라이언트/서버 어플리케이션에서 가장 공통된 패턴은 "
 "<emphasis>session-per-request</emphasis>이다. 이 모형에서, 클라이언트로부터"
@@ -213,20 +226,20 @@
 "적합하다."
 
 #. Tag: para
-#: transactions.xml:123
+#: transactions.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is sent to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "난제는 구현에 놓여있다: Hibernate는 이 패턴을 단순화 시키기 위해 \"현재 세션"
 "\"에 관한 미리 빌드된 관리를 제공한다. 당신이 행해야할 모든 것은 서버 요청이 "
@@ -241,15 +254,14 @@
 "literal>을 선호하라."
 
 #. Tag: para
-#: transactions.xml:136
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "당신의 어플리케이션 코드는 어디서든 필요할 때 종종 <literal>sessionFactory."
 "getCurrentSession()</literal>을 간단히 호출함으로써 요청을 처리할 \"현재 세션"
@@ -259,19 +271,18 @@
 "session\"/>을 보라."
 
 #. Tag: para
-#: transactions.xml:144
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "때때로 \"뷰가 렌더링될 때까지\" 하나의 <literal>Session</literal> 과 데이터베"
 "이스 트랜잭션의 영역을 확장시키는 것이 편리하다. 이것은 요청이 처리된 후에 하"
@@ -284,20 +295,20 @@
 "emphasis> 패턴을 둘러싼 팁들과 예제들은 Hibernate 웹 사이트와 포럼을 보라."
 
 #. Tag: title
-#: transactions.xml:159
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "장기간의 대화"
 
 #. Tag: para
-#: transactions.xml:161
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "session-per-request 패턴은 당신이 작업 단위들을 설계하는데 사용할 수 있는 유"
 "일한 유용한 개념이 아니다. 많은 비지니스 프로세스들은 데이터베이스 접근들을 "
@@ -306,10 +317,10 @@
 "용되지 않는다. 다음 예제를 검토하자:"
 
 #. Tag: para
-#: transactions.xml:171
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -318,25 +329,24 @@
 "객체들을 변경시키는 것이 자유롭다."
 
 #. Tag: para
-#: transactions.xml:178
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "사용자는 5분 후에 \"저장\"을 클릭하고 그의 변경들이 영속화 되기를 기대한다; "
 "그는 또한 그가 이 정보를 편집하는 유일한 개인이고 변경 충돌이 발생하지 않기"
 "를 기대한다."
 
 #. Tag: para
-#: transactions.xml:186
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "우리는 사용자의 관점에서, 이것을 작업 단위, 장기간 실행되는 <emphasis>대화</"
 "emphasis> (또는 <emphasis>어플리케이션 트랜잭션</emphasis>)이라고 명명한다. "
@@ -344,14 +354,14 @@
 "재한다."
 
 #. Tag: para
-#: transactions.xml:192
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "첫 번째 naive 구현은 동시성 변경을 방지하고, 격리와 atomicity(원자 단위성)을 "
 "보장하기 위해 데이터베이스에 의해 소유된 잠금으로 사용자가 생각하는동안 "
@@ -360,17 +370,17 @@
 "용 숫자를 높이는 것을 허용하지 않을 것이기 때문이다."
 
 #. Tag: para
-#: transactions.xml:200
+#: transactions.xml:214
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"conversation. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "명료하게, 우리는 대화(<emphasis>어플리케이션 트랜잭션</emphasis>)를 구현하는"
 "데 몇몇 데이터베이스 트랜잭션들을 사용해야 한다. 이 경우에, 비지니스 프로세스"
@@ -383,13 +393,13 @@
 "쉽다:"
 
 #. Tag: para
-#: transactions.xml:213
+#: transactions.xml:227
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occurred during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>자동적인 버전화</emphasis> - Hibernate는 당신을 위해 자동적인 "
 "optimistic 동시성 제어를 행할 수 있고, 그것은 사용자가 생각하는 시간 동안 동"
@@ -397,15 +407,15 @@
 "의 끝에서 체크한다."
 
 #. Tag: para
-#: transactions.xml:221
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>Detached 객체들</emphasis> - 만일 당신이 이미 논의된 "
 "<emphasis>session-per-request</emphasis> 패턴을 사용하고자 결정하는 경우, 모"
@@ -416,17 +426,17 @@
 "변경들을 격리시키는데 사용된다."
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:245
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitly."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>확장된 (또는 Long) Session</emphasis> - Hibernate "
 "<emphasis>Session</emphasis>은 데이터베이스 트랜잭션이 커밋된 후에 기본 JDBC "
@@ -437,13 +447,13 @@
 "flush되는 것이 허용되지 않지만 명시적으로 flush되는 것은 허용된다."
 
 #. Tag: para
-#: transactions.xml:244
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "<emphasis>session-per-request-with-detached-objects</emphasis>과 "
 "<emphasis>session-per-conversation</emphasis> 양자는 장점들과 단점들을 갖는"
@@ -451,19 +461,19 @@
 "한다."
 
 #. Tag: title
-#: transactions.xml:253
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "객체 identity 고려하기"
 
 #. Tag: para
-#: transactions.xml:255
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "어플리케이션은 두 개의 다른 <literal>Session</literal>들 내에 있는 동일한 영"
 "속 상태에 동시에 접근할 수도 있다. 하지만 영속 클래스의 인스턴스는 두 개의 "
@@ -471,41 +481,41 @@
 "identity에 대한 두 개의 다른 개념들이 존재한다:"
 
 #. Tag: term
-#: transactions.xml:264
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "데이터베이스 Identity"
 
 #. Tag: literal
-#: transactions.xml:267
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:272
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM Identity"
 
 #. Tag: literal
-#: transactions.xml:275
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:281
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "그때 (예를 들어 <literal>Session</literal> 영역에서) <emphasis>특정</"
 "emphasis><literal>Session</literal>에 첨부된 객체들의 경우 두 개의 개념들은 "
@@ -516,16 +526,16 @@
 "여, optimistic 접근법을 사용하여 해결된다."
 
 #. Tag: para
-#: transactions.xml:290
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "이 접근법은 Hibernate와 데이터베이스가 동시성에 대해 걱정하지 않도록 해준다; "
 "그것은 또한 최상의 scalability를 제공한다. 왜냐하면 단일 쓰레드-작업 단위 내"
@@ -536,28 +546,29 @@
 "<literal>==</literal>를 안전하게 사용할 수가 있다."
 
 #. Tag: para
-#: transactions.xml:299
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "하지만, 하나의 <literal>Session</literal> 외부에서 <literal>==</literal>를 사"
 "용하는 어플리케이션은 예기치 않은 결과들을 보게 될 수도 있다. 이것은 어떤 예"
@@ -580,19 +591,19 @@
 "가 구현되어야 하는 방법임을 노트하라."
 
 #. Tag: title
-#: transactions.xml:320
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "공통된 쟁점들"
 
 #. Tag: para
-#: transactions.xml:322
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "안티-패턴들 <emphasis>session-per-user-session</emphasis> 또는 "
@@ -602,17 +613,17 @@
 "들을 확실히 이해하라:"
 
 #. Tag: para
-#: transactions.xml:331
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "<literal>Session</literal>은 쓰레드-안전하지 않다. HTTP 요청들, 세션 빈즈, 또"
 "는 Swing worker들처럼 동시에 작업하는 것으로 가정되는 것들은 하나의 "
@@ -624,18 +635,18 @@
 "에서 동일한 <literal>Session</literal>을 사용할 수도 있다."
 
 #. Tag: para
-#: transactions.xml:342
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "Hibernate에 의해 던져진 예외상황은 당신이 당신의 데이터베이스 트랜잭션을 롤"
 "백 시키고 즉시 <literal>Session</literal>을 닫아야 함을 의미한다(나중에 상세"
@@ -647,18 +658,18 @@
 "이 아니고 당신이 어떻게든 롤백 후에 시작해야 하기 때문이다."
 
 #. Tag: para
-#: transactions.xml:354
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "<literal>Session</literal>은 (Hibernate에 의해 dirty 상태로 관찰되었거나 체크"
 "된) 영속 상태에 있는 모든 객체를 캐시 시킨다. 이것은 당신이 오랜 시간 동안 "
@@ -673,21 +684,21 @@
 "데이터에 대한 높은 확률을 의미한다."
 
 #. Tag: title
-#: transactions.xml:372
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "데이터베이스 트랜잭션 경계 설정"
 
 #. Tag: para
-#: transactions.xml:374
+#: transactions.xml:388
 #, fuzzy, no-c-format
 msgid ""
-"Database (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -701,18 +712,18 @@
 "작은 트랜잭션들의 경우보다는 더 좋게 수행될 것이다."
 
 #. Tag: para
-#: transactions.xml:384
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "Hibernate 어플리케이션은 관리되지 않는 환경(예를 들면. 스탠드얼론, 간단히 웹 "
 "어플리케이션들 또는 Swing 어플리케이션들)과 관리되는 J2EE 환경에서 실행될 수 "
@@ -725,12 +736,12 @@
 "더 이상 필요하지 않다."
 
 #. Tag: para
-#: transactions.xml:394
+#: transactions.xml:408
 #, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
 "transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
@@ -745,61 +756,61 @@
 "한 그것의 사용을 강력하게 권장한다."
 
 #. Tag: para
-#: transactions.xml:403
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 "대개 <literal>Session</literal> 종료는 네 개의 구분되는 단계들을 수반한다:"
 
 #. Tag: para
-#: transactions.xml:409
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "세션을 flush 시킨다"
 
 #. Tag: para
-#: transactions.xml:414
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "트랜잭션을 커밋 시킨다"
 
 #. Tag: para
-#: transactions.xml:419
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "세션을 닫는다"
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "예외상황들을 처리한다"
 
 #. Tag: para
-#: transactions.xml:430
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "세션을 flush 시키는 것은 앞서 논의되었고, 우리는 이제 관리되는 환경과 관리되"
 "지 않는 환경 양자에서 트랜잭션 경계 설정과 예외상황을 더 자세히 살펴볼 것이"
 "다."
 
 #. Tag: title
-#: transactions.xml:437
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "관리되지 않는 환경"
 
 #. Tag: para
-#: transactions.xml:439
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -809,7 +820,7 @@
 "transaction 처리 관용구는 다음과 같다:"
 
 #. Tag: programlisting
-#: transactions.xml:446
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -833,12 +844,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:448
-#, no-c-format
+#: transactions.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -853,17 +864,17 @@
 "에서 이식성이 있고 실행된다."
 
 #. Tag: para
-#: transactions.xml:457
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "보다 더 유연한 해결책은 앞서 설명했듯이 Hibernate의 미리 빌드되어 있는 \"현"
 "재 세션\" 컨텍스트 관리이다:"
 
 #. Tag: programlisting
-#: transactions.xml:462
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -882,17 +893,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:464
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "당신은 통상의 어플리케이션에서 비지니스 코드 속에 이 관용구를 결코 보지 않을 "
 "것이다; 치명적인(시스템) 예외상황들은 항상 \"상단\"에서 잡혀야 한다. 달리 말"
@@ -904,12 +915,12 @@
 "부분에서 논의된다."
 
 #. Tag: para
-#: transactions.xml:474
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "당신은 (디폴트인) <literal>org.hibernate.transaction.JDBCTransactionFactory</"
@@ -917,17 +928,17 @@
 "current_session_context_class</literal>를 선택해야 함을 노트하라."
 
 #. Tag: title
-#: transactions.xml:483
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "JTA 사용하기"
 
 #. Tag: para
-#: transactions.xml:485
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -939,12 +950,12 @@
 "방도들을 제공한다."
 
 #. Tag: para
-#: transactions.xml:492
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "만일 당신이 bean-managed transactions(BMT)를 사용할 경우 Hibernate는 당신이 "
@@ -953,7 +964,7 @@
 "non-managed 환경과 동일하다."
 
 #. Tag: programlisting
-#: transactions.xml:498
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -977,20 +988,19 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:500
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 "만일 당신이 트랜잭션에 묶인 <literal>Session</literal>, 즉 쉬운 컨텍스트 보급"
 "을 위한 <literal>getCurrentSession()</literal> 기능을 사용하고자 원할 경우, "
 "당신은 JTA <literal>UserTransaction</literal> API를 직접 사용해야 할 것이다:"
 
 #. Tag: programlisting
-#: transactions.xml:506
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1013,17 +1023,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:508
+#: transactions.xml:522
 #, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programmatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "CMT의 경우, 트랜잭션 관할[경계 설정]은 프로그램 상이 아닌, session bean 배치 "
 "디스크립터들 속에서 행해진다. 그러므로 코드는 다음으로 감소된다:"
 
 #. Tag: programlisting
-#: transactions.xml:513
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1035,15 +1045,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:515
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "왜냐하면 하나의 세션 빈 메소드에 의해 던져진 처리되지 않은 "
 "<literal>RuntimeException</literal>이 글로벌 트랜잭션을 rollback으로 설정하도"
@@ -1054,17 +1064,16 @@
 "emphasis>"
 
 #. Tag: para
-#: transactions.xml:523
+#: transactions.xml:537
 #, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatibility), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "당신이 Hibernate의 트랜잭션 팩토리를 구성할 때, 당신이 JTA를 직접 사용할 경우"
 "(BMT) 당신은 <literal>org.hibernate.transaction.JTATransactionFactory</"
@@ -1076,21 +1085,21 @@
 "또는 <literal>\"jta\"</literal>로 설정되도록 하라."
 
 #. Tag: para
-#: transactions.xml:532
+#: transactions.xml:546
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
 "close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "<literal>getCurrentSession()</literal> 오퍼레이션들은 JTA 환경에서 한 가지 단"
 "점을 갖고 있다. 디폴트로 사용되는, <literal>after_statement</literal> 커넥션 "
@@ -1106,23 +1115,23 @@
 "쉽게 피할 수 있다.)"
 
 #. Tag: title
-#: transactions.xml:548
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "예외상황 처리"
 
 #. Tag: para
-#: transactions.xml:550
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "만일<literal>Session</literal>이 (어떤 <literal>SQLException</literal>을 포함"
 "하는) 예외상황을 던질 경우, 당신은 데이터베이스 트랜잭션을 즉시 롤백시키고, "
@@ -1134,19 +1143,19 @@
 "를 호출하여 닫혀지도록 확실히 하라."
 
 #. Tag: para
-#: transactions.xml:561
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "Hibernate 영속 계층에서 발생할 수 있는 대부분의 오류들을 포장하는, "
 "<literal>HibernateException</literal>은 체크되지 않은 예외상황이다(그것은 "
@@ -1160,7 +1169,7 @@
 "가능하지 않고 적절한 액션이 취해져야 한다."
 
 #. Tag: para
-#: transactions.xml:573
+#: transactions.xml:587
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
@@ -1173,9 +1182,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "Hibernate는 데이터베이스와 상호작용하는 동안에 던져진 <literal>SQLException</"
@@ -1192,73 +1201,73 @@
 "를 보라). 표준 <literal>JDBCException</literal> 서브타입은 다음과 같다:"
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - 기본 JDBC 통신에 대한 오류를 나"
 "타낸다."
 
 #. Tag: para
-#: transactions.xml:595
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - 생겨난 SQL에 대한 문법 또는 구문 문"
 "제점을 나타낸다."
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - 무결성 제약 위반에 관한 어"
 "떤 형식을 나타낸다."
 
 #. Tag: para
-#: transactions.xml:607
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - 요청된 오퍼레이션을 실행하는데 "
 "필수적인 잠금 레벨을 획득하는 오류를 나타낸다."
 
 #. Tag: para
-#: transactions.xml:613
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr ""
 "<literal>GenericJDBCException</literal> - 다른 카테고리들 중 어떤 것으로 분류"
 "되지 않았던 일반적인 예외상황."
 
 #. Tag: title
-#: transactions.xml:623
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "트랜잭션 타임아웃"
 
 #. Tag: para
-#: transactions.xml:625
+#: transactions.xml:639
 #, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
 "transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
@@ -1274,7 +1283,7 @@
 "다."
 
 #. Tag: programlisting
-#: transactions.xml:638
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1299,33 +1308,32 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:640
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "<literal>setTimeout()</literal>은 CMT bean 내에서 호출도리 수 없음을 노트하"
 "라. 여기서 트랜잭션 타임아웃들은 선언적으로 정의되어야 한다."
 
 #. Tag: title
-#: transactions.xml:650
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Optimistic 동시성 제어"
 
 #. Tag: para
-#: transactions.xml:652
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "고도의 동시성과 고도의 가용성을 일치시키는 유일한 접근법은 버전화를 가진 "
 "optimistic동시성 제어이다. 버전 체킹은 업데이트 충돌을 검출하기 위해(그리고 "
@@ -1336,22 +1344,22 @@
 "지하는 이점을 갖고 있다."
 
 #. Tag: title
-#: transactions.xml:663
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "어플리케이션 버전 체킹"
 
 #. Tag: para
-#: transactions.xml:665
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "하나의 구현에서 Hibernate로부터 많은 도움이 없이, 데이터베이스에 대한 각각의 "
 "상호작용은 새로운 <literal>Session</literal> 내에서 일어나고, 개발자는 영속 "
@@ -1360,7 +1368,7 @@
 "자신의 버전 체킹을 수행하도록 어플리케이션에게 강제시킨다."
 
 #. Tag: programlisting
-#: transactions.xml:674
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1378,7 +1386,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:676
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1390,15 +1398,15 @@
 "킬 것이다."
 
 #. Tag: para
-#: transactions.xml:682
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "물론, 당신이 낮은 데이터 동시성 환경에서 작업하고 있고 버전 체킹을 필요로 하"
 "지 않을 경우에, 당신은 이 접근법을 사용할 수 도 있고 단지 버전 체크를 생략할 "
@@ -1408,14 +1416,14 @@
 "들을 병합시킬 기회 없이 업데이트들 손실을 겪을 수도 있기 때문이다."
 
 #. Tag: para
-#: transactions.xml:691
+#: transactions.xml:705
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "명료하게 수작업 버전 체킹은 매우 사소한 환경들에서도 공포적이고 대부분의 어플"
 "리케이션들에 대해 실제적이지 않다. 흔히 단일 인스턴스 뿐만 아니라 변경된 객체"
@@ -1424,22 +1432,22 @@
 "전 체킹을 제공한다."
 
 #. Tag: title
-#: transactions.xml:702
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "확장된 세션과 자동적인 버전화"
 
 #. Tag: para
-#: transactions.xml:704
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "하나의 <literal>Session</literal> 인스턴스와 그것의 영속 인스턴스들은 전체 어"
 "플리케이션 트랜잭션에 사용된다. Hibernate는 flush 할 때 인스턴스 버전들을 체"
@@ -1454,14 +1462,14 @@
 "되지 않은 데이터를 가지고 비지니스 대화를 재시작하는 기회이다)."
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "<literal>Session</literal>은 사용자 상호작용을 기다릴 때 어떤 기본 JDBC 커넥"
 "션으로부터 연결해제된다. 이 접근법은 데이터베이스 접근의 관점에서 보면 가장 "
@@ -1470,7 +1478,7 @@
 "스들을 다시 로드시킬 필요가 없다."
 
 #. Tag: programlisting
-#: transactions.xml:721
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1485,24 +1493,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:722
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "<literal>foo</literal> 객체는 그것이 로드되었던 <literal>Session</literal>이 "
 "어느 것인지를 여전히 알고 있다. 이전 세션 상에서 하나의 새로운 데이터베이스 "
@@ -1521,16 +1528,16 @@
 "<literal>close()</literal>할 것이다."
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "만일 사용자가 생각하는시간 동안 <literal>Session</literal>이 저장되기에 너무 "
 "큰 경우 이 패턴은 문제성이 있다. 예를 들어 <literal>HttpSession</literal>은 "
@@ -1540,27 +1547,33 @@
 "에 대해서만 하나의 <literal>Session</literal>을 사용해야 한다. 왜냐하면 그것"
 "은 또한 곧 실없는 데이터가 될 것이기 때문이다."
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:747
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "(초기의 Hibernate 버전들은 <literal>Session</literal>에 대한 명시적인 연결해"
 "제와 재연결을 필요로 했음을 노트하라. 트랜잭션을 시작하고 끝내는 것이 동일한 "
 "효과를 가지므로, 이들 방법들은 진부하게 되었다.)"
 
 #. Tag: para
-#: transactions.xml:753
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "또한 당신은 영속 계층에 대해 연결해제된 <literal>Session</literal>을 닫혀진채"
 "로 유지해야함을 노트하라. 달 리말해, 하나의 3-tier 환경에서 "
@@ -1569,13 +1582,13 @@
 "에 전송하지 말라 (또는 그것을 별도의 티어에 직렬화 시키지도 말라)."
 
 #. Tag: para
-#: transactions.xml:761
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "확장된 세션 패턴, 또는 <emphasis>session-per-conversation</emphasis>은 자동적"
@@ -1584,13 +1597,13 @@
 "며, 예제들은 Hibernate Wiki를 보라."
 
 #. Tag: title
-#: transactions.xml:771
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Detached 객체들과 자동적인 버전화"
 
 #. Tag: para
-#: transactions.xml:773
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1609,7 +1622,7 @@
 "()</literal>를 사용하여 그것들을 다시 첨부시킨다."
 
 #. Tag: programlisting
-#: transactions.xml:781
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1623,7 +1636,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:783
+#: transactions.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
@@ -1633,12 +1646,12 @@
 "이 발생할 경우에 예외상황을 던질 것이다."
 
 #. Tag: para
-#: transactions.xml:788
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "당신은 또한 <literal>update()</literal>대신에 <literal>lock()</literal>을 호"
@@ -1647,16 +1660,16 @@
 "용할 수 있다."
 
 #. Tag: title
-#: transactions.xml:797
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "자동적인 버전화를 맞춤화 시키기"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1667,19 +1680,19 @@
 "dirty 일 경우에 더 이상 버전을 증가시키지 않을 것이다."
 
 #. Tag: para
-#: transactions.xml:806
+#: transactions.xml:822
 #, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this conceptually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "리거시 데이터베이스 스키마들은 자주 static이고 변경될 수 없다. 또는 다른 어플"
 "리케이션들은 또한 동일한 데이터베이스에 접근하고 버전 번호들 또는 심지어 "
@@ -1693,13 +1706,13 @@
 "으로만 동작함을 노트하라."
 
 #. Tag: para
-#: transactions.xml:817
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "때때로 행해졌던 변경들이 중첩되지 않는 한 동시적인 변경이 허용될 수 있다. 만"
 "일 <literal>&lt;class&gt;</literal>를 매핑할 때 당신이 <literal>optimistic-"
@@ -1707,21 +1720,21 @@
 "비교만 할 것이다."
 
 #. Tag: para
-#: transactions.xml:823
+#: transactions.xml:840
 #, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute unnecessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "두 경우들에서, 전용 version/timestamp 컬럼의 경우 또는 full/dirty 필드 비교"
 "의 경우, Hibernate는 법전 체크를 실행하고 정보를 업데이트하는데 엔티티 당 (적"
@@ -1737,20 +1750,20 @@
 "징을 맞춤화 시킬 수 있다."
 
 #. Tag: title
-#: transactions.xml:841
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "Pessimistic 잠금"
 
 #. Tag: para
-#: transactions.xml:843
+#: transactions.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "It is not intended that users spend much time worrying about locking "
-"strategies. It's usually enough to specify an isolation level for the JDBC "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "사용자들은 잠금 방도에 대해 걱정하는데 많은 시간을 할애하하려고 생각하지 않는"
 "다. 대개 JDBC 커넥션들에 대한 격리 레벨을 지정하는 것으로 충분하고 그런 다음 "
@@ -1759,27 +1772,27 @@
 "작 시에 잠금들을 다시 얻고자 원할 수도 있다."
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr ""
 "Hibernate는 결코 메모리 내에 있는 객체들이 아닌, 데이터베이스의 잠금 메커니즘"
 "을 항상 사용할 것이다!"
 
 #. Tag: para
-#: transactions.xml:855
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "<literal>LockMode</literal> 클래스는 Hibernate에 의해 획득될 수 있는 다른 잠"
 "금 레벨들을 정의한다. 잠금은 다음 메커니즘들에 의해 얻어진다:"
 
 #. Tag: para
-#: transactions.xml:862
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1789,10 +1802,10 @@
 "insert 할 때 자동적으로 획득된다."
 
 #. Tag: para
-#: transactions.xml:868
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1801,10 +1814,10 @@
 "literal>를 사용하여 명시적인 사용자 요청 상에서 얻어질 수 있다."
 
 #. Tag: para
-#: transactions.xml:874
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1813,19 +1826,19 @@
 "도 있다."
 
 #. Tag: para
-#: transactions.xml:880
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "<literal>LockMode.READ</literal>는 Hibernate가 반복 가능한 읽기(Repeatable "
 "Read) 또는 Serialization 격리 레벨에서 데이터를 읽어들일 때 자동적으로 얻어"
 "질 수도 있다. 명시적인 사용자 요청에 의해 다시 얻어질 수도 있다."
 
 #. Tag: para
-#: transactions.xml:887
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1840,14 +1853,14 @@
 "출을 통해 세션과 연관된 객체들이 또한 이 잠금 모드로 시작된다."
 
 #. Tag: para
-#: transactions.xml:896
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "\"명시적인 사용자 요청\"은 다음 방법들 중 하나로 표현된다:"
 
 #. Tag: para
-#: transactions.xml:902
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1857,19 +1870,19 @@
 "한 호출."
 
 #. Tag: para
-#: transactions.xml:907
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "<literal>Session.lock()</literal>에 대한 호출."
 
 #. Tag: para
-#: transactions.xml:912
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "<literal>Query.setLockMode()</literal>에 대한 호출."
 
 #. Tag: para
-#: transactions.xml:918
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1888,14 +1901,14 @@
 "그 객체에 대해 <literal>lock()</literal>을 호출한다."
 
 #. Tag: para
-#: transactions.xml:927
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "만일 지정된 잠금 모드가 <literal>READ</literal>, <literal>UPGRADE</literal> "
 "또는 <literal>UPGRADE_NOWAIT</literal> 일 경우에 <literal>Session.lock()</"
@@ -1904,37 +1917,37 @@
 "literal>가 사용된다.)"
 
 #. Tag: para
-#: transactions.xml:934
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "만일 데이터베이스가 요청된 잠금 모드를 지원하지 않을 경우, (예외상황을 던지"
 "는 대신에) Hibernate는 적절한 대체 모드를 사용할 것이다. 이것은 어플리케이션"
 "이 이식 가능할 것임을 확실히 해준다."
 
 #. Tag: title
-#: transactions.xml:943
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "연결 해제 모드들"
 
 #. Tag: para
-#: transactions.xml:945
-#, no-c-format
+#: transactions.xml:962
+#, fuzzy, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 "JDBC 커넥션 관리에 관한 Hibernate의 리거시(2.x) 특징은 그것이 처음으로 필요"
 "로 했을 때 하나의 <literal>Session</literal>이 하나의 커넥션을 획득할 것이"
@@ -1946,38 +1959,36 @@
 "ConnectionReleaseMode</literal>의 열거된 값들에 의해 식별된다:"
 
 #. Tag: para
-#: transactions.xml:959
+#: transactions.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obtains a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 "<literal>ON_CLOSE</literal> - 는 본질적으로 위에 설명된 리거시 특징이다. "
 "Hibernate 세션은 그것이 어떤 JDBC 접근을 수행하고 세션이 닫혀질 때까지 그 커"
 "넥션을 보관할 필요가 있을 때 하나의 커넥션을 획득한다."
 
 #. Tag: para
-#: transactions.xml:966
-#, no-c-format
+#: transactions.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 "<literal>AFTER_TRANSACTION</literal> - 은 하나의 <literal>org.hibernate."
 "Transaction</literal>이 완료된 후에 연결들을 해제하라고 말한다."
 
 #. Tag: para
-#: transactions.xml:972
-#, no-c-format
+#: transactions.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 "<literal>AFTER_STATEMENT</literal> (또한 적극적인 해제라고 언급됨) - 는 각각"
 "의 모든 문장 실행 후에 커넥션들을 해제하라고 말한다. 이 적극적인 해제는 그 문"
@@ -1986,26 +1997,27 @@
 "ScrollableResults</literal>의 사용을 통해서이다."
 
 #. Tag: para
-#: transactions.xml:982
-#, no-c-format
+#: transactions.xml:999
+#, fuzzy, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 "사용할 해제 모드를 지정하기 위해 구성 파라미터 <literal>hibernate.connection."
 "release_mode</literal>가 사용된다. 가능한 값들은 다음과 같다:"
 
 #. Tag: para
-#: transactions.xml:989
-#, no-c-format
+#: transactions.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 "<literal>auto</literal> (디폴트) - 이 선택은 <literal>org.hibernate."
 "transaction.TransactionFactory.getDefaultReleaseMode()</literal> 메소드에 의"
@@ -2017,25 +2029,24 @@
 "다."
 
 #. Tag: para
-#: transactions.xml:999
-#, no-c-format
+#: transactions.xml:1016
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 "<literal>on_close</literal> - 는 ConnectionReleaseMode.ON_CLOSE를 사용하라고 "
 "말한다. 이 설정은 역호환성을 위해 남겨졌지만, 그것의 사용은 매우 권장되지 않"
 "는다."
 
 #. Tag: para
-#: transactions.xml:1005
-#, no-c-format
+#: transactions.xml:1022
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 "<literal>after_transaction</literal> - 은 ConnectionReleaseMode."
@@ -2045,18 +2056,18 @@
 "AFTER_STATEMENT인 것처럼 해제될 것임을 또한 노트하라."
 
 #. Tag: para
-#: transactions.xml:1013
-#, no-c-format
+#: transactions.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""
 "<literal>after_statement</literal> - 는 ConnectionReleaseMode.AFTER_STATEMENT"
 "를 사용하라고 말한다. 추가적으로 구성된 <literal>ConnectionProvider</literal>"

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,165 +11,194 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:7
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
-msgstr "Hibernate 개요"
+msgid "Tutorial"
+msgstr ""
 
-#. Tag: title
-#: tutorial.xml:10
-#, no-c-format
-msgid "Preface"
-msgstr "머리말"
-
 #. Tag: para
-#: tutorial.xml:12
+#: tutorial.xml:33
 #, no-c-format
 msgid ""
-"This chapter is an introductory tutorial for new users of Hibernate. We "
-"start with a simple command line application using an in-memory database and "
-"develop it in easy to understand steps."
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
+"Gloegl. All code is contained in the <filename>tutorials/web</filename> "
+"directory of the project source."
 msgstr ""
-"이 장은 Hibernate 초심자를 위한 개론적인 튜토리얼이다. 우리는 메모리-내 데이"
-"터베이스를 사용하는 간단한 명령 라인 어플리케이션으로 시작하고 단계들을 이해"
-"하도록 쉽게 그것을 개발한다."
 
 #. Tag: para
-#: tutorial.xml:18
+#: tutorial.xml:42
 #, no-c-format
 msgid ""
-"This tutorial is intended for new users of Hibernate but requires Java and "
-"SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-party "
-"libraries we name are for JDK 1.4 and 5.0. You might need others for JDK 1.3."
+"This tutorial expects the user have knowledge of both Java and SQL. If you "
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
-"이 튜토리얼은 Hibernate 신규 사용자들을 의도하고 있지만 Java와 SQL 지식을 필"
-"요로 한다. 그것은 Michael Gloegl이 작성한 튜토리얼에 기초하며, 우리가 명명하"
-"는 제 3의 라이브러리들은 JDK 1.4와 5.0 버전용이다. 당신은 JDK1.3에 대해 다른 "
-"라이브러리들을 필요로 할 수도 있다."
 
 #. Tag: para
-#: tutorial.xml:24
+#: tutorial.xml:51
 #, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
-"튜토리얼용 소스는 <literal>doc/reference/tutorial/</literal> 디렉토리 내에 있"
-"는 배포본 내에 포함되어 있다."
 
 #. Tag: title
-#: tutorial.xml:32
+#: tutorial.xml:59
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "파트 1 - 첫 번째 Hibernate 어플리케이션"
 
 #. Tag: para
-#: tutorial.xml:34
+#: tutorial.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
+msgstr ""
+"우리가 우리가 수반하고자 원하는 이벤트들을 저장할 수 있는 작은 데이터베이스 "
+"어플리케이션과 이들 이벤트들의 호스트들에 대한 정보를 필요로 한다고 가정하자."
+
+#. Tag: para
+#: tutorial.xml:67
 #, no-c-format
 msgid ""
-"First, we'll create a simple console-based Hibernate application. We use an "
-"Java database (HSQL DB), so we do not have to install any database server."
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
-"먼저, 우리는 한 개의 간단한 콘솔-기반 Hibernate 어플리케이션을 생성시킬 것이"
-"다. 우리는 메모리-내 데이터베이스(HSQL DB)를 사용하므로, 우리는 어떤 데이터베"
-"이스 서버를 설치하지 않아도 된다."
 
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:39
+#: tutorial.xml:78
 #, no-c-format
 msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the hosts of these events."
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
-"우리가 우리가 수반하고자 원하는 이벤트들을 저장할 수 있는 작은 데이터베이스 "
-"어플리케이션과 이들 이벤트들의 호스트들에 대한 정보를 필요로 한다고 가정하자."
 
 #. Tag: para
-#: tutorial.xml:44
+#: tutorial.xml:88
 #, no-c-format
 msgid ""
-"The first thing we do, is set up our development directory and put all the "
-"Java libraries we need into it. Download the Hibernate distribution from the "
-"Hibernate website. Extract the package and place all required libraries "
-"found in <literal>/lib</literal> into into the <literal>/lib</literal> "
-"directory of your new development working directory. It should look like "
-"this:"
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
 msgstr ""
-"우리가 행할 첫 번째 것은 우리의 개발 디렉토리를 설정하고, 우리가 필요로 하는 "
-"모든 Java 라이브러리들을 그것 속에 집어 넣는 것이다. Hibernate 웹 사이트로부"
-"터 Hibernate 배포본을 내려 받아라. 패키지를 추출해내고 <literal>/lib</"
-"literal> 속에서 발견되는 모든 필요한 라이브러리들을 당신의 새로운 개발 작업 "
-"디렉토리의 <literal>/lib</literal> 디렉토리 속에 위치지워라. 그것은 다음과 같"
-"을 것이다:"
 
 #. Tag: programlisting
-#: tutorial.xml:52
+#: tutorial.xml:94
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+"         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
+"apache.org/xsd/maven-4.0.0.xsd\">\n"
+"\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
+"\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>org.hibernate</groupId>\n"
+"            <artifactId>hibernate-core</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Because this is a web app, we also have a dependency on the "
+"servlet api. -->\n"
+"        <dependency>\n"
+"            <groupId>javax.servlet</groupId>\n"
+"            <artifactId>servlet-api</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:54
+#: tutorial.xml:97
 #, no-c-format
 msgid ""
-"This is the minimum set of required libraries (note that we also copied "
-"hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
-"writing</emphasis>. The Hibernate release you are using might require more "
-"or less libraries. See the <literal>README.txt</literal> file in the "
-"<literal>lib/</literal> directory of the Hibernate distribution for more "
-"information about required and optional third-party libraries. (Actually, "
-"Log4j is not required but preferred by many developers.)"
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
 msgstr ""
-"이것은 <emphasis>글의 작성 시점에서</emphasis> Hibernate에 필수적인 최소한의 "
-"세트이다(우리는 또한 메인 아카이브인 hibernate3.jar를 복사했음을 노트하라). "
-"당신이 사용 중인 Hibernate 배포본이 더 많거나 보다 적은 라이브러리들을 필요"
-"로 할 수도 있다. 필수 라이브러리들과 선택적인 제3의 라이브러리들에 대한 추가 "
-"정보는 Hibernate 배포본의 <literal>lib/</literal> 디렉토리 내에 있는 "
-"<literal>README.txt</literal> 파일을 보라. (실제로, Log4j는 필수는 아니지만 "
-"많은 개발자들에 의해 선호된다.)"
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:114
 #, no-c-format
 msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
+"Save this file as <filename>pom.xml</filename> in the project root directory."
 msgstr ""
-"다음으로 우리는 우리가 데이터베이스 속에 저장시키고자 원하는 이벤트를 표현하"
-"는 한 개의 클래스를 생성시킨다."
 
 #. Tag: title
-#: tutorial.xml:68
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr "첫 번째 클래스"
 
 #. Tag: para
-#: tutorial.xml:70
-#, no-c-format
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
 msgstr ""
-"우리의 첫 번째 영속 클래스는 몇몇 프로퍼티들을 가진 간단한 자바빈즈 클래스이"
-"다:"
+"다음으로 우리는 우리가 데이터베이스 속에 저장시키고자 원하는 이벤트를 표현하"
+"는 한 개의 클래스를 생성시킨다."
 
 #. Tag: programlisting
-#: tutorial.xml:74
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -208,15 +237,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:76
-#, no-c-format
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "당신은 이 클래스가 프로퍼티 getter와 setter 메소드들에 대한 표준 자바빈즈 명"
 "명법들 뿐만 아니라 필드들에 대한 private 가시성을 사용하고 있음을 알 수 있"
@@ -226,20 +254,20 @@
 "다."
 
 #. Tag: para
-#: tutorial.xml:84
-#, no-c-format
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "<literal>id</literal> 프로퍼티는 특별한 이벤트를 위한 유일 식별자를 소유한"
 "다. 모든 영속 엔티티 클래스들 (보다 덜 중요한 종속 클래스들도 존재한다)은 우"
@@ -254,13 +282,13 @@
 "있으며, 당신은 당신의 어플리케이션 설계에 적합하도록 그것을 부합시킬 수 있다."
 
 #. Tag: para
-#: tutorial.xml:96
-#, no-c-format
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "아규먼트 없는 생성자는 모든 영속 클래스들에 대한 필요조건이다; Hibernate는 당"
@@ -269,42 +297,21 @@
 "없는 효율적인 데이터 검색에 필요하다."
 
 #. Tag: para
-#: tutorial.xml:103
+#: tutorial.xml:161
 #, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"이 Java 소스 파일을 개발 폴더 내의 <literal>src</literal>로 명명된 디렉토리 "
-"속에 있는 위치지워라. 이제 그 디렉토리는 다음과 같을 것이다:"
 
-#. Tag: programlisting
-#: tutorial.xml:108
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:110
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr "다음 단계에서, 우리는 Hiberante에게 이 영속 클래스에 대해 알려 준다."
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr "The mapping file"
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:170
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -318,13 +325,13 @@
 "사용해야 하는 그 테이블 내의 컬럼들이 무엇인지를 Hibernate에게 알려준다."
 
 #. Tag: para
-#: tutorial.xml:126
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "매핑 파일의 기본 구조는 다음과 같다:"
 
 #. Tag: programlisting
-#: tutorial.xml:130
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -332,23 +339,23 @@
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
 "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:132
-#, no-c-format
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "Hibernate DTD는 매우 정교하다. 당신은 당신의 편집기 또는 IDE 내에서 XML 매핑 "
 "요소들과 속성들에 대한 자동 완성 기능을 위해 그것을 사용할 수 있다. 당신은 또"
@@ -360,23 +367,23 @@
 "Hibernate 배포본의 <literal>src/</literal> 디렉토리 속에 포함되어 있다."
 
 #. Tag: para
-#: tutorial.xml:143
-#, no-c-format
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "우리는 코드를 간략화 시키기 위해 장래의 예제에서 DTD 선언을 생략할 것이다. 그"
 "것은 물론 옵션이 아니다."
 
 #. Tag: para
-#: tutorial.xml:148
-#, no-c-format
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "두 개의 <literal>hibernate-mapping</literal> 태그들 사이에 <literal>class</"
 "literal> 요소를 포함시켜라. 모든 영속 엔티티 클래스들(다시금 종속 클래스들일 "
@@ -384,12 +391,12 @@
 "에 대한 그런 매핑을 필요로 한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:155
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -397,16 +404,15 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:157
-#, no-c-format
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "지금까지 우리는 그 테이블 내에 있는 한 행에 의해 표현된 각각의 인스턴스인, 클"
 "래스의 객체를 영속화 시키고 로드시키는 방법을 Hibernate에게 알려주었다. 이제 "
@@ -416,12 +422,12 @@
 "다:"
 
 #. Tag: programlisting
-#: tutorial.xml:165
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -431,50 +437,56 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
+#: tutorial.xml:224
 #, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"The <literal>id</literal> element is the declaration of the identifier "
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"<literal>id</literal> 요소는 식별자 프로퍼티의 선언이고, <literal>name=\"id"
-"\"</literal>는 Java 프로퍼티의 이름을 선언한다 - Hibernate는 그 프로퍼티에 접"
-"근하는데 getter 및 setter 메소드들을 사용할 것이다. column 속성은 우리가 "
-"<literal>EVENTS</literal> 테이블의 어느 컬럼을 이 프라이머리 키로 사용하는지"
-"를 Hibernate에게 알려준다. 내포된 <literal>generator</literal> 요소는 식별자 "
-"생성 방도를 지정하며, 이 경우에 우리는 <literal>increment</literal>를 사용했"
-"고, 그것은 대개 테스팅(과 튜토리얼들)에 유용한 매우 간단한 메모리-내 숫자 증"
-"가 방법이다. Hibernate는 또한 전역적으로 유일한 데이터베이스에 의해 생성된 식"
-"별자 뿐만 아니라 어플리케이션에 의해 할당된 식별자(또는 당신이 확장으로 작성"
-"한 어떤 방도)를 지원한다."
 
 #. Tag: para
-#: tutorial.xml:180
+#: tutorial.xml:234
 #, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "마지막으로 우리는 매핑 파일 속에서 클래스의 영속 프로퍼티들에 대한 선언들을 "
 "포함한다. 디폴트로, 클래스의 프로퍼티들은 영속적인 것으로 간주되지 않는다:"
 
 #. Tag: programlisting
-#: tutorial.xml:186
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -486,14 +498,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:188
-#, no-c-format
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "<literal>id</literal> 요소의 경우처럼, <literal>property</literal> 요소의 "
 "<literal>name</literal> 속성은 사용할 getter 및 setter 메소드들이 어느 것인지"
@@ -502,15 +514,15 @@
 "게 될 것이다."
 
 #. Tag: para
-#: tutorial.xml:195
-#, no-c-format
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "<literal>date</literal> 프로퍼티 매핑은 <literal>column</literal> 속성을 포함"
 "하는데, 왜 <literal>title</literal>은 <literal>column</literal> 속성을 포함하"
@@ -520,24 +532,23 @@
 "는 그것을 다른 이름으로 더 좋게 매핑 시킨다."
 
 #. Tag: para
-#: tutorial.xml:204
-#, no-c-format
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "다음 흥미로운 점은 <literal>title</literal> 매핑 또한 <literal>type</"
 "literal> 속성을 갖지 않는다. 우리가 매핑파일들 속에서 선언하고 사용하는 타입"
@@ -556,76 +567,55 @@
 "고 선언한다."
 
 #. Tag: para
-#: tutorial.xml:220
+#: tutorial.xml:297
 #, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"다음 매핑 파일은 <literal>Event</literal> Java 클래스 소스 파일과 같은 디렉토"
-"리 속에 <literal>Event.hbm.xml</literal>로서 저장될 것이다. 매핑 파일들에 대"
-"한 네이밍은 임의적일 수 있지만, 접미사 <literal>hbm.xml</literal>은 "
-"Hibernate 개발자 공동체 내에서 컨벤션이 되었다. 디렉토리 구조는 이제 다음과 "
-"같을 것이다:"
 
-#. Tag: programlisting
-#: tutorial.xml:228
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:230
-#, no-c-format
-msgid "We continue with the main configuration of Hibernate."
-msgstr "우리는 Hibernate의 메인 구성을 계속 행한다."
-
 #. Tag: title
-#: tutorial.xml:237
+#: tutorial.xml:312
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Hibernate 구성"
 
 #. Tag: para
-#: tutorial.xml:239
+#: tutorial.xml:314
 #, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"우리는 이제 적절한 곳에 한 개의 영속 클래스와 그것의 매핑 파일을 갖고 있다. "
-"Hibernate를 구성할 차례이다. 우리가 이것을 행하기 전에, 우리는 데이터베이스"
-"를 필요로 할 것이다. 자바 기반의 메모리-내 SQL DBMS인 HSQL DB는 HSQL DB 웹 사"
-"이트에서 내려받을 수 있다. 실제로, 당신은 이 다운로드에서 오직 "
-"<literal>hsqldb.jar</literal> 만을 필요로 한다. 개발 폴더의 <literal>lib/</"
-"literal> 디렉토리 속에 이 파일을 위치지워라."
 
 #. Tag: para
-#: tutorial.xml:247
+#: tutorial.xml:321
 #, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "개발 디렉토리의 루트에 <literal>data</literal>로 명명된 디렉토리를 생성시켜"
 "라 - 이 디렉토리는 HSQL DB가 그것의 데이터 파일들을 저장하게 될 장소이다. 이"
@@ -638,35 +628,35 @@
 "에 있는 모든 파일들을 삭제하고 다시 HSQL DB를 시작하라."
 
 #. Tag: para
-#: tutorial.xml:257
+#: tutorial.xml:337
 #, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"Hibernate는 당신의 어플리케이션 내에서 이 데이터베이스에 연결하는 계층이고, "
-"따라서 그것은 커넥션 정보를 필요로 한다. 커넥션들은 마찬가지로 구성되어야 하"
-"는 하나의 JDBC 커넥션 풀을 통해 행해진다. Hibernate 배포본은 몇몇 오픈 소스 "
-"JDBC 커넥션 풀링 도구들을 포함하고 있지만, 이 튜토리얼에서는 Hibernate에 의"
-"해 미리 빌드된 커넥션 풀링을 사용할 것이다. 당신이 필수 라이브러리를 당신의 "
-"classpath 속에 복사해야 하고 만일 당신이 제품-특징의 제3의 JDBC 풀링 소프트웨"
-"어를 사용하고자 원할 경우에는 다른 커넥션 풀링 설정들을 사용해야 함을 노트하"
-"라."
 
 #. Tag: para
-#: tutorial.xml:267
+#: tutorial.xml:348
 #, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "Hibernate의 구성을 위해, 우리는 한 개의 간단한 <literal>hibernate."
 "properties</literal> 파일, 한 개의 약간 더 세련된 <literal>hibernate.cfg."
@@ -674,7 +664,7 @@
 "대부분의 사용자들은 XMl 구성 파일을 선호한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:273
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -713,9 +703,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -723,14 +713,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:275
+#: tutorial.xml:363
 #, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "이 XML 구성이 다른 DTD를 사용함을 노트하라. 우리는 Hibernate의 "
 "<literal>SessionFactory</literal> -특정 데이터베이스에 대해 책임이 있는 전역 "
@@ -739,20 +734,34 @@
 "factory&gt;</literal> 구성들을 사용하라."
 
 #. Tag: para
-#: tutorial.xml:283
+#: tutorial.xml:373
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "처음 네 개의 <literal>property</literal> 요소들은 JDBC 커넥션을 위한 필수 구"
 "성을 포함한다. dialect <literal>property</literal> 요소는 Hibernate가 발생시"
 "키는 특별한 SQL 이형(異形)을 지정한다. <literal>hbm2ddl.auto</literal> 옵션"
@@ -762,138 +771,80 @@
 "수 있다. 마지막으로 우리는 영속 클래스들을 위한 매핑 파일(들)을 추가시킨다."
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"이 파일을 소스 디렉토리 속으로 복사하고, 따라서 그것은 classpath의 루트에서 "
-"끝날 것이다. Hibernate는 시작 시에 classpath의 루트에서 <literal>hibernate."
-"cfg.xml</literal>로 명명된 파일을 자동적으로 찾는다."
 
 #. Tag: title
-#: tutorial.xml:305
-#, no-c-format
-msgid "Building with Ant"
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "Ant로 빌드하기"
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:405
 #, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"우리는 이제 Ant로 튜토리얼을 빌드할 것이다. 당신은 Ant를 설치할 필요가 있을 "
-"것이다 - <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant 내려받기 페"
-"이지</ulink>에서 Ant를 얻어라. Ant를 설치하는 방법은 여기서 다루지 않을 것이"
-"다. <ulink url=\"http://ant.apache.org/manual/index.html\">Ant 매뉴얼</ulink>"
-"을 참조하길 바란다. 당신이 Ant를 설치한 후에, 우리는 빌드파일 생성을 시작할 "
-"수 있다. 그것은 <literal>build.xml</literal>로 명명되고 개발 디렉토리 속에 직"
-"접 위치될 것이다."
 
-#. Tag: para
-#: tutorial.xml:316
-#, no-c-format
-msgid "A basic build file looks like this:"
-msgstr "기본 빌드 파일은 다음과 같다:"
-
 #. Tag: programlisting
-#: tutorial.xml:320
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:322
-#, no-c-format
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr ""
-"이것은 <literal>.jar</literal>로 끝나는 lib 디렉토리 내에 있는 모든 파일들을 "
-"컴파일에 사용되는 classpath에 추가하도록 Ant에게 알려줄 것이다. 그것은 또한 "
-"모든 비-Java 소스 파일들을 대상 디렉토리로 복사할 것이다. 예를 들면, 구성 및 "
-"Hibernate 매핑 파일들. 만일 당신이 Ant를 이제 실행할 경우, 당신은 다음 출력"
-"을 얻게 될 것이다:"
-
-#. Tag: programlisting
-#: tutorial.xml:329
-#, no-c-format
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:334
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "시작과 helper들"
 
 #. Tag: para
-#: tutorial.xml:336
-#, no-c-format
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "몇몇 <literal>Event</literal> 객체들을 로드시키고 저장할 차례이지만, 먼저 우"
 "리는 어떤 인프라스트럭처 코드로 설정을 완료해야 한다. 우리는 Hibernate를 시작"
@@ -905,12 +856,12 @@
 "전역 객체이다."
 
 #. Tag: para
-#: tutorial.xml:346
-#, no-c-format
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr ""
 "우리는 시작을 처리하고 <literal>Session</literal> 처리를 편리하게 해주는 "
 "<literal>HibernateUtil</literal> helper 클래스를 생성시킬 것이다. 이른바 "
@@ -918,24 +869,25 @@
 "의 작업 단위를 현재의 쓰레드와 연관지워 유지한다. 구현을 살펴보자:"
 
 #. Tag: programlisting
-#: tutorial.xml:352
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -951,15 +903,24 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:354
+#: tutorial.xml:444
 #, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "이 클래스는 (클래스가 로드될 때 JVM에 의해 한번 호출되는) 그것의 static 초기"
 "자 내에 전역 <literal>SessionFactory</literal>를 산출할 뿐만 아니라 또한 현"
 "재 쓰레드에 대한 <literal>Session</literal>을 소유하는 <literal>ThreadLocal</"
@@ -969,15 +930,15 @@
 "</literal>에 대한 호출은 쓰레드와 현재 연관되어 있는 작업 단위를 종료시킨다."
 
 #. Tag: para
-#: tutorial.xml:361
-#, no-c-format
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "당신이 이 helper를 사용하기 전에 thread-local 변수들에 대한 Java 개념을 확실"
 "히 이해하도록 하라. 보다 강력한 <literal>HibernateUtil</literal> helper는 "
@@ -991,47 +952,18 @@
 "으로 바인드시킬 수 있을 것이다."
 
 #. Tag: para
-#: tutorial.xml:370
-#, no-c-format
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"개발 소스 디렉토리 속에 <literal>HibernateUtil.java</literal> 를 위치지우고, "
-"다음으로 <literal>Event.java</literal>를 위치지워라:"
-
-#. Tag: programlisting
-#: tutorial.xml:375
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:377
-#, no-c-format
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "이것은 문제 없이 다시 컴파일 될 것이다. 우리는 마지막으로 로깅 시스템을 구성"
 "할 필요가 있다 - Hibernate는 commons logging를 사용하고 Log4j와 JDK 1.4 사이"
 "의 선택은 당신의 몫으로 남겨둔다. 대부분의 개발자들은 Log4j를 선호한다: "
@@ -1042,43 +974,45 @@
 "Hibernate 시작 메시지는 stdout 상에 보여진다."
 
 #. Tag: para
-#: tutorial.xml:387
-#, no-c-format
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr ""
 "튜토리얼 인프라스트럭처는 완전하다 - 그리고 우리는 Hibernate로 어떤 실제 작업"
 "을 행할 준비가 되어 있다."
 
 #. Tag: title
-#: tutorial.xml:395
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "객체 로딩과 객체 저장"
 
 #. Tag: para
-#: tutorial.xml:397
-#, no-c-format
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "마지막으로 우리는 객체들을 로드시키고 저장하는데 Hibernate를 사용할 수 있다. "
 "우리는 한 개의 <literal>main()</literal> 메소드를 가진 한 개의 "
 "<literal>EventManager</literal> 클래스를 작성한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:402
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1093,16 +1027,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1112,13 +1043,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:404
-#, no-c-format
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "우리는 한 개의 새로운 <literal>Event</literal> 객체를 생성시키고, 그것을 "
 "Hibernate에게 건네준다. Hibernate는 이제 SQL을 처리하고 데이터베이스 상에서 "
@@ -1127,15 +1058,17 @@
 "펴보자."
 
 #. Tag: para
-#: tutorial.xml:411
-#, no-c-format
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "<literal>Session</literal>은 한 개의 작업 단위이다. 지금부터 우리는 단숨함을 "
 "유지할 것이고 Hibernate <literal>Session</literal>과 데이터베이스 트랜잭션 사"
@@ -1145,19 +1078,17 @@
 "가능한 <literal>Transaction</literal> API를 사용한다."
 
 #. Tag: para
-#: tutorial.xml:419
-#, no-c-format
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "<literal>sessionFactory.getCurrentSession()</literal>은 무엇을 행하는가? 먼"
 "저 당신은 당신이 (<literal>HibernateUtil</literal> 덕분에 쉽게) "
@@ -1170,21 +1101,28 @@
 "scope(영역), 작업 단위가 시작될 때와 작업 단위가 종료될 때를 고려해야 한다."
 
 #. Tag: para
-#: tutorial.xml:430
+#: tutorial.xml:529
 #, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "<literal>Session</literal>은 그것이 처음으로 필요로 되고 "
 "<literal>getCurrentSession()</literal>에 대한 첫 번째 호출이 이루어질 때 시작"
 "된다. 그때 그것은 Hibernate에 의해 현재의 쓰레드에 바인드 된다. 커밋되든 롤백"
@@ -1198,19 +1136,20 @@
 "질 수 있는데, 우리는 이 튜토리얼의 뒷부분에서 이것을 다룰 것이다.)."
 
 #. Tag: para
-#: tutorial.xml:441
-#, no-c-format
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "작업 영역의 단위와 관련하여, Hibernate <literal>Session</literal>은 하나 또"
 "는 여러 개의 데이터베이스 오퍼레이션들을 실행시키는데 사용될 수 있는가? 위의 "
@@ -1225,68 +1164,43 @@
 "진다."
 
 #. Tag: para
-#: tutorial.xml:452
-#, no-c-format
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "트랜잭션 핸들링과 경계구분에 대한 추가 정보는 <xref linkend=\"transactions\"/"
 ">을 살펴보라. 우리는 또한 앞의 예제에서 임의의 오류 처리와 롤백을 생략했다."
 
 #. Tag: para
-#: tutorial.xml:458
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"이 첫 번째 루틴을 실행하기 위해서 우리는 호출 가능한 대상을 Ant 빌드 파일에 "
-"추가해야 한다:"
 
-#. Tag: programlisting
-#: tutorial.xml:462
-#, no-c-format
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:464
+#: tutorial.xml:581
 #, no-c-format
-msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"<literal>action</literal> 아규먼트의 값은 대상을 호출할 때 명령 라인 상에서 "
-"설정된다:"
 
-#. Tag: programlisting
-#: tutorial.xml:469
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:471
-#, no-c-format
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 "컴파일, 구성에 따른 Hibernate 시작 후에, 당신은 많은 로그 출력을 보게 될 것이"
 "다. 끝에서 당신은 다음 라인을 발견할 것이다:"
 
 #. Tag: programlisting
-#: tutorial.xml:476
+#: tutorial.xml:591
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1294,81 +1208,69 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:478
+#: tutorial.xml:593
 #, no-c-format
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"이것은 Hibernate에 의해 실행된 <literal>INSERT</literal>이고, 물음표 기호는 "
-"JDBC 바인드 파라미터들을 나타낸다. 아규먼트로서 바인드 된 값들을 보거나 장황"
-"한 로그를 줄이려면 당신의 <literal>log4j.properties</literal>를 체크하라."
 
 #. Tag: para
-#: tutorial.xml:484
-#, no-c-format
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "이제 우리는 마찬가지로 저장된 이벤트들을 열거하고자 원하며, 우리는 main 메소"
 "드에 한 개의 옵션을 추가한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:488
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
-#, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr ""
 "우리는 또한 새로운 <literal>listEvents() method</literal> 메소드를 추가 시킨"
 "다:"
 
 #. Tag: programlisting
-#: tutorial.xml:494
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:496
-#, no-c-format
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "여기서 우리가 행할 것은 데이터베이스로부터 모든 존재하는 <literal>Event</"
 "literal> 객체들을 로드시키기 위해 HQL (Hibernate Query Language) 질의를 사용"
@@ -1377,109 +1279,50 @@
 "물론 HQL로서 보다 복잡한 질의들을 생성시킬 수 있다."
 
 #. Tag: para
-#: tutorial.xml:503
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr "이제 이 모든 것을 실행하고 테스트하기 위해, 다음 단계들을 따르라:"
-
-#. Tag: para
-#: tutorial.xml:509
-#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"데이터베이스 속으로 어떤 것을 저장하고 물론 앞서 hbm2ddl을 통해 데이터베이스 "
-"스키마를 산출시키기 위해 <literal>ant run -Daction=store</literal>를 실행하"
-"라."
 
-#. Tag: para
-#: tutorial.xml:515
-#, no-c-format
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-msgstr ""
-"이제 당신의 <literal>hibernate.cfg.xml</literal> 파일 속에서 그 프로퍼티를 주"
-"석처리함으로써 hbm2ddl을 사용불가능하게 하라. 대개 당신은 지속되는 단위 테스"
-"팅에서는 그것을 사용 가능하게 내버려두어도 되지만, 또 다른 hbm2ddl의 실행은 "
-"당신이 저장했던 모든 것을 <emphasis>drop</emphasis>시킬 것이다 - "
-"<literal>create</literal> 구성 설정은 실제로 \"스키마로부터 모든 테이블들을 "
-"드롭시키고 나서, SessionFactory가 빌드될 때 모든 테이블들을 다시 생성시키는 "
-"것\"으로 변환된다."
-
-#. Tag: para
-#: tutorial.xml:525
-#, no-c-format
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"만일 당신이 지금 <literal>-Daction=list</literal>로 Ant를 호출할 경우, 당신"
-"은 당신이 지금까지 저장했던 이벤트들을 보게 될 것이다. 물론 당신은 또한 여러 "
-"번 <literal>store</literal> 액션을 호출할 수 있다."
-
-#. Tag: para
-#: tutorial.xml:531
-#, no-c-format
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"노트 : 대부분의 Hibernate 사용자들은 이 지점에서 실패하고 우리는 정기적으로 "
-"<emphasis>Table not found</emphasis> 오류 메시지들에 관한 질문을 받는다. 하지"
-"만 만일 당신이 위에 조명된 단게들을 따를 경우 당신은 이 문제를 겪지 않을 것이"
-"고, hbm2ddl이 처음 실행 시에 데이터베이스 스키마를 생성시키므로, 차후의 어플"
-"리케이션 재시작은 이 스키마를 사용할 것이다. 만일 당신이 매핑 그리고/또는 데"
-"이터베이스 스키마를 변경할 경우에, 당신은 다시 한번 더 hbm2ddl을 이용 가능하"
-"도록 해야 한다."
-
 #. Tag: title
-#: tutorial.xml:544
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "파트 2 - 연관들을 매핑하기"
 
 #. Tag: para
-#: tutorial.xml:546
-#, no-c-format
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr ""
 "우리는 한 개의 영속 엔티티 클래스를 한 개의 테이블로 매핑했다. 이것 위에서 빌"
 "드하고 몇몇 클래스 연관들을 추가시키자. 먼저 우리는 우리의 어플리케이션에 사"
 "람들을 추가하고 그들이 참여하는 이벤트들의 목록을 저장할 것이다."
 
 #. Tag: title
-#: tutorial.xml:552
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "Person 클래스 매핑하기"
 
 #. Tag: para
-#: tutorial.xml:554
-#, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr "클래스의 첫 번째 장면은 간단하다:"
 
 #. Tag: programlisting
-#: tutorial.xml:558
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1496,22 +1339,28 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:560
+#: tutorial.xml:645
 #, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"<literal>Person.hbm.xml</literal>로 명명되는 새로운 매핑 파일을 생성시켜라 "
-"(맨위에 DTD 참조를 잊지말라):"
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid ""
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:565
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1524,13 +1373,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:567
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr "마지막으로 새로운 매핑을 Hibernate의 구성에 추가하라:"
 
 #. Tag: programlisting
-#: tutorial.xml:571
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1538,13 +1387,12 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:573
-#, no-c-format
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "이제 우리는 이들 두 개의 엔티티들 사이에 한 개의 연관을 생성시킬 것이다. 명백"
 "하게, 개인들은 이벤트들에 참여할 수 있고, 이벤트들은 참여자들을 갖는다. 우리"
@@ -1552,21 +1400,22 @@
 "(multiplicity), 그리고 콜렉션 특징."
 
 #. Tag: title
-#: tutorial.xml:583
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "단방향 Set-기반의 연관"
 
 #. Tag: para
-#: tutorial.xml:585
-#, no-c-format
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr ""
 "우리는 <literal>Person</literal> 클래스에 이벤트들을 가진 한 개의 콜렉션을 추"
 "가할 것이다. 그 방법으로 우리는 명시적인 질의-<literal>aPerson.getEvents()</"
@@ -1575,20 +1424,8 @@
 "literal>를 사용한다. 왜냐하면 그 콜렉션은 중복 요소들을 포함하기 않을 것이고 "
 "그 순서가 우리와 관련되어 있지 않기 때문이다."
 
-#. Tag: para
-#: tutorial.xml:592
-#, no-c-format
-msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr ""
-"우리는 하나의 <literal>Set</literal>으로 구현된, 하나의 단방향, 다중값 연관들"
-"을 필요로 한다. Java 클래스들 내에 이를 위한 코드를 작성하고 그런 다음 그것"
-"을 매핑시키자:"
-
 #. Tag: programlisting
-#: tutorial.xml:597
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1606,19 +1443,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:599
-#, no-c-format
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "우리가 이 연관을 매핑하기 전에, 다른 측에 대해 생각하라. 명백하게 우리는 이것"
 "을 단지 단방향으로 유지시킬 수 있다. 또는 우리가 그것을 양방향으로 네비게이트"
@@ -1630,10 +1466,10 @@
 "many 매핑을 사용한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:610
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1643,28 +1479,27 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:612
-#, no-c-format
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "Hibernate는 모든 종류의 콜렉션 매핑들, 가장 공통적인 <literal>&lt;set&gt;</"
 "literal>을 지원한다. many-to-many 연관 (또는 <emphasis>n:m</emphasis> 엔티티 "
@@ -1678,13 +1513,13 @@
 "에 있는 클래스)를 Hibernate에게 알려주어야 한다."
 
 #. Tag: para
-#: tutorial.xml:624
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr "따라서 이 매핑을 위한 데이터베이스 스키마는 다음과 같다:"
 
 #. Tag: programlisting
-#: tutorial.xml:628
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1703,60 +1538,55 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:633
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr "연관들에 작업하기"
 
 #. Tag: para
-#: tutorial.xml:635
-#, no-c-format
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr ""
 "<literal>EventManager</literal> 속에 있는 한 개의 새로운 메소드 내에 몇몇 사"
 "람들과 이벤트들을 함께 가져오자:"
 
 #. Tag: programlisting
-#: tutorial.xml:639
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:641
-#, no-c-format
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "<literal>Person</literal>과 <literal>Event</literal>를 로드시킨 후에, 정규 콜"
 "렉션 메소드들을 사용하여 콜렉션을 간단하게 변경하라. 당신이 알 수 있듯이, "
@@ -1775,14 +1605,14 @@
 "션의 커밋(또는 롤백)으로 끝이난다."
 
 #. Tag: para
-#: tutorial.xml:656
-#, no-c-format
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "물론 당신은 다른 작업 단위 속에 개인과 이벤트를 로드시킬 수 도 있다. 또는 당"
 "신은 하나의 객체그 영속 상태에 있지 않을 때 <literal>Session</literal>의 외부"
@@ -1791,52 +1621,49 @@
 "드 내에서 이것은 다음과 같을 수 있다:"
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
-#, no-c-format
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "<literal>update</literal>에 대한 호출은 한 개의 detached 객체를 다시 영속화 "
 "시키고, 당신은 그것이 새로운 작업 단위에 바인드된다고 말할 수 있고, 따라서 "
@@ -1845,16 +1672,15 @@
 "(추가/삭제)를 포함한다."
 
 #. Tag: para
-#: tutorial.xml:672
-#, no-c-format
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "물론, 우리의 현재 상황에서 이것은 많이 사용되지 않지만, 그것은 당신이 당신 자"
 "신의 어플리케이션 내로 설계할 수 있는 중요한 개념이다. 지금 "
@@ -1865,34 +1691,35 @@
 "들 중 몇몇을 변경시켜야 할 것이다):"
 
 #. Tag: programlisting
-#: tutorial.xml:680
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:682
-#, no-c-format
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "이것은 두 개의 동등하게 중요한 클래스들, 두 개의 엔티티들 사이에서 한 개의 연"
 "관에 관한 예제였다. 앞서 언급했듯이, 전형적인 모형 내에는 다른 클래스들과 타"
@@ -1909,10 +1736,10 @@
 "<literal>MonetaryAmount</literal>을 작성할 수 있다."
 
 #. Tag: para
-#: tutorial.xml:695
-#, no-c-format
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -1921,70 +1748,66 @@
 "진다."
 
 #. Tag: title
-#: tutorial.xml:703
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr "값들을 가진 콜렉션"
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:814
 #, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"우리는 값 타입의 객체들을 가진 한 개의 콜렉션을 <literal>Person</literal> 엔"
-"티티에 추가시킨다. 우리는 email 주소를 저장하고자 원하므로, 우리가 사용하는 "
-"타입은 <literal>String</literal>이고, 그 콜렉션은 다시 한 개의 <literal>Set</"
-"literal>이다:"
 
 #. Tag: programlisting
-#: tutorial.xml:710
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:712
-#, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "이 <literal>Set</literal>에 대한 매핑은 다음과 같다:"
 
 #. Tag: programlisting
-#: tutorial.xml:716
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:718
-#, no-c-format
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "앞의 매핑과 비교한 차이점은 <literal>element</literal> 부분인데, 그것은 그 콜"
 "렉션이 또 다른 엔티티에 대한 참조들을 포함하지 않을 것이지만 "
@@ -1997,13 +1820,13 @@
 "속성은 <literal>String</literal> 값들이 실제로 저장될 컬럼 이름을 정의한다."
 
 #. Tag: para
-#: tutorial.xml:728
-#, no-c-format
-msgid "Have a look at the updated schema:"
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "업데이트된 스키마를 살펴보라:"
 
 #. Tag: programlisting
-#: tutorial.xml:732
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2029,11 +1852,11 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:734
-#, no-c-format
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -2043,44 +1866,42 @@
 "미론이다."
 
 #. Tag: para
-#: tutorial.xml:740
-#, no-c-format
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "마치 개인들과 이벤트들을 링크시켜서 이전에 우리가 행했던 것처럼 이제 당신은 "
 "요소들을 시도하고 이 콜렉션에 추가할 수 있다. 그것은 Java에서 동일한 코드이"
 "다."
 
 #. Tag: programlisting
-#: tutorial.xml:745
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:747
-#, no-c-format
+#: tutorial.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "지금 우리는 콜렉션을 초기화 시키는데 <emphasis>fetch</emphasis> 질의를 사용하"
 "지 않았다. 그러므로 콜렉션의 getter 메소드에 대한 호출은 콜렉션을 초기화 시키"
@@ -2089,21 +1910,19 @@
 "라."
 
 #. Tag: title
-#: tutorial.xml:757
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "Bi-directional associations"
 
 #. Tag: para
-#: tutorial.xml:759
-#, no-c-format
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "다음으로 우리는 양방향 연관을 매핑시킬 예정이다-개인과 이벤트 사이에 연관을 "
 "만드는 것은 Java에서 양 측들에서 동작한다. 물론 데이터베이스 스키마는 변경되"
@@ -2113,59 +1932,67 @@
 "고 검색될 수 있다."
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:882
 #, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr ""
 "먼저, 참여자들을 가진 한 개의 콜렉션을 <literal>Event</literal> Event 클래스"
 "에 추가시켜라:"
 
 #. Tag: programlisting
-#: tutorial.xml:771
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:773
-#, no-c-format
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr "이제 <literal>Event.hbm.xml</literal> 내에 연관의 이 쪽도 매핑하라."
 
 #. Tag: programlisting
-#: tutorial.xml:777
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:779
-#, no-c-format
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "당신이 볼 수 있듯이, 이것들은 두 매핑 문서들 내에서 정규 <literal>set</"
 "literal> 매핑들이다. <literal>key</literal>와 <literal>many-to-many</literal>"
@@ -2174,13 +2001,13 @@
 "내에 있는 <literal>inverse=\"true\"</literal> 속성이다."
 
 #. Tag: para
-#: tutorial.xml:787
-#, no-c-format
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "이것이 의미하는 바는 Hibernate가 둘 사이의 링크에 대한 정보를 알 필요가 있을 "
 "때 다른 측-<literal>Person</literal> 클래스-를 취할 것이라는 점이다. 일단 당"
@@ -2188,24 +2015,24 @@
 "해하기가 훨씬 더 쉬울 것이다."
 
 #. Tag: title
-#: tutorial.xml:796
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "양방향 링크들에 작업하기"
 
 #. Tag: para
-#: tutorial.xml:798
-#, no-c-format
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "첫 번째로 Hibernate가 정규 Java 의미론에 영향을 주지 않음을 염두에 두라. 우리"
 "는 단방향 예제에서 <literal>Person</literal>과 <literal>Event</literal> 사이"
@@ -2218,47 +2045,46 @@
 "것을 행하는 것을 결코 잊지 말아야 한다."
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:932
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"Many developers program defensively and create link management methods to "
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "많은 개발자들은 방비책을 프로그램하고 양 측들을 정확하게 설정하기 위한 하나"
 "의 링크 관리 메소드들을 생성시킨다. 예를 들면 <literal>Person</literal>에서 :"
 
 #. Tag: programlisting
-#: tutorial.xml:813
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:815
-#, no-c-format
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "콜렉션에 대한 get 및 set 메소드드은 이제 protected임을 인지하라 - 이것은 동일"
 "한 패키지 내에 있는 클래스들과 서브클래스들이 그 메소드들에 접근하는 것을 허"
@@ -2266,23 +2092,21 @@
 "금지시킨다. 당신은 다른 측 상에 있는 콜렉션에 대해 동일한 것을 행할 것이다."
 
 #. Tag: para
-#: tutorial.xml:822
-#, no-c-format
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "<literal>inverse</literal> 매핑 속성은 무엇인가? 당신의 경우, 그리고 Java의 "
 "경우, 한 개의 양방향 링크는 단순히 양 측들에 대한 참조들을 정확하게 설정하는 "
@@ -2298,25 +2122,19 @@
 "many 연관에서 그것은 many-측이어야 하고, many-to-many 연관에서 당신은 어느 측"
 "이든 선택할 수 있으며 차이점은 없다."
 
-#. Tag: para
-#: tutorial.xml:837
-#, no-c-format
-msgid "Let's turn this into a small web application."
-msgstr "Let's turn this into a small web application."
-
 #. Tag: title
-#: tutorial.xml:844
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "파트 3 - EventManager 웹 어플리케이션"
 
 #. Tag: para
-#: tutorial.xml:846
-#, no-c-format
+#: tutorial.xml:964
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2327,88 +2145,84 @@
 "열할 수 있고, 그것은 새로운 이벤트들을 입력하기 위한 HTML form을 제공한다."
 
 #. Tag: title
-#: tutorial.xml:854
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "기본 서블릿 작성하기"
 
 #. Tag: para
-#: tutorial.xml:856
-#, no-c-format
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
 msgstr ""
-"다음 장에서 우리는 Hibernate를 Tomcat 및 WebWork와 통합시킨다. "
-"<literal>EventManager</literal>는 우리의 성장하는 어플리케이션을 더이상 감당"
-"하지 못한다. 당신의 소스 디렉토리에서 <literal>events</literal> 패키지 내에 "
-"새로운 클래스를 생성시켜라:"
+"서블릿은 HTTP <literal>GET</literal> 요청들 만을 처리하므로, 우리가 구현하는 "
+"메소드는 <literal>doGet()</literal>이다:"
 
 #. Tag: programlisting
-#: tutorial.xml:861
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:863
-#, no-c-format
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"서블릿은 HTTP <literal>GET</literal> 요청들 만을 처리하므로, 우리가 구현하는 "
-"메소드는 <literal>doGet()</literal>이다:"
-
-#. Tag: programlisting
-#: tutorial.xml:868
-#, no-c-format
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: tutorial.xml:982
+#, no-c-format
+msgid ""
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
 #, fuzzy, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
 msgstr ""
 "우리가 여기서 적용하는 패턴은 <emphasis>session-per-request</emphasis>이다. "
 "하나의 요청이 서블릿에 도달할 때, 하나의 새로운 Hibernate <literal>Session</"
@@ -2419,7 +2233,7 @@
 "commit 모드를 사용하지 않는다)."
 
 #. Tag: para
-#: tutorial.xml:879
+#: tutorial.xml:996
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2434,27 +2248,27 @@
 "하라."
 
 #. Tag: para
-#: tutorial.xml:886
-#, no-c-format
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "다음으로, 요청의 가능한 액션들이 처리되고 응답 HTML이 렌더링된다. 우리는 곧"
 "장 그부분으로 갈 것이다."
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:1008
 #, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occured during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "마지막으로, 프로세싱과 렌더링이 완료될 때 작업 단위가 종료된다. 만일 어떤 문"
 "제가 프로세싱과 렌더링 동안에 발생될 경우, 하나의 예외상황이 던져질 것이고 데"
@@ -2466,59 +2280,64 @@
 "할 때 그것을 필요로 할 것이다."
 
 #. Tag: title
-#: tutorial.xml:905
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr "프로세싱과 렌더링"
 
 #. Tag: para
-#: tutorial.xml:907
-#, no-c-format
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr "요청의 처리와 페이지의 렌더링을 구현하자."
 
 #. Tag: programlisting
-#: tutorial.xml:911
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:913
+#: tutorial.xml:1030
 #, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr ""
 "Java와 HTML이 혼합된 이 코딩이 보다 복잡한 어플리케이션에서 기준이 될 수 없"
@@ -2529,22 +2348,24 @@
 "한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:922
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:924
+#: tutorial.xml:1041
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2554,37 +2375,37 @@
 "의 쓰레드에 결합된 Hibernate <literal>Session</literal>을 사용한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:930
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:932
+#: tutorial.xml:1049
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2596,31 +2417,32 @@
 "literal>을 사용한다:"
 
 #. Tag: programlisting
-#: tutorial.xml:938
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
-#, no-c-format
+#: tutorial.xml:1057
+#, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "즉 서블릿이 완성된다. 서블릿에 대한 요청은 하나의 단일 <literal>Session</"
 "literal>과 <literal>Transaction</literal> 내에서 처리될 것이다. 이전처럼 스탠"
@@ -2632,54 +2454,24 @@
 "키를 보라."
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "배치하기 그리고 테스트하기"
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1073
 #, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"이 어플리케이션을 배치하기 위해서 당신은 하나의 웹 아카이브, WAR를 생성시켜"
-"야 한다. 다음 Ant target을 당신의 <literal>build.xml</literal> 내에 추가하라:"
 
 #. Tag: programlisting
-#: tutorial.xml:961
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:963
-#, no-c-format
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"이 target은 당신의 프로젝트 디렉토리 내에 <literal>hibernate-tutorial.war</"
-"literal>로 명명된 하나의 파일을 생성시킨다. 그것은 당신의 프로젝트의 기본 디"
-"렉토리 내에 기대되는 모든 라이브러리들과 <literal>web.xml</literal> 디스크립"
-"터를 패키징한다:"
-
-#. Tag: programlisting
-#: tutorial.xml:969
-#, no-c-format
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -2689,7 +2481,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -2700,31 +2493,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:971
-#, no-c-format
+#: tutorial.xml:1081
+#, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"당신이 웹 어플리케이션을 컴파일하고 배치하기 전에, 하나의 부가적인 라이브러리"
-"가 필요함을 노트하라: <literal>jsdk.jar</literal>. 당신이 이미 이 라이브러리"
-"를 갖고 있지 않을 경우, 이것은 Java servlet development kit이며, Sun 웹 사이"
-"트로부터 그것을 얻어서 그것을 당신의 라이브러리 디렉토리에 복사하라. 하지만 "
-"그것은 오직 컴파일 시에만 사용될 것이고 WAR 패키지에서는 제외된다."
-
-#. Tag: para
-#: tutorial.xml:979
-#, no-c-format
-msgid ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
-msgstr ""
 "빌드하고 배치하기 위해 당신의 프로젝트 디렉토리 내에서 <literal>ant war</"
 "literal>를 호출하고 <literal>hibernate-tutorial.war</literal> 파일을 당신의 "
 "Tomcat <literal>webapp</literal> 디렉토리로 복사하라. 만일 당신이 Tomcat을 설"
@@ -2732,9 +2507,18 @@
 "을 배치하기 위해 임의의 Tomcat 구성을 변경하지 않아야 한다."
 
 #. Tag: para
-#: tutorial.xml:987
+#: tutorial.xml:1088
 #, no-c-format
 msgid ""
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:1096
+#, no-c-format
+msgid ""
 "Once deployed and Tomcat is running, access the application at "
 "<literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. "
 "Make sure you watch the Tomcat log to see Hibernate initialize when the "
@@ -2750,43 +2534,406 @@
 "록 하라."
 
 #. Tag: title
-#: tutorial.xml:1000
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr "요약"
 
 #. Tag: para
-#: tutorial.xml:1002
-#, no-c-format
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "이 튜토리얼은 간단한 스탠드얼론 Hibernate 어플리케이션과 하나의 작은 웹 어플"
 "리케이션을 작성하는 기초를 다루었다."
 
-#. Tag: para
-#: tutorial.xml:1007
-#, no-c-format
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"만일 당신이 이미 Hibernate에 자신이 있다고 느낀다면, 당신이 흥미를 찾는 주제"
-"들에 대한 참조 문서 목차를 계속 브라우징하라 - 가장 많이 요청되는 것은 트랜잭"
-"션 처리(<xref linkend=\"transactions\"/>), 페치 퍼포먼스(<xref linkend="
-"\"performance\"/>), 또는 API 사용법(<xref linkend=\"objectstate\"/>), 그리고 "
-"질의 특징들(<xref linkend=\"objectstate-querying\"/>)이다."
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Hibernate 개요"
 
-#. Tag: para
-#: tutorial.xml:1015
-#, no-c-format
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-"더 많은(특화된) 튜토리얼들에 대해서는 Hibernate 웹 사이트를 체크하는 것을 잊"
-"지 말라."
+#~ msgid "Preface"
+#~ msgstr "머리말"
+
+#~ msgid ""
+#~ "This chapter is an introductory tutorial for new users of Hibernate. We "
+#~ "start with a simple command line application using an in-memory database "
+#~ "and develop it in easy to understand steps."
+#~ msgstr ""
+#~ "이 장은 Hibernate 초심자를 위한 개론적인 튜토리얼이다. 우리는 메모리-내 데"
+#~ "이터베이스를 사용하는 간단한 명령 라인 어플리케이션으로 시작하고 단계들을 "
+#~ "이해하도록 쉽게 그것을 개발한다."
+
+#~ msgid ""
+#~ "This tutorial is intended for new users of Hibernate but requires Java "
+#~ "and SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-"
+#~ "party libraries we name are for JDK 1.4 and 5.0. You might need others "
+#~ "for JDK 1.3."
+#~ msgstr ""
+#~ "이 튜토리얼은 Hibernate 신규 사용자들을 의도하고 있지만 Java와 SQL 지식을 "
+#~ "필요로 한다. 그것은 Michael Gloegl이 작성한 튜토리얼에 기초하며, 우리가 명"
+#~ "명하는 제 3의 라이브러리들은 JDK 1.4와 5.0 버전용이다. 당신은 JDK1.3에 대"
+#~ "해 다른 라이브러리들을 필요로 할 수도 있다."
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "튜토리얼용 소스는 <literal>doc/reference/tutorial/</literal> 디렉토리 내"
+#~ "에 있는 배포본 내에 포함되어 있다."
+
+#~ msgid ""
+#~ "First, we'll create a simple console-based Hibernate application. We use "
+#~ "an Java database (HSQL DB), so we do not have to install any database "
+#~ "server."
+#~ msgstr ""
+#~ "먼저, 우리는 한 개의 간단한 콘솔-기반 Hibernate 어플리케이션을 생성시킬 것"
+#~ "이다. 우리는 메모리-내 데이터베이스(HSQL DB)를 사용하므로, 우리는 어떤 데"
+#~ "이터베이스 서버를 설치하지 않아도 된다."
+
+#~ msgid ""
+#~ "The first thing we do, is set up our development directory and put all "
+#~ "the Java libraries we need into it. Download the Hibernate distribution "
+#~ "from the Hibernate website. Extract the package and place all required "
+#~ "libraries found in <literal>/lib</literal> into into the <literal>/lib</"
+#~ "literal> directory of your new development working directory. It should "
+#~ "look like this:"
+#~ msgstr ""
+#~ "우리가 행할 첫 번째 것은 우리의 개발 디렉토리를 설정하고, 우리가 필요로 하"
+#~ "는 모든 Java 라이브러리들을 그것 속에 집어 넣는 것이다. Hibernate 웹 사이"
+#~ "트로부터 Hibernate 배포본을 내려 받아라. 패키지를 추출해내고 <literal>/"
+#~ "lib</literal> 속에서 발견되는 모든 필요한 라이브러리들을 당신의 새로운 개"
+#~ "발 작업 디렉토리의 <literal>/lib</literal> 디렉토리 속에 위치지워라. 그것"
+#~ "은 다음과 같을 것이다:"
+
+#~ msgid ""
+#~ "This is the minimum set of required libraries (note that we also copied "
+#~ "hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
+#~ "writing</emphasis>. The Hibernate release you are using might require "
+#~ "more or less libraries. See the <literal>README.txt</literal> file in the "
+#~ "<literal>lib/</literal> directory of the Hibernate distribution for more "
+#~ "information about required and optional third-party libraries. (Actually, "
+#~ "Log4j is not required but preferred by many developers.)"
+#~ msgstr ""
+#~ "이것은 <emphasis>글의 작성 시점에서</emphasis> Hibernate에 필수적인 최소한"
+#~ "의 세트이다(우리는 또한 메인 아카이브인 hibernate3.jar를 복사했음을 노트하"
+#~ "라). 당신이 사용 중인 Hibernate 배포본이 더 많거나 보다 적은 라이브러리들"
+#~ "을 필요로 할 수도 있다. 필수 라이브러리들과 선택적인 제3의 라이브러리들에 "
+#~ "대한 추가 정보는 Hibernate 배포본의 <literal>lib/</literal> 디렉토리 내에 "
+#~ "있는 <literal>README.txt</literal> 파일을 보라. (실제로, Log4j는 필수는 아"
+#~ "니지만 많은 개발자들에 의해 선호된다.)"
+
+#~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "우리의 첫 번째 영속 클래스는 몇몇 프로퍼티들을 가진 간단한 자바빈즈 클래스"
+#~ "이다:"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "이 Java 소스 파일을 개발 폴더 내의 <literal>src</literal>로 명명된 디렉토"
+#~ "리 속에 있는 위치지워라. 이제 그 디렉토리는 다음과 같을 것이다:"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr ""
+#~ "다음 단계에서, 우리는 Hiberante에게 이 영속 클래스에 대해 알려 준다."
+
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifer "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "<literal>id</literal> 요소는 식별자 프로퍼티의 선언이고, <literal>name="
+#~ "\"id\"</literal>는 Java 프로퍼티의 이름을 선언한다 - Hibernate는 그 프로퍼"
+#~ "티에 접근하는데 getter 및 setter 메소드들을 사용할 것이다. column 속성은 "
+#~ "우리가 <literal>EVENTS</literal> 테이블의 어느 컬럼을 이 프라이머리 키로 "
+#~ "사용하는지를 Hibernate에게 알려준다. 내포된 <literal>generator</literal> "
+#~ "요소는 식별자 생성 방도를 지정하며, 이 경우에 우리는 <literal>increment</"
+#~ "literal>를 사용했고, 그것은 대개 테스팅(과 튜토리얼들)에 유용한 매우 간단"
+#~ "한 메모리-내 숫자 증가 방법이다. Hibernate는 또한 전역적으로 유일한 데이터"
+#~ "베이스에 의해 생성된 식별자 뿐만 아니라 어플리케이션에 의해 할당된 식별자"
+#~ "(또는 당신이 확장으로 작성한 어떤 방도)를 지원한다."
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "다음 매핑 파일은 <literal>Event</literal> Java 클래스 소스 파일과 같은 디"
+#~ "렉토리 속에 <literal>Event.hbm.xml</literal>로서 저장될 것이다. 매핑 파일"
+#~ "들에 대한 네이밍은 임의적일 수 있지만, 접미사 <literal>hbm.xml</literal>"
+#~ "은 Hibernate 개발자 공동체 내에서 컨벤션이 되었다. 디렉토리 구조는 이제 다"
+#~ "음과 같을 것이다:"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "우리는 Hibernate의 메인 구성을 계속 행한다."
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "우리는 이제 적절한 곳에 한 개의 영속 클래스와 그것의 매핑 파일을 갖고 있"
+#~ "다. Hibernate를 구성할 차례이다. 우리가 이것을 행하기 전에, 우리는 데이터"
+#~ "베이스를 필요로 할 것이다. 자바 기반의 메모리-내 SQL DBMS인 HSQL DB는 "
+#~ "HSQL DB 웹 사이트에서 내려받을 수 있다. 실제로, 당신은 이 다운로드에서 오"
+#~ "직 <literal>hsqldb.jar</literal> 만을 필요로 한다. 개발 폴더의 "
+#~ "<literal>lib/</literal> 디렉토리 속에 이 파일을 위치지워라."
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "Hibernate는 당신의 어플리케이션 내에서 이 데이터베이스에 연결하는 계층이"
+#~ "고, 따라서 그것은 커넥션 정보를 필요로 한다. 커넥션들은 마찬가지로 구성되"
+#~ "어야 하는 하나의 JDBC 커넥션 풀을 통해 행해진다. Hibernate 배포본은 몇몇 "
+#~ "오픈 소스 JDBC 커넥션 풀링 도구들을 포함하고 있지만, 이 튜토리얼에서는 "
+#~ "Hibernate에 의해 미리 빌드된 커넥션 풀링을 사용할 것이다. 당신이 필수 라이"
+#~ "브러리를 당신의 classpath 속에 복사해야 하고 만일 당신이 제품-특징의 제3"
+#~ "의 JDBC 풀링 소프트웨어를 사용하고자 원할 경우에는 다른 커넥션 풀링 설정들"
+#~ "을 사용해야 함을 노트하라."
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "이 파일을 소스 디렉토리 속으로 복사하고, 따라서 그것은 classpath의 루트에"
+#~ "서 끝날 것이다. Hibernate는 시작 시에 classpath의 루트에서 "
+#~ "<literal>hibernate.cfg.xml</literal>로 명명된 파일을 자동적으로 찾는다."
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "우리는 이제 Ant로 튜토리얼을 빌드할 것이다. 당신은 Ant를 설치할 필요가 있"
+#~ "을 것이다 - <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant 내려"
+#~ "받기 페이지</ulink>에서 Ant를 얻어라. Ant를 설치하는 방법은 여기서 다루지 "
+#~ "않을 것이다. <ulink url=\"http://ant.apache.org/manual/index.html\">Ant 매"
+#~ "뉴얼</ulink>을 참조하길 바란다. 당신이 Ant를 설치한 후에, 우리는 빌드파일 "
+#~ "생성을 시작할 수 있다. 그것은 <literal>build.xml</literal>로 명명되고 개"
+#~ "발 디렉토리 속에 직접 위치될 것이다."
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "기본 빌드 파일은 다음과 같다:"
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr ""
+#~ "이것은 <literal>.jar</literal>로 끝나는 lib 디렉토리 내에 있는 모든 파일들"
+#~ "을 컴파일에 사용되는 classpath에 추가하도록 Ant에게 알려줄 것이다. 그것은 "
+#~ "또한 모든 비-Java 소스 파일들을 대상 디렉토리로 복사할 것이다. 예를 들면, "
+#~ "구성 및 Hibernate 매핑 파일들. 만일 당신이 Ant를 이제 실행할 경우, 당신은 "
+#~ "다음 출력을 얻게 될 것이다:"
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "개발 소스 디렉토리 속에 <literal>HibernateUtil.java</literal> 를 위치지우"
+#~ "고, 다음으로 <literal>Event.java</literal>를 위치지워라:"
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "이 첫 번째 루틴을 실행하기 위해서 우리는 호출 가능한 대상을 Ant 빌드 파일"
+#~ "에 추가해야 한다:"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "<literal>action</literal> 아규먼트의 값은 대상을 호출할 때 명령 라인 상에"
+#~ "서 설정된다:"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "이것은 Hibernate에 의해 실행된 <literal>INSERT</literal>이고, 물음표 기호"
+#~ "는 JDBC 바인드 파라미터들을 나타낸다. 아규먼트로서 바인드 된 값들을 보거"
+#~ "나 장황한 로그를 줄이려면 당신의 <literal>log4j.properties</literal>를 체"
+#~ "크하라."
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr "이제 이 모든 것을 실행하고 테스트하기 위해, 다음 단계들을 따르라:"
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr ""
+#~ "데이터베이스 속으로 어떤 것을 저장하고 물론 앞서 hbm2ddl을 통해 데이터베이"
+#~ "스 스키마를 산출시키기 위해 <literal>ant run -Daction=store</literal>를 실"
+#~ "행하라."
+
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "이제 당신의 <literal>hibernate.cfg.xml</literal> 파일 속에서 그 프로퍼티"
+#~ "를 주석처리함으로써 hbm2ddl을 사용불가능하게 하라. 대개 당신은 지속되는 단"
+#~ "위 테스팅에서는 그것을 사용 가능하게 내버려두어도 되지만, 또 다른 hbm2ddl"
+#~ "의 실행은 당신이 저장했던 모든 것을 <emphasis>drop</emphasis>시킬 것이다 "
+#~ "- <literal>create</literal> 구성 설정은 실제로 \"스키마로부터 모든 테이블"
+#~ "들을 드롭시키고 나서, SessionFactory가 빌드될 때 모든 테이블들을 다시 생성"
+#~ "시키는 것\"으로 변환된다."
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "만일 당신이 지금 <literal>-Daction=list</literal>로 Ant를 호출할 경우, 당"
+#~ "신은 당신이 지금까지 저장했던 이벤트들을 보게 될 것이다. 물론 당신은 또한 "
+#~ "여러 번 <literal>store</literal> 액션을 호출할 수 있다."
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "노트 : 대부분의 Hibernate 사용자들은 이 지점에서 실패하고 우리는 정기적으"
+#~ "로 <emphasis>Table not found</emphasis> 오류 메시지들에 관한 질문을 받는"
+#~ "다. 하지만 만일 당신이 위에 조명된 단게들을 따를 경우 당신은 이 문제를 겪"
+#~ "지 않을 것이고, hbm2ddl이 처음 실행 시에 데이터베이스 스키마를 생성시키므"
+#~ "로, 차후의 어플리케이션 재시작은 이 스키마를 사용할 것이다. 만일 당신이 매"
+#~ "핑 그리고/또는 데이터베이스 스키마를 변경할 경우에, 당신은 다시 한번 더 "
+#~ "hbm2ddl을 이용 가능하도록 해야 한다."
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "<literal>Person.hbm.xml</literal>로 명명되는 새로운 매핑 파일을 생성시켜"
+#~ "라 (맨위에 DTD 참조를 잊지말라):"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr ""
+#~ "우리는 하나의 <literal>Set</literal>으로 구현된, 하나의 단방향, 다중값 연"
+#~ "관들을 필요로 한다. Java 클래스들 내에 이를 위한 코드를 작성하고 그런 다"
+#~ "음 그것을 매핑시키자:"
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "우리는 값 타입의 객체들을 가진 한 개의 콜렉션을 <literal>Person</literal> "
+#~ "엔티티에 추가시킨다. 우리는 email 주소를 저장하고자 원하므로, 우리가 사용"
+#~ "하는 타입은 <literal>String</literal>이고, 그 콜렉션은 다시 한 개의 "
+#~ "<literal>Set</literal>이다:"
+
+#~ msgid "Let's turn this into a small web application."
+#~ msgstr "Let's turn this into a small web application."
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr ""
+#~ "다음 장에서 우리는 Hibernate를 Tomcat 및 WebWork와 통합시킨다. "
+#~ "<literal>EventManager</literal>는 우리의 성장하는 어플리케이션을 더이상 감"
+#~ "당하지 못한다. 당신의 소스 디렉토리에서 <literal>events</literal> 패키지 "
+#~ "내에 새로운 클래스를 생성시켜라:"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "이 어플리케이션을 배치하기 위해서 당신은 하나의 웹 아카이브, WAR를 생성시"
+#~ "켜야 한다. 다음 Ant target을 당신의 <literal>build.xml</literal> 내에 추가"
+#~ "하라:"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "이 target은 당신의 프로젝트 디렉토리 내에 <literal>hibernate-tutorial."
+#~ "war</literal>로 명명된 하나의 파일을 생성시킨다. 그것은 당신의 프로젝트의 "
+#~ "기본 디렉토리 내에 기대되는 모든 라이브러리들과 <literal>web.xml</"
+#~ "literal> 디스크립터를 패키징한다:"
+
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+#~ msgstr ""
+#~ "당신이 웹 어플리케이션을 컴파일하고 배치하기 전에, 하나의 부가적인 라이브"
+#~ "러리가 필요함을 노트하라: <literal>jsdk.jar</literal>. 당신이 이미 이 라이"
+#~ "브러리를 갖고 있지 않을 경우, 이것은 Java servlet development kit이며, "
+#~ "Sun 웹 사이트로부터 그것을 얻어서 그것을 당신의 라이브러리 디렉토리에 복사"
+#~ "하라. 하지만 그것은 오직 컴파일 시에만 사용될 것이고 WAR 패키지에서는 제외"
+#~ "된다."
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "만일 당신이 이미 Hibernate에 자신이 있다고 느낀다면, 당신이 흥미를 찾는 주"
+#~ "제들에 대한 참조 문서 목차를 계속 브라우징하라 - 가장 많이 요청되는 것은 "
+#~ "트랜잭션 처리(<xref linkend=\"transactions\"/>), 페치 퍼포먼스(<xref "
+#~ "linkend=\"performance\"/>), 또는 API 사용법(<xref linkend=\"objectstate\"/"
+#~ ">), 그리고 질의 특징들(<xref linkend=\"objectstate-querying\"/>)이다."
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr ""
+#~ "더 많은(특화된) 튜토리얼들에 대해서는 Hibernate 웹 사이트를 체크하는 것을 "
+#~ "잊지 말라."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
+#: xml.xml:29
 #, no-c-format
 msgid "XML Mapping"
 msgstr "XML 매핑"
 
 #. Tag: emphasis
-#: xml.xml:7
-#, no-c-format
+#: xml.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr ""
 "이것은 Hibernate3.0에서 실험적인 특징이고 매우 활동적으로 개발 중에 있음을 노"
 "트하라."
 
 #. Tag: title
-#: xml.xml:13
+#: xml.xml:37
 #, no-c-format
 msgid "Working with XML data"
 msgstr "XML 데이터로 작업하기"
 
 #. Tag: para
-#: xml.xml:15
-#, no-c-format
+#: xml.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "Hibernate는 당신이 영속 POJO들로 작업하는 것과 아주 동일한 방법으로 영속 XML "
 "데이터에 작업하도록 해준다. 파싱된 XML 트리는 단지 객체 레벨에서 관계형 데이"
@@ -48,7 +48,7 @@
 "수 있다."
 
 #. Tag: para
-#: xml.xml:22
+#: xml.xml:46
 #, no-c-format
 msgid ""
 "Hibernate supports dom4j as API for manipulating XML trees. You can write "
@@ -68,7 +68,7 @@
 "literal>(merging(병합)은 아직 지원되지 않는다)."
 
 #. Tag: para
-#: xml.xml:32
+#: xml.xml:56
 #, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
@@ -78,31 +78,31 @@
 "통한 엔티티 데이터의 구체화를 포함하는 많은 어플리케이션들을 갖는다."
 
 #. Tag: para
-#: xml.xml:37
-#, no-c-format
+#: xml.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "하나의 매핑은 클래스들의 프로퍼티들과 XML 문서의 노드들을 데이터베이스로 동시"
 "에 매핑시키는데 사용될 수 있거나, 만일 매핑할 클래스가 존재하지 않을 경우, 그"
 "것은 단지 XML을 매핑시키는데 사용될 수도 있다."
 
 #. Tag: title
-#: xml.xml:44
+#: xml.xml:68
 #, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr "XML과 클래스 매핑을 함께 지정하기"
 
 #. Tag: para
-#: xml.xml:46
+#: xml.xml:70
 #, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr "다음은 POJO와 XML을 동시에 매핑시키는 예제이다 :"
 
 #. Tag: programlisting
-#: xml.xml:50
+#: xml.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Account\" \n"
@@ -128,19 +128,19 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:54
+#: xml.xml:78
 #, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr "XML 매핑만을 지정하기"
 
 #. Tag: para
-#: xml.xml:56
+#: xml.xml:80
 #, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr "다음은 POJO 클래스가 존재하지 않는 예제이다:"
 
 #. Tag: programlisting
-#: xml.xml:60
+#: xml.xml:84
 #, no-c-format
 msgid ""
 "<![CDATA[<class entity-name=\"Account\" \n"
@@ -169,12 +169,12 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:62
-#, no-c-format
+#: xml.xml:86
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "이 매핑은 dom4j 트리로서 또는 프로퍼티 name/value 쌍들(java <literal>Map</"
 "literal>들)의 그래프로서 데이터에 접근하는 것을 당신에게 허용해준다. 프로퍼"
@@ -182,17 +182,17 @@
 "다."
 
 #. Tag: title
-#: xml.xml:73
+#: xml.xml:97
 #, no-c-format
 msgid "XML mapping metadata"
 msgstr "XML 매핑 메타데이터"
 
 #. Tag: para
-#: xml.xml:75
-#, no-c-format
+#: xml.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -201,37 +201,37 @@
 "하도록 한다. <literal>node</literal> 속성의 포맷은 다음 중 하나이어야 한다:"
 
 #. Tag: para
-#: xml.xml:84
-#, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#: xml.xml:108
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr "<literal>\"element-name\"</literal> - 명명된 XML 요소로 매핑시킨다"
 
 #. Tag: para
-#: xml.xml:87
-#, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#: xml.xml:111
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 "<literal>\"@attribute-name\"</literal> - 명명된 XML 속성으로 매핑시킨다"
 
 #. Tag: para
-#: xml.xml:90
-#, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+#: xml.xml:114
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - 부모 요소로 매핑 시킨다"
 
 #. Tag: para
-#: xml.xml:93
-#, no-c-format
+#: xml.xml:117
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - 명명된 요소의 명명된 속"
 "성으로 매핑시킨다"
 
 #. Tag: para
-#: xml.xml:100
-#, no-c-format
+#: xml.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -239,7 +239,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "콜렉션들과 단일 값 콜렉션들의 경우, 추가적인 <literal>embed-xml</literal> 속"
 "성이 존재한다. 만일 <literal>embed-xml=\"true\"</literal> 일 경우, 연관된 엔"
@@ -249,18 +249,18 @@
 "인트 연관들에 대해 나타날 것이고 콜렉션들은 단순히 전혀 나타나지 않을 것이다."
 
 #. Tag: para
-#: xml.xml:110
-#, no-c-format
+#: xml.xml:134
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "당신은 너무 많은 연관들에 대해 <literal>embed-xml=\"true\"</literal>로 남겨두"
 "지 말도록 주의해야 한다. 왜냐하면 XML이 순환적으로 잘 처리하지 못하기 때문이"
 "다!"
 
 #. Tag: programlisting
-#: xml.xml:115
+#: xml.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
@@ -300,17 +300,17 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:117
-#, no-c-format
+#: xml.xml:141
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "이 경우에, 우리는 실제 account 데이터가 아닌, account id들을 가진 콜렉션을 삽"
 "입시키기로 결정했다. 다음 HQL 질의:"
 
 #. Tag: programlisting
-#: xml.xml:122
+#: xml.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[from Customer c left join fetch c.accounts where c.lastName like :"
@@ -318,13 +318,13 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:124
-#, no-c-format
-msgid "Would return datasets such as this:"
+#: xml.xml:148
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "는 다음과 같은 데이터셋들을 반환할 것이다:"
 
 #. Tag: programlisting
-#: xml.xml:128
+#: xml.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -340,7 +340,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:130
+#: xml.xml:154
 #, no-c-format
 msgid ""
 "If you set <literal>embed-xml=\"true\"</literal> on the <literal>&lt;one-to-"
@@ -351,7 +351,7 @@
 "일 수도 있다:"
 
 #. Tag: programlisting
-#: xml.xml:135
+#: xml.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -373,23 +373,23 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:141
+#: xml.xml:165
 #, no-c-format
 msgid "Manipulating XML data"
 msgstr "XML 데이터 처리하기"
 
 #. Tag: para
-#: xml.xml:143
-#, no-c-format
+#: xml.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "우리의 어플리케이션 내에서 XML 문서들을 다시 읽어들이고 업데이트 시키자. 우리"
 "는 dom4j 세션을 얻어서 이것을 행한다:"
 
 #. Tag: programlisting
-#: xml.xml:148
+#: xml.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
@@ -413,7 +413,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: xml.xml:150
+#: xml.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
@@ -435,12 +435,11 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:152
-#, no-c-format
+#: xml.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "XML 기반의 데이터 가져오기/내보내기를 구현하는데 이 특징과 Hibernate의 "
 "<literal>replicate()</literal> 오퍼레이션을 결합시키는 것이 매우 유용하다."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Reference.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: application/x-xml2pot; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
+msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
+msgstr ""
+
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
+msgid "Hibernate Reference Documentation"
+msgstr ""
+
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
+msgid "&copyrightHolder;"
+msgstr ""
+

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -29,294 +29,300 @@
 #. Tag: para
 #: architecture.xml:35
 #, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+msgid "The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr ""
 
 #. Tag: para
 #: architecture.xml:48
 #, no-c-format
-msgid "This diagram shows Hibernate using the database and configuration data to provide persistence services (and persistent objects) to the application."
+msgid "We do not have the scope in this document to provide a more detailed view of all the runtime architectures available; Hibernate is flexible and supports several different approaches. We will, however, show the two extremes: \"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:53
+#: architecture.xml:54
 #, no-c-format
-msgid "We would like to show a more detailed view of the runtime architecture. Unfortunately, Hibernate is flexible and supports several approaches. We will show the two extremes. The \"lite\" architecture has the application provide its own JDBC connections and manage its own transactions. This approach uses a minimal subset of Hibernate's APIs:"
+msgid "This next diagram illustrates how Hibernate utilizes database and configuration data to provide persistence services, and persistent objects, to the application."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:70
+#: architecture.xml:59
 #, no-c-format
-msgid "The \"full cream\" architecture abstracts the application away from the underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+msgid "The \"minimal\" architecture has the application provide its own JDBC connections and manage its own transactions. This approach uses a minimal subset of Hibernate's APIs:"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:84
+#: architecture.xml:74
 #, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "The \"comprehensive\" architecture abstracts the application away from the underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 
+#. Tag: para
+#: architecture.xml:88
+#, no-c-format
+msgid "Here are some definitions of the objects depicted in the diagrams:"
+msgstr ""
+
 #. Tag: term
-#: architecture.xml:89
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:91
+#: architecture.xml:95
 #, no-c-format
-msgid "A threadsafe (immutable) cache of compiled mappings for a single database. A factory for <literal>Session</literal> and a client of <literal>ConnectionProvider</literal>. Might hold an optional (second-level) cache of data that is reusable between transactions, at a process- or cluster-level."
+msgid "A threadsafe, immutable cache of compiled mappings for a single database. A factory for <literal>Session</literal> and a client of <literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can hold an optional (second-level) cache of data that is reusable between transactions at a process, or cluster, level."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:101
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:103
+#: architecture.xml:107
 #, no-c-format
-msgid "A single-threaded, short-lived object representing a conversation between the application and the persistent store. Wraps a JDBC connection. Factory for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of persistent objects, used when navigating the object graph or looking up objects by identifier."
+msgid "A single-threaded, short-lived object representing a conversation between the application and the persistent store. It wraps a JDBC connection and is a factory for <literal>Transaction</literal>. <literal>Session</literal> holds a mandatory first-level cache of persistent objects that are used when navigating the object graph or looking up objects by identifier."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:113
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:115
+#: architecture.xml:119
 #, no-c-format
-msgid "Short-lived, single threaded objects containing persistent state and business function. These might be ordinary JavaBeans/POJOs, the only special thing about them is that they are currently associated with (exactly one) <literal>Session</literal>. As soon as the <literal>Session</literal> is closed, they will be detached and free to use in any application layer (e.g. directly as data transfer objects to and from presentation)."
+msgid "Short-lived, single threaded objects containing persistent state and business function. These can be ordinary JavaBeans/POJOs. They are associated with exactly one <literal>Session</literal>. Once the <literal>Session</literal> is closed, they will be detached and free to use in any application layer (for example, directly as data transfer objects to and from presentation)."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:126
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:128
+#: architecture.xml:131
 #, no-c-format
-msgid "Instances of persistent classes that are not currently associated with a <literal>Session</literal>. They may have been instantiated by the application and not (yet) persisted or they may have been instantiated by a closed <literal>Session</literal>."
+msgid "Instances of persistent classes that are not currently associated with a <literal>Session</literal>. They may have been instantiated by the application and not yet persisted, or they may have been instantiated by a closed <literal>Session</literal>."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:137
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:139
+#: architecture.xml:142
 #, no-c-format
-msgid "(Optional) A single-threaded, short-lived object used by the application to specify atomic units of work. Abstracts application from underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> might span several <literal>Transaction</literal>s in some cases. However, transaction demarcation, either using the underlying API or <literal>Transaction</literal>, is never optional!"
+msgid "(Optional) A single-threaded, short-lived object used by the application to specify atomic units of work. It abstracts the application from the underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> might span several <literal>Transaction</literal>s in some cases. However, transaction demarcation, either using the underlying API or <literal>Transaction</literal>, is never optional."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:150
+#: architecture.xml:153
 #, no-c-format
 msgid "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</literal>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:152
+#: architecture.xml:155
 #, no-c-format
-msgid "(Optional) A factory for (and pool of) JDBC connections. Abstracts application from underlying <literal>Datasource</literal> or <literal>DriverManager</literal>. Not exposed to application, but can be extended/implemented by the developer."
+msgid "(Optional) A factory for, and pool of, JDBC connections. It abstracts the application from underlying <literal>Datasource</literal> or <literal>DriverManager</literal>. It is not exposed to application, but it can be extended and/or implemented by the developer."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:160
+#: architecture.xml:163
 #, no-c-format
 msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:162
+#: architecture.xml:165
 #, no-c-format
-msgid "(Optional) A factory for <literal>Transaction</literal> instances. Not exposed to the application, but can be extended/implemented by the developer."
+msgid "(Optional) A factory for <literal>Transaction</literal> instances. It is not exposed to the application, but it can be extended and/or implemented by the developer."
 msgstr ""
 
 #. Tag: emphasis
-#: architecture.xml:169
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:171
+#: architecture.xml:174
 #, no-c-format
-msgid "Hibernate offers many optional extension interfaces you can implement to customize the behavior of your persistence layer. See the API documentation for details."
+msgid "Hibernate offers a range of optional extension interfaces you can implement to customize the behavior of your persistence layer. See the API documentation for details."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:180
+#: architecture.xml:183
 #, no-c-format
-msgid "Given a \"lite\" architecture, the application bypasses the <literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or <literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+msgid "Given a \"minimal\" architecture, the application bypasses the <literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or <literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC directly."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:188
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:189
+#: architecture.xml:192
 #, no-c-format
-msgid "An instance of a persistent classes may be in one of three different states, which are defined with respect to a <emphasis>persistence context</emphasis>. The Hibernate <literal>Session</literal> object is the persistence context:"
+msgid "An instance of a persistent class can be in one of three different states. These states are defined in relation to a <emphasis>persistence context</emphasis>. The Hibernate <literal>Session</literal> object is the persistence context. The three different states are as follows:"
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:197
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:199
+#: architecture.xml:202
 #, no-c-format
-msgid "The instance is not, and has never been associated with any persistence context. It has no persistent identity (primary key value)."
+msgid "The instance is not associated with any persistence context. It has no persistent identity or primary key value."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:207
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:209
+#: architecture.xml:212
 #, no-c-format
-msgid "The instance is currently associated with a persistence context. It has a persistent identity (primary key value) and, perhaps, a corresponding row in the database. For a particular persistence context, Hibernate <emphasis>guarantees</emphasis> that persistent identity is equivalent to Java identity (in-memory location of the object)."
+msgid "The instance is currently associated with a persistence context. It has a persistent identity (primary key value) and can have a corresponding row in the database. For a particular persistence context, Hibernate <emphasis>guarantees</emphasis> that persistent identity is equivalent to Java identity in relation to the in-memory location of the object."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:221
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:223
+#: architecture.xml:226
 #, no-c-format
-msgid "The instance was once associated with a persistence context, but that context was closed, or the instance was serialized to another process. It has a persistent identity and, perhaps, a corresponding row in the database. For detached instances, Hibernate makes no guarantees about the relationship between persistent identity and Java identity."
+msgid "The instance was once associated with a persistence context, but that context was closed, or the instance was serialized to another process. It has a persistent identity and can have a corresponding row in the database. For detached instances, Hibernate does not guarantee the relationship between persistent identity and Java identity."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:238
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:240
+#: architecture.xml:243
 #, no-c-format
-msgid "JMX is the J2EE standard for management of Java components. Hibernate may be managed via a JMX standard service. We provide an MBean implementation in the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+msgid "JMX is the J2EE standard for the management of Java components. Hibernate can be managed via a JMX standard service. AN MBean implementation is provided in the distribution: <literal>org.hibernate.jmx.HibernateService</literal>."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:246
+#: architecture.xml:249
 #, no-c-format
-msgid "For an example how to deploy Hibernate as a JMX service on the JBoss Application Server, please see the JBoss User Guide. On JBoss AS, you also get these benefits if you deploy using JMX:"
+msgid "For an example of how to deploy Hibernate as a JMX service on the JBoss Application Server, please see the JBoss User Guide. JBoss AS also provides these benefits if you deploy using JMX:"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:254
+#: architecture.xml:257
 #, no-c-format
-msgid "<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</literal>'s life cycle can be automatically bound to the scope of a JTA transaction. This means you no longer have to manually open and close the <literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. You also don't have to worry about transaction demarcation in your code anymore (unless you'd like to write a portable persistence layer of course, use the optional Hibernate <literal>Transaction</literal> API for this). You call the <literal>HibernateContext</literal> to access a <literal>Session</literal>."
+msgid "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</literal>'s life cycle can be automatically bound to the scope of a JTA transaction. This means that you no longer have to manually open and close the <literal>Session</literal>; this becomes the job of a JBoss EJB interceptor. You also do not have to worry about transaction demarcation in your code (if you would like to write a portable persistence layer use the optional Hibernate <literal>Transaction</literal> API for this). You call the <literal>HibernateContext</literal> to access a <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:266
+#: architecture.xml:269
 #, no-c-format
-msgid "<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX service using a JBoss service deployment descriptor (in an EAR and/or SAR file), it supports all the usual configuration options of a Hibernate <literal>SessionFactory</literal>. However, you still have to name all your mapping files in the deployment descriptor. If you decide to use the optional HAR deployment, JBoss will automatically detect all mapping files in your HAR file."
+msgid "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed using a JBoss service deployment descriptor in an EAR and/or SAR file, as it supports all the usual configuration options of a Hibernate <literal>SessionFactory</literal>. However, you still need to name all your mapping files in the deployment descriptor. If you use the optional HAR deployment, JBoss will automatically detect all mapping files in your HAR file."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:277
+#: architecture.xml:280
 #, no-c-format
 msgid "Consult the JBoss AS user guide for more information about these options."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:281
+#: architecture.xml:284
 #, no-c-format
-msgid "Another feature available as a JMX service are runtime Hibernate statistics. See <xref linkend=\"configuration-optional-statistics\"/>."
+msgid "Another feature available as a JMX service is runtime Hibernate statistics. See <xref linkend=\"configuration-optional-statistics\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:288
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:289
+#: architecture.xml:292
 #, no-c-format
-msgid "Hibernate may also be configured as a JCA connector. Please see the website for more details. Please note that Hibernate JCA support is still considered experimental."
+msgid "Hibernate can also be configured as a JCA connector. Please see the website for more information. Please note, however, that at this stage Hibernate JCA support is under development."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:296
+#: architecture.xml:299
 #, no-c-format
-msgid "Contextual Sessions"
+msgid "Contextual sessions"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:297
+#: architecture.xml:300
 #, no-c-format
-msgid "Most applications using Hibernate need some form of \"contextual\" sessions, where a given session is in effect throughout the scope of a given context. However, across applications the definition of what constitutes a context is typically different; and different contexts define different scopes to the notion of current. Applications using Hibernate prior to version 3.0 tended to utilize either home-grown <literal>ThreadLocal</literal>-based contextual sessions, helper classes such as <literal>HibernateUtil</literal>, or utilized third-party frameworks (such as Spring or Pico) which provided proxy/interception-based contextual sessions."
+msgid "Most applications using Hibernate need some form of \"contextual\" session, where a given session is in effect throughout the scope of a given context. However, across applications the definition of what constitutes a context is typically different; different contexts define different scopes to the notion of current. Applications using Hibernate prior to version 3.0 tended to utilize either home-grown <literal>ThreadLocal</literal>-based contextual sessions, helper classes such as <literal>HibernateUtil</literal>, or utilized third-party frameworks, such as Spring or Pico, which provided proxy/interception-based contextual sessions."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:306
+#: architecture.xml:309
 #, no-c-format
-msgid "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory.getCurrentSession()</literal> method. Initially, this assumed usage of <literal>JTA</literal> transactions, where the <literal>JTA</literal> transaction defined both the scope and context of a current session. The Hibernate team maintains that, given the maturity of the numerous stand-alone <literal>JTA TransactionManager</literal> implementations out there, most (if not all) applications should be using <literal>JTA</literal> transaction management whether or not they are deployed into a <literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-based contextual sessions is all you should ever need to use."
+msgid "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory.getCurrentSession()</literal> method. Initially, this assumed usage of <literal>JTA</literal> transactions, where the <literal>JTA</literal> transaction defined both the scope and context of a current session. Given the maturity of the numerous stand-alone <literal>JTA TransactionManager</literal> implementations, most, if not all, applications should be using <literal>JTA</literal> transaction management, whether or not they are deployed into a <literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:316
+#: architecture.xml:319
 #, no-c-format
-msgid "However, as of version 3.1, the processing behind <literal>SessionFactory.getCurrentSession()</literal> is now pluggable. To that end, a new extension interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) and a new configuration parameter (<literal>hibernate.current_session_context_class</literal>) have been added to allow pluggability of the scope and context of defining current sessions."
+msgid "However, as of version 3.1, the processing behind <literal>SessionFactory.getCurrentSession()</literal> is now pluggable. To that end, a new extension interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, and a new configuration parameter, <literal>hibernate.current_session_context_class</literal>, have been added to allow pluggability of the scope and context of defining current sessions."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:323
+#: architecture.xml:326
 #, no-c-format
-msgid "See the Javadocs for the <literal>org.hibernate.context.CurrentSessionContext</literal> interface for a detailed discussion of its contract. It defines a single method, <literal>currentSession()</literal>, by which the implementation is responsible for tracking the current contextual session. Out-of-the-box, Hibernate comes with three implementations of this interface."
+msgid "See the Javadocs for the <literal>org.hibernate.context.CurrentSessionContext</literal> interface for a detailed discussion of its contract. It defines a single method, <literal>currentSession()</literal>, by which the implementation is responsible for tracking the current contextual session. Out-of-the-box, Hibernate comes with three implementations of this interface:"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:333
+#: architecture.xml:336
 #, no-c-format
-msgid "<literal>org.hibernate.context.JTASessionContext</literal> - current sessions are tracked and scoped by a <literal>JTA</literal> transaction. The processing here is exactly the same as in the older JTA-only approach. See the Javadocs for details."
+msgid "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions are tracked and scoped by a <literal>JTA</literal> transaction. The processing here is exactly the same as in the older JTA-only approach. See the Javadocs for details."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:341
+#: architecture.xml:344
 #, no-c-format
-msgid "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current sessions are tracked by thread of execution. Again, see the Javadocs for details."
+msgid "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:347
+#: architecture.xml:350
 #, no-c-format
-msgid "<literal>org.hibernate.context.ManagedSessionContext</literal> - current sessions are tracked by thread of execution. However, you are responsible to bind and unbind a <literal>Session</literal> instance with static methods on this class, it does never open, flush, or close a <literal>Session</literal>."
+msgid "<literal>org.hibernate.context.ManagedSessionContext</literal>: current sessions are tracked by thread of execution. However, you are responsible to bind and unbind a <literal>Session</literal> instance with static methods on this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:356
+#: architecture.xml:359
 #, no-c-format
-msgid "The first two implementations provide a \"one session - one database transaction\" programming model, also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, use the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you don't need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\"/> for more information and code examples."
+msgid "The first two implementations provide a \"one session - one database transaction\" programming model. This is also also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, you can utilize the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you do not need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\"/> for more information and code examples."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:368
+#: architecture.xml:371
 #, no-c-format
-msgid "The <literal>hibernate.current_session_context_class</literal> configuration parameter defines which <literal>org.hibernate.context.CurrentSessionContext</literal> implementation should be used. Note that for backwards compatibility, if this config param is not set but a <literal>org.hibernate.transaction.TransactionManagerLookup</literal> is configured, Hibernate will use the <literal>org.hibernate.context.JTASessionContext</literal>. Typically, the value of this parameter would just name the implementation class to use; for the three out-of-the-box implementations, however, there are three corresponding short names, \"jta\", \"thread\", and \"managed\"."
+msgid "The <literal>hibernate.current_session_context_class</literal> configuration parameter defines which <literal>org.hibernate.context.CurrentSessionContext</literal> implementation should be used. For backwards compatibility, if this configuration parameter is not set but a <literal>org.hibernate.transaction.TransactionManagerLookup</literal> is configured, Hibernate will use the <literal>org.hibernate.context.JTASessionContext</literal>. Typically, the value of this parameter would just name the implementation class to use. For the three out-of-the-box implementations, however, there are three corresponding short names: \"jta\", \"thread\", and \"managed\"."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -29,19 +29,19 @@
 #. Tag: para
 #: association_mapping.xml:35
 #, no-c-format
-msgid "Association mappings are the often most difficult thing to get right. In this section we'll go through the canonical cases one by one, starting with unidirectional mappings, and then considering the bidirectional cases. We'll use <literal>Person</literal> and <literal>Address</literal> in all the examples."
+msgid "Association mappings are often the most difficult thing to implement correctly. In this section we examine some canonical cases one by one, starting with unidirectional mappings and then bidirectional cases. We will use <literal>Person</literal> and <literal>Address</literal> in all the examples."
 msgstr ""
 
 #. Tag: para
 #: association_mapping.xml:43
 #, no-c-format
-msgid "We'll classify associations by whether or not they map to an intervening join table, and by multiplicity."
+msgid "Associations will be classified by multiplicity and whether or not they map to an intervening join table."
 msgstr ""
 
 #. Tag: para
 #: association_mapping.xml:48
 #, no-c-format
-msgid "Nullable foreign keys are not considered good practice in traditional data modelling, so all our examples use not null foreign keys. This is not a requirement of Hibernate, and the mappings will all work if you drop the nullability constraints."
+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 not a requirement of Hibernate, and the mappings will work if you drop the nullability constraints."
 msgstr ""
 
 #. Tag: title
@@ -53,7 +53,7 @@
 #. Tag: title
 #: association_mapping.xml:61 association_mapping.xml:132
 #, no-c-format
-msgid "many to one"
+msgid "Many-to-one"
 msgstr ""
 
 #. Tag: para
@@ -93,9 +93,9 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:74 association_mapping.xml:145 association_mapping.xml:209 association_mapping.xml:249
+#: association_mapping.xml:74 association_mapping.xml:145 association_mapping.xml:210
 #, no-c-format
-msgid "one to one"
+msgid "One-to-one"
 msgstr ""
 
 #. Tag: para
@@ -126,7 +126,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:82 association_mapping.xml:217
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -138,7 +138,7 @@
 #. Tag: para
 #: association_mapping.xml:84
 #, no-c-format
-msgid "A <emphasis>unidirectional one-to-one association on a primary key</emphasis> usually uses a special id generator. (Notice that we've reversed the direction of the association in this example.)"
+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 ""
 
 #. Tag: programlisting
@@ -162,7 +162,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:91 association_mapping.xml:225
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -174,13 +174,13 @@
 #. Tag: title
 #: association_mapping.xml:96 association_mapping.xml:118
 #, no-c-format
-msgid "one to many"
+msgid "One-to-many"
 msgstr ""
 
 #. Tag: para
 #: association_mapping.xml:98
 #, no-c-format
-msgid "A <emphasis>unidirectional one-to-many association on a foreign key</emphasis> is a very unusual case, and is not really recommended."
+msgid "A <emphasis>unidirectional one-to-many association on a foreign key</emphasis> is an unusual case, and is not recommended."
 msgstr ""
 
 #. Tag: programlisting
@@ -218,7 +218,7 @@
 #. Tag: para
 #: association_mapping.xml:106
 #, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+msgid "You should instead use a join table for this kind of association."
 msgstr ""
 
 #. Tag: title
@@ -230,7 +230,7 @@
 #. Tag: para
 #: association_mapping.xml:120
 #, no-c-format
-msgid "A <emphasis>unidirectional one-to-many association on a join table</emphasis> is much preferred. Notice that by specifying <literal>unique=\"true\"</literal>, we have changed the multiplicity from many-to-many to one-to-many."
+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 ""
 
 #. Tag: programlisting
@@ -270,7 +270,7 @@
 #. Tag: para
 #: association_mapping.xml:134
 #, no-c-format
-msgid "A <emphasis>unidirectional many-to-one association on a join table</emphasis> is quite common when the association is optional."
+msgid "A <emphasis>unidirectional many-to-one association on a join table</emphasis> is common when the association is optional. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -311,7 +311,7 @@
 #. Tag: para
 #: association_mapping.xml:147
 #, no-c-format
-msgid "A <emphasis>unidirectional one-to-one association on a join table</emphasis> is extremely unusual, but possible."
+msgid "A <emphasis>unidirectional one-to-one association on a join table</emphasis> is possible, but extremely unusual."
 msgstr ""
 
 #. Tag: programlisting
@@ -341,7 +341,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:153 association_mapping.xml:257
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -352,15 +352,15 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:158 association_mapping.xml:262
+#: association_mapping.xml:158 association_mapping.xml:263
 #, no-c-format
-msgid "many to many"
+msgid "Many-to-many"
 msgstr ""
 
 #. Tag: para
 #: association_mapping.xml:160
 #, no-c-format
-msgid "Finally, we have a <emphasis>unidirectional many-to-many association</emphasis>."
+msgid "Finally, here is an example of a <emphasis>unidirectional many-to-many association</emphasis>."
 msgstr ""
 
 #. Tag: programlisting
@@ -386,7 +386,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:165 association_mapping.xml:270
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -403,15 +403,15 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:175 association_mapping.xml:235
+#: association_mapping.xml:175 association_mapping.xml:236
 #, no-c-format
-msgid "one to many / many to one"
+msgid "one-to-many / many-to-one"
 msgstr ""
 
 #. Tag: para
 #: association_mapping.xml:177
 #, no-c-format
-msgid "A <emphasis>bidirectional many-to-one association</emphasis> is the most common kind of association. (This is the standard parent/child relationship.)"
+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 ""
 
 #. Tag: programlisting
@@ -441,7 +441,7 @@
 #. Tag: para
 #: association_mapping.xml:187
 #, no-c-format
-msgid "If you use a <literal>List</literal> (or other indexed collection) you need to set the <literal>key</literal> column of the foreign key to <literal>not null</literal>, and let Hibernate manage the association from the collections side to maintain the index of each element (making the other side virtually inverse by setting <literal>update=\"false\"</literal> and <literal>insert=\"false\"</literal>):"
+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</literal>. Hibernate will manage the association from the collections side to maintain the index of each element, making the other side virtually inverse by setting <literal>update=\"false\"</literal> and <literal>insert=\"false\"</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -472,17 +472,17 @@
 #. Tag: para
 #: association_mapping.xml:197
 #, no-c-format
-msgid "It is important that you define <literal>not-null=\"true\"</literal> on the <literal>&lt;key&gt;</literal> element of the collection mapping if the underlying foreign key column is <literal>NOT NULL</literal>. Don't only declare <literal>not-null=\"true\"</literal> on a possible nested <literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</literal> element."
+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 <literal>&lt;key&gt;</literal> element of the collection mapping. Do not only declare <literal>not-null=\"true\"</literal> on a possible nested <literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:211
+#: association_mapping.xml:212
 #, no-c-format
-msgid "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> is quite common."
+msgid "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> is common:"
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:216
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -505,13 +505,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:219
+#: association_mapping.xml:220
 #, no-c-format
-msgid "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> uses the special id generator."
+msgid "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> uses the special id generator:"
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:224
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -533,19 +533,19 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:232
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:237
+#: association_mapping.xml:238
 #, no-c-format
-msgid "A <emphasis>bidirectional one-to-many association on a join table</emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on either end of the association, on the collection, or on the join."
+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 ""
 
 #. Tag: programlisting
-#: association_mapping.xml:243
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -577,7 +577,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -587,14 +587,20 @@
       "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, no-c-format
+msgid "one to one"
+msgstr ""
+
 #. Tag: para
-#: association_mapping.xml:251
+#: association_mapping.xml:252
 #, no-c-format
-msgid "A <emphasis>bidirectional one-to-one association on a join table</emphasis> is extremely unusual, but possible."
+msgid "A <emphasis>bidirectional one-to-one association on a join table</emphasis> is possible, but extremely unusual."
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:256
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -630,13 +636,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:264
+#: association_mapping.xml:265
 #, no-c-format
-msgid "Finally, we have a <emphasis>bidirectional many-to-many association</emphasis>."
+msgid "Here is an example of a <emphasis>bidirectional many-to-many association</emphasis>."
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:268
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -663,19 +669,19 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:277
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:279
+#: association_mapping.xml:280
 #, no-c-format
-msgid "More complex association joins are <emphasis>extremely</emphasis> rare. Hibernate makes it possible to handle more complex situations using SQL fragments embedded in the mapping document. For example, if a table with historical account information data defines <literal>accountNumber</literal>, <literal>effectiveEndDate</literal> and <literal>effectiveStartDate</literal>columns, mapped as follows:"
+msgid "More complex association joins are <emphasis>extremely</emphasis> rare. Hibernate handles more complex situations by using SQL fragments embedded in the mapping document. For example, if a table with historical account information data defines <literal>accountNumber</literal>, <literal>effectiveEndDate</literal> and <literal>effectiveStartDate</literal>columns, it would be mapped as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:288
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
       "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -689,13 +695,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:290
+#: association_mapping.xml:291
 #, no-c-format
-msgid "Then we can map an association to the <emphasis>current</emphasis> instance (the one with null <literal>effectiveEndDate</literal>) using:"
+msgid "You can then map an association to the <emphasis>current</emphasis> instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:295
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
       "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -707,13 +713,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:297
+#: association_mapping.xml:298
 #, no-c-format
-msgid "In a more complex example, imagine that the association between <literal>Employee</literal> and <literal>Organization</literal> is maintained in an <literal>Employment</literal> table full of historical employment data. Then an association to the employee's <emphasis>most recent</emphasis> employer (the one with the most recent <literal>startDate</literal>) might be mapped this way:"
+msgid "In a more complex example, imagine that the association between <literal>Employee</literal> and <literal>Organization</literal> is maintained in an <literal>Employment</literal> table full of historical employment data. An association to the employee's <emphasis>most recent</emphasis> employer, the one with the most recent <literal>startDate</literal>, could be mapped in the following way:"
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:305
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
       "<![CDATA[<join>\n"
@@ -731,8 +737,8 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:307
+#: association_mapping.xml:308
 #, no-c-format
-msgid "You can get quite creative with this functionality, but it is usually more practical to handle these kinds of cases using HQL or a criteria query."
+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 ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -29,19 +29,19 @@
 #. Tag: para
 #: basic_mapping.xml:34
 #, 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, not table declarations."
+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 ""
 
 #. Tag: para
 #: basic_mapping.xml:41
 #, no-c-format
-msgid "Note that, even though many Hibernate users choose to write the XML by hand, a number of tools exist to generate the mapping document, including XDoclet, Middlegen and AndroMDA."
+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 ""
 
 #. Tag: para
 #: basic_mapping.xml:47
 #, no-c-format
-msgid "Lets kick off with an example mapping:"
+msgid "Here is an example mapping:"
 msgstr ""
 
 #. Tag: programlisting
@@ -117,7 +117,7 @@
 #. Tag: para
 #: basic_mapping.xml:53
 #, no-c-format
-msgid "We will now discuss the content of the mapping document. We will only describe the document elements and attributes that are used by Hibernate at runtime. The mapping document also contains some extra optional attributes and elements that affect the database schemas exported by the schema export tool. (For example the <literal> not-null</literal> attribute.)"
+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 Hibernate at runtime. The mapping document also contains some extra optional attributes and elements that affect the database schemas exported by the schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 
 #. Tag: title
@@ -129,7 +129,7 @@
 #. Tag: para
 #: basic_mapping.xml:66
 #, no-c-format
-msgid "All XML mappings should declare the doctype shown. The actual DTD may be found at the URL above, in the directory <literal>hibernate-x.x.x/src/org/hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will always look for the DTD in its classpath first. If you experience lookups of the DTD using an Internet connection, check your DTD declaration against the contents of your claspath."
+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/hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate will always look for the DTD in its classpath first. If you experience lookups of the DTD using an Internet connection, check the DTD declaration against the contents of your classpath."
 msgstr ""
 
 #. Tag: title
@@ -141,25 +141,25 @@
 #. Tag: para
 #: basic_mapping.xml:77
 #, no-c-format
-msgid "As mentioned previously, Hibernate will first attempt to resolve DTDs in its classpath. The manner in which it does this is by registering a custom <literal>org.xml.sax.EntityResolver</literal> implementation with the SAXReader it uses to read in the xml files. This custom <literal>EntityResolver</literal> recognizes two different systemId namespaces."
+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> implementation with the SAXReader it uses to read in the xml files. This custom <literal>EntityResolver</literal> recognizes two different systemId namespaces:"
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:85
 #, no-c-format
-msgid "a <literal>hibernate namespace</literal> is recognized whenever the resolver encounteres a systemId starting with <literal>http://hibernate.sourceforge.net/</literal>; the resolver attempts to resolve these entities via the classlaoder which loaded the Hibernate classes."
+msgid "a <literal>hibernate namespace</literal> is recognized whenever the resolver encounters a systemId starting with <literal>http://hibernate.sourceforge.net/</literal>. The resolver attempts to resolve these entities via the classloader which loaded the Hibernate classes."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:94
 #, no-c-format
-msgid "a <literal>user namespace</literal> is recognized whenever the resolver encounteres a systemId using a <literal>classpath://</literal> URL protocol; the resolver will attempt to resolve these entities via (1) the current thread context classloader and (2) the classloader which loaded the Hibernate classes."
+msgid "a <literal>user namespace</literal> is recognized whenever the resolver encounters a systemId using a <literal>classpath://</literal> URL protocol. The resolver will attempt to resolve these entities via (1) the current thread context classloader and (2) the classloader which loaded the Hibernate classes."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:103
 #, no-c-format
-msgid "An example of utilizing user namespacing:"
+msgid "The following is an example of utilizing user namespacing:"
 msgstr ""
 
 #. Tag: programlisting
@@ -192,13 +192,13 @@
 #. Tag: title
 #: basic_mapping.xml:115
 #, no-c-format
-msgid "hibernate-mapping"
+msgid "Hibernate-mapping"
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:117
 #, 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 this mapping belong to the named schema and/or catalog. If specified, tablenames will be qualified by the given schema and catalog names. If missing, tablenames will be unqualified. The <literal>default-cascade</literal> attribute specifies what cascade style should be assumed for properties and collections which do not specify a <literal>cascade</literal> attribute. The <literal>auto-import</literal> attribute lets us use unqualified class names in the query language, by default."
+msgid "This element has several optional attributes. The <literal>schema</literal> and <literal>catalog</literal> attributes specify that tables referred to in this mapping belong to the named schema and/or catalog. If they are specified, tablenames will be qualified by the given schema and catalog names. If they are missing, tablenames will be unqualified. The <literal>default-cascade</literal> attribute specifies what cascade style should be assumed for properties and collections that do not specify a <literal>cascade</literal> attribute. By default, the <literal>auto-import</literal> attribute allows you to use unqualified class names in the query language."
 msgstr ""
 
 #. Tag: programlisting
@@ -219,67 +219,67 @@
 #. Tag: para
 #: basic_mapping.xml:141
 #, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:146
 #, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:151
 #, no-c-format
-msgid "<literal>default-cascade</literal> (optional - defaults to <literal>none</literal>): A default cascade style."
+msgid "<literal>default-cascade</literal> (optional - defaults to <literal>none</literal>): a default cascade style."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:157
 #, no-c-format
-msgid "<literal>default-access</literal> (optional - defaults to <literal>property</literal>): The strategy Hibernate should use for accessing all properties. Can be a custom implementation of <literal>PropertyAccessor</literal>."
+msgid "<literal>default-access</literal> (optional - defaults to <literal>property</literal>): the strategy Hibernate should use for accessing all properties. It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:164
 #, no-c-format
-msgid "<literal>default-lazy</literal> (optional - defaults to <literal>true</literal>): The default value for unspecifed <literal>lazy</literal> attributes of class and collection mappings."
+msgid "<literal>default-lazy</literal> (optional - defaults to <literal>true</literal>): the default value for unspecified <literal>lazy</literal> attributes of class and collection mappings."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:171
 #, 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."
+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 ""
 
 #. Tag: para
 #: basic_mapping.xml:178
 #, no-c-format
-msgid "<literal>package</literal> (optional): Specifies a package prefix to assume for unqualified class names in the mapping document."
+msgid "<literal>package</literal> (optional): specifies a package prefix to use for unqualified class names in the mapping document."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:186
 #, no-c-format
-msgid "If you have two persistent classes with the same (unqualified) name, you should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an exception if you attempt to assign two classes to the same \"imported\" name."
+msgid "If you have two persistent classes with the same unqualified name, you should set <literal>auto-import=\"false\"</literal>. An exception will result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:192
 #, no-c-format
-msgid "Note that the <literal>hibernate-mapping</literal> element allows you to nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is however good practice (and expected by some tools) to map only a single persistent class (or a single class hierarchy) in one mapping file and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, <literal>Animal.hbm.xml</literal>."
+msgid "The <literal>hibernate-mapping</literal> element allows you to nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, however, good practice (and expected by some tools) to map only a single persistent class, or a single class hierarchy, in one mapping file and name it after the persistent superclass. For example, <literal>Cat.hbm.xml</literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, <literal>Animal.hbm.xml</literal>."
 msgstr ""
 
 #. Tag: title
 #: basic_mapping.xml:205
 #, no-c-format
-msgid "<title>class</title>"
+msgid "Class"
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:207
 #, no-c-format
-msgid "You may declare a persistent class using the <literal>class</literal> element:"
+msgid "You can declare a persistent class using the <literal>class</literal> element. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -315,215 +315,215 @@
 #. Tag: para
 #: basic_mapping.xml:238
 #, 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."
+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 ""
 
 #. Tag: para
 #: basic_mapping.xml:245
 #, no-c-format
-msgid "<literal>table</literal> (optional - defaults to the unqualified class name): The name of its database table."
+msgid "<literal>table</literal> (optional - defaults to the unqualified class name): the name of its database table."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:251
 #, no-c-format
-msgid "<literal>discriminator-value</literal> (optional - defaults to the class name): A value that distiguishes individual subclasses, used for polymorphic behaviour. Acceptable values include <literal>null</literal> and <literal>not null</literal>."
+msgid "<literal>discriminator-value</literal> (optional - defaults to the class name): a value that distinguishes individual subclasses that is used for polymorphic behavior. Acceptable values include <literal>null</literal> and <literal>not null</literal>."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:258
 #, no-c-format
-msgid "<literal>mutable</literal> (optional, defaults to <literal>true</literal>): Specifies that instances of the class are (not) mutable."
+msgid "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): specifies that instances of the class are (not) mutable."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:264 basic_mapping.xml:2228
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, no-c-format
-msgid "<literal>schema</literal> (optional): Override the schema name specified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
+msgid "<literal>schema</literal> (optional): overrides the schema name specified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:270 basic_mapping.xml:2234
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, no-c-format
-msgid "<literal>catalog</literal> (optional): Override the catalog name specified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
+msgid "<literal>catalog</literal> (optional): overrides the catalog name specified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:276
 #, no-c-format
-msgid "<literal>proxy</literal> (optional): Specifies an interface to use for lazy initializing proxies. You may specify the name of the class itself."
+msgid "<literal>proxy</literal> (optional): specifies an interface to use for lazy initializing proxies. You can specify the name of the class itself."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:282
 #, no-c-format
-msgid "<literal>dynamic-update</literal> (optional, defaults to <literal>false</literal>): Specifies that <literal>UPDATE</literal> SQL should be generated at runtime and contain only those columns whose values have changed."
+msgid "<literal>dynamic-update</literal> (optional - defaults to <literal>false</literal>): specifies that <literal>UPDATE</literal> SQL should be generated at runtime and can contain only those columns whose values have changed."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:289
 #, no-c-format
-msgid "<literal>dynamic-insert</literal> (optional, defaults to <literal>false</literal>): Specifies that <literal>INSERT</literal> SQL should be generated at runtime and contain only the columns whose values are not null."
+msgid "<literal>dynamic-insert</literal> (optional - defaults to <literal>false</literal>): specifies that <literal>INSERT</literal> SQL should be generated at runtime and contain only the columns whose values are not null."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:296
 #, no-c-format
-msgid "<literal>select-before-update</literal> (optional, defaults to <literal>false</literal>): Specifies that Hibernate should <emphasis>never</emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that an object is actually modified. In certain cases (actually, only when a transient object has been associated with a new session using <literal>update()</literal>), this means that Hibernate will perform an extra SQL <literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is actually required."
+msgid "<literal>select-before-update</literal> (optional - defaults to <literal>false</literal>): specifies that Hibernate should <emphasis>never</emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that an object is actually modified. Only when a transient object has been associated with a new session using <literal>update()</literal>, will Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is actually required."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:306
 #, no-c-format
-msgid "<literal>polymorphism</literal> (optional, defaults to <literal>implicit</literal>): Determines whether implicit or explicit query polymorphism is used."
+msgid "<literal>polymorphism</literal> (optional - defaults to <literal>implicit</literal>): determines whether implicit or explicit query polymorphism is used."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:312
 #, no-c-format
-msgid "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</literal> condition to be used when retrieving objects of this class"
+msgid "<literal>where</literal> (optional): specifies an arbitrary SQL <literal>WHERE</literal> condition to be used when retrieving objects of this class."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:318
 #, no-c-format
-msgid "<literal>persister</literal> (optional): Specifies a custom <literal>ClassPersister</literal>."
+msgid "<literal>persister</literal> (optional): specifies a custom <literal>ClassPersister</literal>."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:323
 #, no-c-format
-msgid "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) specify a \"batch size\" for fetching instances of this class by identifier."
+msgid "<literal>batch-size</literal> (optional - defaults to <literal>1</literal>): specifies a \"batch size\" for fetching instances of this class by identifier."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:329
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional, defaults to <literal>version</literal>): Determines the optimistic locking strategy."
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>version</literal>): determines the optimistic locking strategy."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:335
 #, no-c-format
-msgid "<literal>lazy</literal> (optional): Lazy fetching may be completely disabled by setting <literal>lazy=\"false\"</literal>."
+msgid "<literal>lazy</literal> (optional): lazy fetching can be disabled by setting <literal>lazy=\"false\"</literal>."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:341
 #, no-c-format
-msgid "<literal>entity-name</literal> (optional, defaults to the class name): Hibernate3 allows a class to be mapped multiple times (to different tables, potentially), and allows entity mappings that are represented by Maps or XML at the Java level. In these cases, you should provide an explicit arbitrary name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
+msgid "<literal>entity-name</literal> (optional - defaults to the class name): Hibernate3 allows a class to be mapped multiple times, potentially to different tables. It also allows entity mappings that are represented by Maps or XML at the Java level. In these cases, you should provide an explicit arbitrary name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:351
 #, no-c-format
-msgid "<literal>check</literal> (optional): A SQL expression used to generate a multi-row <emphasis>check</emphasis> constraint for automatic schema generation."
+msgid "<literal>check</literal> (optional): an SQL expression used to generate a multi-row <emphasis>check</emphasis> constraint for automatic schema generation."
 msgstr ""
 
 #. Tag: para
 #: basic_mapping.xml:357
 #, no-c-format
-msgid "<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on databases which support. E.g. on Oracle, Hibernate can use the <literal>rowid</literal> extra column for fast updates if you set this option to <literal>rowid</literal>. A ROWID is an implementation detail and represents the physical location of a stored tuple."
+msgid "<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra column for fast updates once this option has been set to <literal>rowid</literal>. A ROWID is an implementation detail and represents the physical location of a stored tuple."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:365
+#: basic_mapping.xml:364
 #, no-c-format
-msgid "<literal>subselect</literal> (optional): Maps an immutable and read-only entity to a database subselect. Useful if you want to have a view instead of a base table, but don't. See below for more information."
+msgid "<literal>subselect</literal> (optional): maps an immutable and read-only entity to a database subselect. This is useful if you want to have a view instead of a base table. See below for more information."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:372
+#: basic_mapping.xml:371
 #, no-c-format
-msgid "<literal>abstract</literal> (optional): Used to mark abstract superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+msgid "<literal>abstract</literal> (optional): is used to mark abstract superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:380
+#: basic_mapping.xml:379
 #, no-c-format
-msgid "It is perfectly acceptable for the named persistent class to be an interface. You would then declare implementing classes of that interface using the <literal>&lt;subclass&gt;</literal> element. You may persist any <emphasis>static</emphasis> inner class. You should specify the class name using the standard form ie. <literal>eg.Foo$Bar</literal>."
+msgid "It is acceptable for the named persistent class to be an interface. You can declare implementing classes of that interface using the <literal>&lt;subclass&gt;</literal> element. You can persist any <emphasis>static</emphasis> inner class. Specify the class name using the standard form i.e. <literal>e.g.Foo$Bar</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:387
+#: basic_mapping.xml:386
 #, no-c-format
-msgid "Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated or deleted by the application. This allows Hibernate to make some minor performance optimizations."
+msgid "Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated or deleted by the application. This allows Hibernate to make some minor performance optimizations."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:392
+#: basic_mapping.xml:391
 #, no-c-format
-msgid "The optional <literal>proxy</literal> attribute enables lazy initialization of persistent instances of the class. Hibernate will initially return CGLIB proxies which implement the named interface. The actual persistent object will be loaded when a method of the proxy is invoked. See \"Initializing collections and proxies\" below."
+msgid "The optional <literal>proxy</literal> attribute enables lazy initialization of persistent instances of the class. Hibernate will initially return CGLIB proxies that implement the named interface. The persistent object will load when a method of the proxy is invoked. See \"Initializing collections and proxies\" below."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:399
+#: basic_mapping.xml:398
 #, no-c-format
-msgid "<emphasis>Implicit</emphasis> polymorphism means that instances of the class will be returned by a query that names any superclass or implemented interface or the class and that instances of any subclass of the class will be returned by a query that names the class itself. <emphasis>Explicit</emphasis> polymorphism means that class instances will be returned only by queries that explicitly name that class and that queries that name the class will return only instances of subclasses mapped inside this <literal>&lt;class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, <literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit polymorphism is useful when two different classes are mapped to the same table (this allows a \"lightweight\" class that contains a subset of the table columns)."
+msgid "<emphasis>Implicit</emphasis> polymorphism means that instances of the class will be returned by a query that names any superclass or implemented interface or class, and that instances of any subclass of the class will be returned by a query that names the class itself. <emphasis>Explicit</emphasis> polymorphism means that class instances will be returned only by queries that explicitly name that class. Queries that name the class will return only instances of subclasses mapped inside this <literal>&lt;class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default <literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit polymorphism is useful when two different classes are mapped to the same table This allows a \"lightweight\" class that contains a subset of the table columns."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:411
+#: basic_mapping.xml:410
 #, no-c-format
-msgid "The <literal>persister</literal> attribute lets you customize the persistence strategy used for the class. You may, for example, specify your own subclass of <literal>org.hibernate.persister.EntityPersister</literal> or you might even provide a completely new implementation of the interface <literal>org.hibernate.persister.ClassPersister</literal> that implements persistence via, for example, stored procedure calls, serialization to flat files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+msgid "The <literal>persister</literal> attribute lets you customize the persistence strategy used for the class. You can, for example, specify your own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, or you can even provide a completely new implementation of the interface <literal>org.hibernate.persister.ClassPersister</literal> that implements, for example, persistence via stored procedure calls, serialization to flat files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:422
+#: basic_mapping.xml:421
 #, no-c-format
-msgid "Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> settings are not inherited by subclasses and so may also be specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</literal> elements. These settings may increase performance in some cases, but might actually decrease performance in others. Use judiciously."
+msgid "The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> settings are not inherited by subclasses, so they can also be specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</literal> elements. Although these settings can increase performance in some cases, they can actually decrease performance in others."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:430
+#: basic_mapping.xml:429
 #, no-c-format
-msgid "Use of <literal>select-before-update</literal> will usually decrease performance. It is very useful to prevent a database update trigger being called unnecessarily if you reattach a graph of detached instances to a <literal>Session</literal>."
+msgid "Use of <literal>select-before-update</literal> will usually decrease performance. It is useful to prevent a database update trigger being called unnecessarily if you reattach a graph of detached instances to a <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:436
+#: basic_mapping.xml:435
 #, no-c-format
 msgid "If you enable <literal>dynamic-update</literal>, you will have a choice of optimistic locking strategies:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:442
+#: basic_mapping.xml:441
 #, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:447
+#: basic_mapping.xml:446
 #, no-c-format
-msgid "<literal>all</literal> check all columns"
+msgid "<literal>all</literal>: check all columns"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:452
+#: basic_mapping.xml:451
 #, no-c-format
-msgid "<literal>dirty</literal> check the changed columns, allowing some concurrent updates"
+msgid "<literal>dirty</literal>: check the changed columns, allowing some concurrent updates"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:457
+#: basic_mapping.xml:456
 #, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:462
+#: basic_mapping.xml:461
 #, no-c-format
-msgid "We <emphasis>very</emphasis> strongly recommend that you use version/timestamp columns for optimistic locking with Hibernate. This is the optimal strategy with respect to performance and is the only strategy that correctly handles modifications made to detached instances (ie. when <literal>Session.merge()</literal> is used)."
+msgid "It is <emphasis>strongly</emphasis> recommended that you use version/timestamp columns for optimistic locking with Hibernate. This strategy optimizes performance and correctly handles modifications made to detached instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:469
+#: basic_mapping.xml:468
 #, no-c-format
-msgid "There is no difference between a view and a base table for a Hibernate mapping, as expected this is transparent at the database level (note that some DBMS don't support views properly, especially with updates). Sometimes you want to use a view, but can't create one in the database (ie. with a legacy schema). In this case, you can map an immutable and read-only entity to a given SQL subselect expression:"
+msgid "There is no difference between a view and a base table for a Hibernate mapping. This is transparent at the database level, although some DBMS do not support views properly, especially with updates. Sometimes you want to use a view, but you cannot create one in the database (i.e. with a legacy schema). In this case, you can map an immutable and read-only entity to a given SQL subselect expression:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:477
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Summary\">\n"
@@ -541,25 +541,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:479
+#: basic_mapping.xml:478
 #, no-c-format
-msgid "Declare the tables to synchronize this entity with, ensuring that auto-flush happens correctly, and that queries against the derived entity do not return stale data. The <literal>&lt;subselect&gt;</literal> is available as both as an attribute and a nested mapping element."
+msgid "Declare the tables to synchronize this entity with, ensuring that auto-flush happens correctly and that queries against the derived entity do not return stale data. The <literal>&lt;subselect&gt;</literal> is available both as an attribute and a nested mapping element."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:489
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:491
+#: basic_mapping.xml:490
 #, no-c-format
 msgid "Mapped classes <emphasis>must</emphasis> declare the primary key column of the database table. Most classes will also have a JavaBeans-style property holding the unique identifier of an instance. The <literal>&lt;id&gt;</literal> element defines the mapping from that property to the primary key column."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:506
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
       "<![CDATA[<id\n"
@@ -575,67 +575,67 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:509
+#: basic_mapping.xml:508
 #, 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 ""
 
 #. Tag: para
-#: basic_mapping.xml:514
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, 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 ""
 
 #. Tag: para
-#: basic_mapping.xml:519
+#: basic_mapping.xml:518
 #, no-c-format
-msgid "<literal>column</literal> (optional - defaults to the property name): The name of the primary key column."
+msgid "<literal>column</literal> (optional - defaults to the property name): the name of the primary key column."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:525
+#: basic_mapping.xml:524
 #, no-c-format
-msgid "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" value): An identifier property value that indicates that an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session."
+msgid "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" value): an identifier property value that indicates an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:533 basic_mapping.xml:1041 basic_mapping.xml:1180 basic_mapping.xml:1262 basic_mapping.xml:1369 basic_mapping.xml:1558 basic_mapping.xml:1732 basic_mapping.xml:1902 basic_mapping.xml:2481
+#: basic_mapping.xml:532
 #, no-c-format
-msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): The strategy Hibernate should use for accessing the property value."
+msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): the strategy Hibernate should use for accessing the property value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:541
+#: basic_mapping.xml:540
 #, no-c-format
 msgid "If the <literal>name</literal> attribute is missing, it is assumed that the class has no identifier property."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:546
+#: basic_mapping.xml:545
 #, no-c-format
 msgid "The <literal>unsaved-value</literal> attribute is almost never needed in Hibernate3."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:550
+#: basic_mapping.xml:549
 #, no-c-format
-msgid "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration to allow access to legacy data with composite keys. We strongly discourage its use for anything else."
+msgid "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration that allows access to legacy data with composite keys. Its use is strongly discouraged for anything else."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:556
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:558
+#: basic_mapping.xml:557
 #, no-c-format
 msgid "The optional <literal>&lt;generator&gt;</literal> child element names a Java class used to generate unique identifiers for instances of the persistent class. If any parameters are required to configure or initialize the generator instance, they are passed using the <literal>&lt;param&gt;</literal> element."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:565
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -647,169 +647,169 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:567
+#: basic_mapping.xml:566
 #, no-c-format
-msgid "All generators implement the interface <literal>org.hibernate.id.IdentifierGenerator</literal>. This is a very simple interface; some applications may choose to provide their own specialized implementations. However, Hibernate provides a range of built-in implementations. There are shortcut names for the built-in generators:"
+msgid "All generators implement the interface <literal>org.hibernate.id.IdentifierGenerator</literal>. This is a very simple interface. Some applications can choose to provide their own specialized implementations, however, Hibernate provides a range of built-in implementations. The shortcut names for the built-in generators are as follows:"
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:575
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:577
+#: basic_mapping.xml:576
 #, no-c-format
 msgid "generates identifiers of type <literal>long</literal>, <literal>short</literal> or <literal>int</literal> that are unique only when no other process is inserting data into the same table. <emphasis>Do not use in a cluster.</emphasis>"
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:586
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:588
+#: basic_mapping.xml:587
 #, no-c-format
 msgid "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and HypersonicSQL. The returned identifier is of type <literal>long</literal>, <literal>short</literal> or <literal>int</literal>."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:596
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:598
+#: basic_mapping.xml:597
 #, no-c-format
 msgid "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in Interbase. The returned identifier is of type <literal>long</literal>, <literal>short</literal> or <literal>int</literal>"
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:606
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:608
+#: basic_mapping.xml:607
 #, no-c-format
 msgid "uses a hi/lo algorithm to efficiently generate identifiers of type <literal>long</literal>, <literal>short</literal> or <literal>int</literal>, given a table and column (by default <literal>hibernate_unique_key</literal> and <literal>next_hi</literal> respectively) as a source of hi values. The hi/lo algorithm generates identifiers that are unique only for a particular database."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:618
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:620
+#: basic_mapping.xml:619
 #, no-c-format
 msgid "uses a hi/lo algorithm to efficiently generate identifiers of type <literal>long</literal>, <literal>short</literal> or <literal>int</literal>, given a named database sequence."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:628
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:630
+#: basic_mapping.xml:629
 #, no-c-format
-msgid "uses a 128-bit UUID algorithm to generate identifiers of type string, unique within a network (the IP address is used). The UUID is encoded as a string of hexadecimal digits of length 32."
+msgid "uses a 128-bit UUID algorithm to generate identifiers of type string that are unique within a network (the IP address is used). The UUID is encoded as a string of 32 hexadecimal digits in length."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:638
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:640
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:646
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:648
+#: basic_mapping.xml:647
 #, no-c-format
-msgid "picks <literal>identity</literal>, <literal>sequence</literal> or <literal>hilo</literal> depending upon the capabilities of the underlying database."
+msgid "selects <literal>identity</literal>, <literal>sequence</literal> or <literal>hilo</literal> depending upon the capabilities of the underlying database."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:656
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:658
+#: basic_mapping.xml:657
 #, no-c-format
-msgid "lets the application to assign an identifier to the object before <literal>save()</literal> is called. This is the default strategy if no <literal>&lt;generator&gt;</literal> element is specified."
+msgid "lets the application assign an identifier to the object before <literal>save()</literal> is called. This is the default strategy if no <literal>&lt;generator&gt;</literal> element is specified."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:666
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:668
+#: basic_mapping.xml:667
 #, no-c-format
-msgid "retrieves a primary key assigned by a database trigger by selecting the row by some unique key and retrieving the primary key value."
+msgid "retrieves a primary key, assigned by a database trigger, by selecting the row by some unique key and retrieving the primary key value."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:675
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:677
+#: basic_mapping.xml:676
 #, no-c-format
-msgid "uses the identifier of another associated object. Usually used in conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key association."
+msgid "uses the identifier of another associated object. It is usually used in conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key association."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:684
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:686
+#: basic_mapping.xml:685
 #, no-c-format
-msgid "a specialized sequence generation strategy which utilizes a database sequence for the actual value generation, but combines this with JDBC3 getGeneratedKeys to actually return the generated identifier value as part of the insert statement execution. This strategy is only known to be supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on these insert statements are disabled due to a bug in the Oracle drivers."
+msgid "a specialized sequence generation strategy that utilizes a database sequence for the actual value generation, but combines this with JDBC3 getGeneratedKeys to return the generated identifier value as part of the insert statement execution. This strategy is only supported on Oracle 10g drivers targeted for JDK 1.4. Comments on these insert statements are disabled due to a bug in the Oracle drivers."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:703
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:704
+#: basic_mapping.xml:703
 #, no-c-format
-msgid "The <literal>hilo</literal> and <literal>seqhilo</literal> generators provide two alternate implementations of the hi/lo algorithm, a favorite approach to identifier generation. The first implementation requires a \"special\" database table to hold the next available \"hi\" value. The second uses an Oracle-style sequence (where supported)."
+msgid "The <literal>hilo</literal> and <literal>seqhilo</literal> generators provide two alternate implementations of the hi/lo algorithm. The first implementation requires a \"special\" database table to hold the next available \"hi\" value. Where supported, the second uses an Oracle-style sequence."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:711
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -822,7 +822,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:713
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -834,37 +834,37 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:715
+#: basic_mapping.xml:714
 #, no-c-format
-msgid "Unfortunately, you can't use <literal>hilo</literal> when supplying your own <literal>Connection</literal> to Hibernate. When Hibernate is using an application server datasource to obtain connections enlisted with JTA, you must properly configure the <literal>hibernate.transaction.manager_lookup_class</literal>."
+msgid "Unfortunately, you cannot use <literal>hilo</literal> when supplying your own <literal>Connection</literal> to Hibernate. When Hibernate uses an application server datasource to obtain connections enlisted with JTA, you must configure the <literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:724
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:725
+#: basic_mapping.xml:724
 #, no-c-format
-msgid "The UUID contains: IP address, startup time of the JVM (accurate to a quarter second), system time and a counter value (unique within the JVM). It's not possible to obtain a MAC address or memory address from Java code, so this is the best we can do without using JNI."
+msgid "The UUID contains: IP address, startup time of the JVM that is accurate to a quarter second, system time and a counter value that is unique within the JVM. It is not possible to obtain a MAC address or memory address from Java code, so this is the best option without using JNI."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:734
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:735
+#: basic_mapping.xml:734
 #, no-c-format
-msgid "For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), you may use <literal>identity</literal> key generation. For databases that support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you may use <literal>sequence</literal> style key generation. Both these strategies require two SQL queries to insert a new object."
+msgid "For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), you can use <literal>identity</literal> key generation. For databases that support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you can use <literal>sequence</literal> style key generation. Both of these strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:743
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -875,7 +875,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:745
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0\">\n"
@@ -884,43 +884,43 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:747
+#: basic_mapping.xml:746
 #, no-c-format
-msgid "For cross-platform development, the <literal>native</literal> strategy will choose from the <literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</literal> strategies, dependant upon the capabilities of the underlying database."
+msgid "For cross-platform development, the <literal>native</literal> strategy will, depending on the capabilities of the underlying database, choose from the <literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</literal> strategies."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:756
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:757
+#: basic_mapping.xml:755
 #, no-c-format
-msgid "If you want the application to assign identifiers (as opposed to having Hibernate generate them), you may use the <literal>assigned</literal> generator. This special generator will use the identifier value already assigned to the object's identifier property. This generator is used when the primary key is a natural key instead of a surrogate key. This is the default behavior if you do no specify a <literal>&lt;generator&gt;</literal> element."
+msgid "If you want the application to assign identifiers, as opposed to having Hibernate generate them, you can use the <literal>assigned</literal> generator. This special generator uses the identifier value already assigned to the object's identifier property. The generator is used when the primary key is a natural key instead of a surrogate key. This is the default behavior if you do not specify a <literal>&lt;generator&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:766
+#: basic_mapping.xml:764
 #, no-c-format
-msgid "Choosing the <literal>assigned</literal> generator makes Hibernate use <literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to the database to determine if an instance is transient or detached, unless there is a version or timestamp property, or you define <literal>Interceptor.isUnsaved()</literal>."
+msgid "The <literal>assigned</literal> generator makes Hibernate use <literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go to the database to determine if an instance is transient or detached, unless there is a version or timestamp property, or you define <literal>Interceptor.isUnsaved()</literal>."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:776
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:777
+#: basic_mapping.xml:775
 #, no-c-format
-msgid "For legacy schemas only (Hibernate does not generate DDL with triggers)."
+msgid "Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:781
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
       "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -931,157 +931,157 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:783
+#: basic_mapping.xml:781
 #, no-c-format
-msgid "In the above example, there is a unique valued property named <literal>socialSecurityNumber</literal> defined by the class, as a natural key, and a surrogate key named <literal>person_id</literal> whose value is generated by a trigger."
+msgid "In the above example, there is a unique valued property named <literal>socialSecurityNumber</literal>. It is defined by the class, as a natural key and a surrogate key named <literal>person_id</literal>, whose value is generated by a trigger."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:795
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:797
+#: basic_mapping.xml:795
 #, no-c-format
-msgid "Starting with release 3.2.3, there are 2 new generators which represent a re-thinking of 2 different aspects of identifier generation. The first aspect is database portability; the second is optimization (not having to query the database for every request for a new identifier value). These two new generators are intended to take the place of some of the named generators described above (starting in 3.3.x); however, they are included in the current releases and can be referenced by FQN."
+msgid "Starting with release 3.2.3, there are 2 new generators which represent a re-thinking of 2 different aspects of identifier generation. The first aspect is database portability; the second is optimization Optimization means that you do not have to query the database for every request for a new identifier value. These two new generators are intended to take the place of some of the named generators described above, starting in 3.3.x. However, they are included in the current releases and can be referenced by FQN."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:805
+#: basic_mapping.xml:803
 #, no-c-format
-msgid "The first of these new generators is <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</literal> which is intended firstly as a replacement for the <literal>sequence</literal> generator and secondly as a better portability generator than <literal>native</literal> (because <literal>native</literal> (generally) chooses between <literal>identity</literal> and <literal>sequence</literal> which have largely different semantics which can cause subtle isssues in applications eyeing portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</literal> however achieves portability in a different manner. It chooses between using a table or a sequence in the database to store its incrementing values depending on the capabilities of the dialect being used. The difference between this and <literal>native</literal> is that table-based and sequence-based storage have the same exact semantic (in fact sequences are exactly what Hibernate tries to emmulate with its!
  table-based generators). This generator has a number of configuration parameters:"
+msgid "The first of these new generators is <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</literal> which is intended, firstly, as a replacement for the <literal>sequence</literal> generator and, secondly, as a better portability generator than <literal>native</literal>. This is because <literal>native</literal> generally chooses between <literal>identity</literal> and <literal>sequence</literal> which have largely different semantics that can cause subtle issues in applications eyeing portability. <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</literal>, however, achieves portability in a different manner. It chooses between a table or a sequence in the database to store its incrementing values, depending on the capabilities of the dialect being used. The difference between this and <literal>native</literal> is that table-based and sequence-based storage have the same exact semantic. In fact, sequences are exactly what Hibernate tries to emulate with!
  its table-based generators. This generator has a number of configuration parameters:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:819
+#: basic_mapping.xml:817
 #, no-c-format
-msgid "<literal>sequence_name</literal> (optional, defaults to <literal>hibernate_sequence</literal>): The name of the sequence (or table) to be used."
+msgid "<literal>sequence_name</literal> (optional, defaults to <literal>hibernate_sequence</literal>): the name of the sequence or table to be used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:825
+#: basic_mapping.xml:823
 #, no-c-format
-msgid "<literal>initial_value</literal> (optional, defaults to <literal>1</literal>): The initial value to be retrieved from the sequence/table. In sequence creation terms, this is analogous to the clause typical named \"STARTS WITH\"."
+msgid "<literal>initial_value</literal> (optional, defaults to <literal>1</literal>): the initial value to be retrieved from the sequence/table. In sequence creation terms, this is analogous to the clause typically named \"STARTS WITH\"."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:832
+#: basic_mapping.xml:830
 #, no-c-format
-msgid "<literal>increment_size</literal> (optional, defaults to <literal>1</literal>): The value by which subsequent calls to the sequence/table should differ. In sequence creation terms, this is analogous to the clause typical named \"INCREMENT BY\"."
+msgid "<literal>increment_size</literal> (optional - defaults to <literal>1</literal>): the value by which subsequent calls to the sequence/table should differ. In sequence creation terms, this is analogous to the clause typically named \"INCREMENT BY\"."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:839
+#: basic_mapping.xml:837
 #, no-c-format
-msgid "<literal>force_table_use</literal> (optional, defaults to <literal>false</literal>): Should we force the use of a table as the backing structure even though the dialect might support sequence?"
+msgid "<literal>force_table_use</literal> (optional - defaults to <literal>false</literal>): should we force the use of a table as the backing structure even though the dialect might support sequence?"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:846
+#: basic_mapping.xml:844
 #, no-c-format
-msgid "<literal>value_column</literal> (optional, defaults to <literal>next_val</literal>): Only relevant for table structures! The name of the column on the table which is used to hold the value."
+msgid "<literal>value_column</literal> (optional - defaults to <literal>next_val</literal>): only relevant for table structures, it is the name of the column on the table which is used to hold the value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:853
+#: basic_mapping.xml:851
 #, no-c-format
-msgid "<literal>optimizer</literal> (optional, defaults to <literal>none</literal>): See"
+msgid "<literal>optimizer</literal> (optional - defaults to <literal>none</literal>): See"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:860
+#: basic_mapping.xml:858
 #, no-c-format
-msgid "The second of these new generators is <literal>org.hibernate.id.enhanced.TableGenerator</literal> which is intended firstly as a replacement for the <literal>table</literal> generator (although it actually functions much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and secondly as a re-implementation of <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable optimiziers. Essentially this generator defines a table capable of holding a number of different increment values simultaneously by using multiple distinctly keyed rows. This generator has a number of configuration parameters:"
+msgid "The second of these new generators is <literal>org.hibernate.id.enhanced.TableGenerator</literal>, which is intended, firstly, as a replacement for the <literal>table</literal> generator, even though it actually functions much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>, and secondly, as a re-implementation of <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal> that utilizes the notion of pluggable optimizers. Essentially this generator defines a table capable of holding a number of different increment values simultaneously by using multiple distinctly keyed rows. This generator has a number of configuration parameters:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:870
+#: basic_mapping.xml:868
 #, no-c-format
-msgid "<literal>table_name</literal> (optional, defaults to <literal>hibernate_sequences</literal>): The name of the table to be used."
+msgid "<literal>table_name</literal> (optional - defaults to <literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:876
+#: basic_mapping.xml:874
 #, no-c-format
-msgid "<literal>value_column_name</literal> (optional, defaults to <literal>next_val</literal>): The name of the column on the table which is used to hold the value."
+msgid "<literal>value_column_name</literal> (optional - defaults to <literal>next_val</literal>): the name of the column on the table that is used to hold the value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:882
+#: basic_mapping.xml:880
 #, no-c-format
-msgid "<literal>segment_column_name</literal> (optional, defaults to <literal>sequence_name</literal>): The name of the column on the table which is used to hold the \"segement key\". This is the value which distinctly identifies which increment value to use."
+msgid "<literal>segment_column_name</literal> (optional - defaults to <literal>sequence_name</literal>): the name of the column on the table that is used to hold the \"segment key\". This is the value which identifies which increment value to use."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:889
+#: basic_mapping.xml:887
 #, no-c-format
-msgid "<literal>segment_value</literal> (optional, defaults to <literal>default</literal>): The \"segment key\" value for the segment from which we want to pull increment values for this generator."
+msgid "<literal>segment_value</literal> (optional - defaults to <literal>default</literal>): The \"segment key\" value for the segment from which we want to pull increment values for this generator."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:896
+#: basic_mapping.xml:894
 #, no-c-format
-msgid "<literal>segment_value_length</literal> (optional, defaults to <literal>255</literal>): Used for schema generation; the column size to create this segment key column."
+msgid "<literal>segment_value_length</literal> (optional - defaults to <literal>255</literal>): Used for schema generation; the column size to create this segment key column."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:902
+#: basic_mapping.xml:900
 #, no-c-format
-msgid "<literal>initial_value</literal> (optional, defaults to <literal>1</literal>): The initial value to be retrieved from the table."
+msgid "<literal>initial_value</literal> (optional - defaults to <literal>1</literal>): The initial value to be retrieved from the table."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:908
+#: basic_mapping.xml:906
 #, no-c-format
-msgid "<literal>increment_size</literal> (optional, defaults to <literal>1</literal>): The value by which subsequent calls to the table should differ."
+msgid "<literal>increment_size</literal> (optional - defaults to <literal>1</literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:914
+#: basic_mapping.xml:912
 #, no-c-format
-msgid "<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+msgid "<literal>optimizer</literal> (optional - defaults to <literal></literal>): See"
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:924
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:925
+#: basic_mapping.xml:923
 #, no-c-format
-msgid "For identifier generators which store values in the database, it is inefficient for them to hit the database on each and every call to generate a new identifier value. Instead, you'd ideally want to group a bunch of them in memory and only hit the database when you have exhausted your in-memory value group. This is the role of the pluggable optimizers. Currently only the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> support this notion."
+msgid "For identifier generators that store values in the database, it is inefficient for them to hit the database on each and every call to generate a new identifier value. Instead, you can group a bunch of them in memory and only hit the database when you have exhausted your in-memory value group. This is the role of the pluggable optimizers. Currently only the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> support this operation."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:933
+#: basic_mapping.xml:931
 #, no-c-format
-msgid "<literal>none</literal> (generally this is the default if no optimizer was specified): This says to not perform any optimizations, and hit the database each and every request."
+msgid "<literal>none</literal> (generally this is the default if no optimizer was specified): this will not perform any optimizations and hit the database for each and every request."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:939
+#: basic_mapping.xml:937
 #, no-c-format
-msgid "<literal>hilo</literal>: applies a hi/lo algorithm around the database retrieved values. The values from the database for this optimizer are expected to be sequential. The values retrieved from the database structure for this optimizer indicates the \"group number\"; the <literal>increment_size</literal> is multiplied by that value in memory to define a group \"hi value\"."
+msgid "<literal>hilo</literal>: applies a hi/lo algorithm around the database retrieved values. The values from the database for this optimizer are expected to be sequential. The values retrieved from the database structure for this optimizer indicates the \"group number\". The <literal>increment_size</literal> is multiplied by that value in memory to define a group \"hi value\"."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:948
+#: basic_mapping.xml:946
 #, no-c-format
-msgid "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, this optimizers attempts to minimize the number of hits to the database. Here, however, we simply store the starting value for the \"next group\" into the database structure rather than a sequential value in combination with an in-memory grouping algorithm. <literal>increment_size</literal> here refers to the values coming from the database."
+msgid "<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this optimizer attempts to minimize the number of hits to the database. Here, however, we simply store the starting value for the \"next group\" into the database structure rather than a sequential value in combination with an in-memory grouping algorithm. Here, <literal>increment_size</literal> refers to the values coming from the database."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:961
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:963
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
       "<![CDATA[<composite-id\n"
@@ -1098,13 +1098,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:963
 #, no-c-format
-msgid "For a table with a composite key, you may map multiple properties of the class as identifier properties. The <literal>&lt;composite-id&gt;</literal> element accepts <literal>&lt;key-property&gt;</literal> property mappings and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
+msgid "A table with a composite key can be mapped with multiple properties of the class as identifier properties. The <literal>&lt;composite-id&gt;</literal> element accepts <literal>&lt;key-property&gt;</literal> property mappings and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:972
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
       "<![CDATA[<composite-id>\n"
@@ -1114,25 +1114,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:974
+#: basic_mapping.xml:972
 #, no-c-format
-msgid "Your persistent class <emphasis>must</emphasis> override <literal>equals()</literal> and <literal>hashCode()</literal> to implement composite identifier equality. It must also implements <literal>Serializable</literal>."
+msgid "The persistent class <emphasis>must</emphasis> override <literal>equals()</literal> and <literal>hashCode()</literal> to implement composite identifier equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:980
+#: basic_mapping.xml:978
 #, no-c-format
-msgid "Unfortunately, this approach to composite identifiers means that a persistent object is its own identifier. There is no convenient \"handle\" other than the object itself. You must instantiate an instance of the persistent class itself and populate its identifier properties before you can <literal>load()</literal> the persistent state associated with a composite key. We call this approach an <emphasis>embedded</emphasis> composite identifier, and discourage it for serious applications."
+msgid "Unfortunately, this approach means that a persistent object is its own identifier. There is no convenient \"handle\" other than the object itself. You must instantiate an instance of the persistent class itself and populate its identifier properties before you can <literal>load()</literal> the persistent state associated with a composite key. We call this approach an <emphasis>embedded</emphasis> composite identifier, and discourage it for serious applications."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:989
+#: basic_mapping.xml:987
 #, no-c-format
 msgid "A second approach is what we call a <emphasis>mapped</emphasis> composite identifier, where the identifier properties named inside the <literal>&lt;composite-id&gt;</literal> element are duplicated on both the persistent class and a separate identifier class."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:995
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
       "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -1142,67 +1142,73 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:997
+#: basic_mapping.xml:995
 #, no-c-format
-msgid "In this example, both the composite identifier class, <literal>MedicareId</literal>, and the entity class itself have properties named <literal>medicareNumber</literal> and <literal>dependent</literal>. The identifier class must override <literal>equals()</literal> and <literal>hashCode()</literal> and implement. <literal>Serializable</literal>. The disadvantage of this approach is quite obvious&mdash;code duplication."
+msgid "In this example, both the composite identifier class, <literal>MedicareId</literal>, and the entity class itself have properties named <literal>medicareNumber</literal> and <literal>dependent</literal>. The identifier class must override <literal>equals()</literal> and <literal>hashCode()</literal> and implement <literal>Serializable</literal>. The main disadvantage of this approach is code duplication."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1006
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid "The following attributes are used to specify a mapped composite identifier:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1012
+#: basic_mapping.xml:1010
 #, no-c-format
-msgid "<literal>mapped</literal> (optional, defaults to <literal>false</literal>): indicates that a mapped composite identifier is used, and that the contained property mappings refer to both the entity class and the composite identifier class."
+msgid "<literal>mapped</literal> (optional - defaults to <literal>false</literal>): indicates that a mapped composite identifier is used, and that the contained property mappings refer to both the entity class and the composite identifier class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1020
+#: basic_mapping.xml:1018
 #, no-c-format
-msgid "<literal>class</literal> (optional, but required for a mapped composite identifier): The class used as a composite identifier."
+msgid "<literal>class</literal> (optional - but required for a mapped composite identifier): the class used as a composite identifier."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1027
+#: basic_mapping.xml:1025
 #, no-c-format
-msgid "We will describe a third, even more convenient approach where the composite identifier is implemented as a component class in <xref linkend=\"components-compositeid\"/>. The attributes described below apply only to this alternative approach:"
+msgid "We will describe a third, even more convenient approach, where the composite identifier is implemented as a component class in <xref linkend=\"components-compositeid\"/>. The attributes described below apply only to this alternative approach:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1035
+#: basic_mapping.xml:1033
 #, no-c-format
-msgid "<literal>name</literal> (optional, required for this approach): A property of component type that holds the composite identifier (see chapter 9)."
+msgid "<literal>name</literal> (optional - required for this approach): a property of component type that holds the composite identifier. Please see chapter 9 for more information."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1047
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372 basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905 basic_mapping.xml:2484
 #, no-c-format
-msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): The component class used as a composite identifier (see next section)."
+msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): the strategy Hibernate uses for accessing the property value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1054
+#: basic_mapping.xml:1045
 #, no-c-format
-msgid "This third approach, an <emphasis>identifier component</emphasis> is the one we recommend for almost all applications."
+msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): the component class used as a composite identifier. Please see the next section for more information."
 msgstr ""
 
+#. Tag: para
+#: basic_mapping.xml:1052
+#, no-c-format
+msgid "The third approach, an <emphasis>identifier component</emphasis>, is recommended for almost all applications."
+msgstr ""
+
 #. Tag: title
-#: basic_mapping.xml:1062
+#: basic_mapping.xml:1060
 #, no-c-format
-msgid "discriminator"
+msgid "Discriminator"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1064
+#: basic_mapping.xml:1062
 #, no-c-format
-msgid "The <literal>&lt;discriminator&gt;</literal> element is required for polymorphic persistence using the table-per-class-hierarchy mapping strategy and declares a discriminator column of the table. The discriminator column contains marker values that tell the persistence layer what subclass to instantiate for a particular row. A restricted set of types may be used: <literal>string</literal>, <literal>character</literal>, <literal>integer</literal>, <literal>byte</literal>, <literal>short</literal>, <literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</literal>."
+msgid "The <literal>&lt;discriminator&gt;</literal> element is required for polymorphic persistence using the table-per-class-hierarchy mapping strategy. It declares a discriminator column of the table. The discriminator column contains marker values that tell the persistence layer what subclass to instantiate for a particular row. A restricted set of types can be used: <literal>string</literal>, <literal>character</literal>, <literal>integer</literal>, <literal>byte</literal>, <literal>short</literal>, <literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1082
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
       "<![CDATA[<discriminator\n"
@@ -1215,55 +1221,55 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1085
+#: basic_mapping.xml:1083
 #, no-c-format
-msgid "<literal>column</literal> (optional - defaults to <literal>class</literal>) the name of the discriminator column."
+msgid "<literal>column</literal> (optional - defaults to <literal>class</literal>): the name of the discriminator column."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1091
+#: basic_mapping.xml:1089
 #, no-c-format
-msgid "<literal>type</literal> (optional - defaults to <literal>string</literal>) a name that indicates the Hibernate type"
+msgid "<literal>type</literal> (optional - defaults to <literal>string</literal>): a name that indicates the Hibernate type"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1097
+#: basic_mapping.xml:1095
 #, no-c-format
-msgid "<literal>force</literal> (optional - defaults to <literal>false</literal>) \"force\" Hibernate to specify allowed discriminator values even when retrieving all instances of the root class."
+msgid "<literal>force</literal> (optional - defaults to <literal>false</literal>): \"forces\" Hibernate to specify the allowed discriminator values, even when retrieving all instances of the root class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1104
+#: basic_mapping.xml:1102
 #, no-c-format
-msgid "<literal>insert</literal> (optional - defaults to <literal>true</literal>) set this to <literal>false</literal> if your discriminator column is also part of a mapped composite identifier. (Tells Hibernate to not include the column in SQL <literal>INSERT</literal>s.)"
+msgid "<literal>insert</literal> (optional - defaults to <literal>true</literal>): set this to <literal>false</literal> if your discriminator column is also part of a mapped composite identifier. It tells Hibernate not to include the column in SQL <literal>INSERTs</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1112
+#: basic_mapping.xml:1110
 #, no-c-format
-msgid "<literal>formula</literal> (optional) an arbitrary SQL expression that is executed when a type has to be evaluated. Allows content-based discrimination."
+msgid "<literal>formula</literal> (optional): an arbitrary SQL expression that is executed when a type has to be evaluated. It allows content-based discrimination."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1120
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid "Actual values of the discriminator column are specified by the <literal>discriminator-value</literal> attribute of the <literal>&lt;class&gt;</literal> and <literal>&lt;subclass&gt;</literal> elements."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1126
+#: basic_mapping.xml:1124
 #, no-c-format
-msgid "The <literal>force</literal> attribute is (only) useful if the table contains rows with \"extra\" discriminator values that are not mapped to a persistent class. This will not usually be the case."
+msgid "The <literal>force</literal> attribute is only useful if the table contains rows with \"extra\" discriminator values that are not mapped to a persistent class. This will not usually be the case."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1132
+#: basic_mapping.xml:1130
 #, no-c-format
-msgid "Using the <literal>formula</literal> attribute you can declare an arbitrary SQL expression that will be used to evaluate the type of a row:"
+msgid "The <literal>formula</literal> attribute allows you to declare an arbitrary SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1137
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
       "<![CDATA[<discriminator\n"
@@ -1272,19 +1278,19 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1142
+#: basic_mapping.xml:1140
 #, no-c-format
-msgid "version (optional)"
+msgid "Version (optional)"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1144
+#: basic_mapping.xml:1142
 #, no-c-format
-msgid "The <literal>&lt;version&gt;</literal> element is optional and indicates that the table contains versioned data. This is particularly useful if you plan to use <emphasis>long transactions</emphasis> (see below)."
+msgid "The <literal>&lt;version&gt;</literal> element is optional and indicates that the table contains versioned data. This is particularly useful if you plan to use <emphasis>long transactions</emphasis>. See below for more information:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1160
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
       "<![CDATA[<version\n"
@@ -1300,67 +1306,73 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1163
+#: basic_mapping.xml:1161
 #, no-c-format
-msgid "<literal>column</literal> (optional - defaults to the property name): The name of the column holding the version number."
+msgid "<literal>column</literal> (optional - defaults to the property name): the name of the column holding the version number."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1169
+#: basic_mapping.xml:1167
 #, 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 ""
 
 #. Tag: para
-#: basic_mapping.xml:1174
+#: basic_mapping.xml:1172
 #, no-c-format
-msgid "<literal>type</literal> (optional - defaults to <literal>integer</literal>): The type of the version number."
+msgid "<literal>type</literal> (optional - defaults to <literal>integer</literal>): the type of the version number."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1186
+#: basic_mapping.xml:1178
 #, no-c-format
-msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</literal>): A version property value that indicates that an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session. (<literal>undefined</literal> specifies that the identifier property value should be used.)"
+msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): the strategy Hibernate uses to access the property value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1195
+#: basic_mapping.xml:1184
 #, no-c-format
-msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this version property value is actually generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link>."
+msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</literal>): a version property value that indicates that an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session. <literal>Undefined</literal> specifies that the identifier property value should be used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1202
+#: basic_mapping.xml:1193
 #, no-c-format
-msgid "<literal>insert</literal> (optional - defaults to <literal>true</literal>): Specifies whether the version column should be included in SQL insert statements. May be set to <literal>false</literal> if and only if the database column is defined with a default value of <literal>0</literal>."
+msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): specifies that this version property value is generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link> for more information."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1212
+#: basic_mapping.xml:1200
 #, no-c-format
-msgid "Version numbers may be of Hibernate type <literal>long</literal>, <literal>integer</literal>, <literal>short</literal>, <literal>timestamp</literal> or <literal>calendar</literal>."
+msgid "<literal>insert</literal> (optional - defaults to <literal>true</literal>): specifies whether the version column should be included in SQL insert statements. It can be set to <literal>false</literal> if the database column is defined with a default value of <literal>0</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1217
+#: basic_mapping.xml:1210
 #, no-c-format
-msgid "A version or timestamp property should never be null for a detached instance, so Hibernate will detect any instance with a null version or timestamp as transient, no matter what other <literal>unsaved-value</literal> strategies are specified. <emphasis>Declaring a nullable version or timestamp property is an easy way to avoid any problems with transitive reattachment in Hibernate, especially useful for people using assigned identifiers or composite keys!</emphasis>"
+msgid "Version numbers can be of Hibernate type <literal>long</literal>, <literal>integer</literal>, <literal>short</literal>, <literal>timestamp</literal> or <literal>calendar</literal>."
 msgstr ""
 
+#. Tag: para
+#: basic_mapping.xml:1215
+#, no-c-format
+msgid "A version or timestamp property should never be null for a detached instance. Hibernate will detect any instance with a null version or timestamp as transient, irrespective of what other <literal>unsaved-value</literal> strategies are specified. <emphasis>Declaring a nullable version or timestamp property is an easy way to avoid problems with transitive reattachment in Hibernate. It is especially useful for people using assigned identifiers or composite keys</emphasis>."
+msgstr ""
+
 #. Tag: title
-#: basic_mapping.xml:1228
+#: basic_mapping.xml:1226
 #, no-c-format
-msgid "timestamp (optional)"
+msgid "Timestamp (optional)"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1230
+#: basic_mapping.xml:1228
 #, no-c-format
-msgid "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the table contains timestamped data. This is intended as an alternative to versioning. Timestamps are by nature a less safe implementation of optimistic locking. However, sometimes the application might use the timestamps in other ways."
+msgid "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the table contains timestamped data. This provides an alternative to versioning. Timestamps are a less safe implementation of optimistic locking. However, sometimes the application might use the timestamps in other ways."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1246
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
       "<![CDATA[<timestamp\n"
@@ -1375,55 +1387,61 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1249
+#: basic_mapping.xml:1247
 #, no-c-format
-msgid "<literal>column</literal> (optional - defaults to the property name): The name of a column holding the timestamp."
+msgid "<literal>column</literal> (optional - defaults to the property name): the name of a column holding the timestamp."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1255
+#: basic_mapping.xml:1253
 #, no-c-format
-msgid "<literal>name</literal>: The name of a JavaBeans style property of Java type <literal>Date</literal> or <literal>Timestamp</literal> of the persistent class."
+msgid "<literal>name</literal>: the name of a JavaBeans style property of Java type <literal>Date</literal> or <literal>Timestamp</literal> of the persistent class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1268
+#: basic_mapping.xml:1266
 #, no-c-format
-msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>null</literal>): A version property value that indicates that an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session. (<literal>undefined</literal> specifies that the identifier property value should be used.)"
+msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>null</literal>): a version property value that indicates that an instance is newly instantiated (unsaved), distinguishing it from detached instances that were saved or loaded in a previous session. <literal>Undefined</literal> specifies that the identifier property value should be used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1277
+#: basic_mapping.xml:1275
 #, no-c-format
-msgid "<literal>source</literal> (optional - defaults to <literal>vm</literal>): From where should Hibernate retrieve the timestamp value? From the database, or from the current JVM? Database-based timestamps incur an overhead because Hibernate must hit the database in order to determine the \"next value\", but will be safer for use in clustered environments. Note also, that not all <literal>Dialect</literal>s are known to support retrieving of the database's current timestamp, while others might be unsafe for usage in locking due to lack of precision (Oracle 8 for example)."
+msgid "<literal>source</literal> (optional - defaults to <literal>vm</literal>): Where should Hibernate retrieve the timestamp value from? From the database, or from the current JVM? Database-based timestamps incur an overhead because Hibernate must hit the database in order to determine the \"next value\". It is safer to use in clustered environments. Not all <literal>Dialects</literal> are known to support the retrieval of the database's current timestamp. Others may also be unsafe for usage in locking due to lack of precision (Oracle 8, for example)."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1289
+#: basic_mapping.xml:1287
 #, no-c-format
-msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this timestamp property value is actually generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link>."
+msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): specifies that this timestamp property value is actually generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link> for more information."
 msgstr ""
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1298
+#: basic_mapping.xml:1299
 #, no-c-format
-msgid "Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp\"&gt;</literal>"
+msgid "<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp\"&gt;</literal>"
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1311
 #, no-c-format
-msgid "property"
+msgid "Property"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1310
+#: basic_mapping.xml:1313
 #, no-c-format
-msgid "The <literal>&lt;property&gt;</literal> element declares a persistent, JavaBean style property of the class."
+msgid "The <literal>&lt;property&gt;</literal> element declares a persistent JavaBean style property of the class."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1332
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
       "<![CDATA[<property\n"
@@ -1449,115 +1467,109 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1335
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid "<literal>name</literal>: the name of the property, with an initial lowercase letter."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1341
+#: basic_mapping.xml:1344
 #, no-c-format
-msgid "<literal>column</literal> (optional - defaults to the property name): the name of the mapped database table column. This may also be specified by nested <literal>&lt;column&gt;</literal> element(s)."
+msgid "<literal>column</literal> (optional - defaults to the property name): the name of the mapped database table column. This can also be specified by nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1348
+#: basic_mapping.xml:1356
 #, no-c-format
-msgid "<literal>type</literal> (optional): a name that indicates the Hibernate type."
+msgid "<literal>update, insert</literal> (optional - defaults to <literal>true</literal>): specifies that the mapped columns should be included in SQL <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. Setting both to <literal>false</literal> allows a pure \"derived\" property whose value is initialized from some other property that maps to the same column(s), or by a trigger or other application."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1353
+#: basic_mapping.xml:1365
 #, no-c-format
-msgid "<literal>update, insert</literal> (optional - defaults to <literal>true</literal>) : specifies that the mapped columns should be included in SQL <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. Setting both to <literal>false</literal> allows a pure \"derived\" property whose value is initialized from some other property that maps to the same colum(s) or by a trigger or other application."
-msgstr ""
-
-#. Tag: para
-#: basic_mapping.xml:1362
-#, no-c-format
 msgid "<literal>formula</literal> (optional): an SQL expression that defines the value for a <emphasis>computed</emphasis> property. Computed properties do not have a column mapping of their own."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1375
+#: basic_mapping.xml:1378
 #, no-c-format
-msgid "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): Specifies that this property should be fetched lazily when the instance variable is first accessed (requires build-time bytecode instrumentation)."
+msgid "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): specifies that this property should be fetched lazily when the instance variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1382
+#: basic_mapping.xml:1385
 #, no-c-format
-msgid "<literal>unique</literal> (optional): Enable the DDL generation of a unique constraint for the columns. Also, allow this to be the target of a <literal>property-ref</literal>."
+msgid "<literal>unique</literal> (optional): enables the DDL generation of a unique constraint for the columns. Also, allow this to be the target of a <literal>property-ref</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1389
+#: basic_mapping.xml:1392
 #, no-c-format
-msgid "<literal>not-null</literal> (optional): Enable the DDL generation of a nullability constraint for the columns."
+msgid "<literal>not-null</literal> (optional): enables the DDL generation of a nullability constraint for the columns."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1395
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Specifies that updates to this property do or do not require acquisition of the optimistic lock. In other words, determines if a version increment should occur when this property is dirty."
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): specifies that updates to this property do or do not require acquisition of the optimistic lock. In other words, it determines if a version increment should occur when this property is dirty."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1403
+#: basic_mapping.xml:1406
 #, no-c-format
-msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): Specifies that this property value is actually generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link>."
+msgid "<literal>generated</literal> (optional - defaults to <literal>never</literal>): specifies that this property value is actually generated by the database. See the discussion of <link linkend=\"mapping-generated\">generated properties</link> for more information."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1412
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1418
+#: basic_mapping.xml:1421
 #, no-c-format
-msgid "The name of a Hibernate basic type (eg. <literal>integer, string, character, date, timestamp, float, binary, serializable, object, blob</literal>)."
+msgid "The name of a Hibernate basic type: <literal>integer, string, character, date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1424
+#: basic_mapping.xml:1427
 #, no-c-format
-msgid "The name of a Java class with a default basic type (eg. <literal>int, float, char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</literal>)."
+msgid "The name of a Java class with a default basic type: <literal>int, float, char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</literal> etc."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1430
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1435
+#: basic_mapping.xml:1438
 #, no-c-format
-msgid "The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</literal>)."
+msgid "The class name of a custom type: <literal>com.illflow.type.MyCustomType</literal> etc."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1441
+#: basic_mapping.xml:1444
 #, no-c-format
-msgid "If you do not specify a type, Hibernate will use reflection upon the named property to take a guess at the correct Hibernate type. Hibernate will try to interpret the name of the return class of the property getter using rules 2, 3, 4 in that order. However, this is not always enough. In certain cases you will still need the <literal>type</literal> attribute. (For example, to distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a custom type.)"
+msgid "If you do not specify a type, Hibernate will use reflection upon the named property and guess the correct Hibernate type. Hibernate will attempt to interpret the name of the return class of the property getter using, in order, rules 2, 3, and 4. In certain cases you will need the <literal>type</literal> attribute. For example, to distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a custom type."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1451
+#: basic_mapping.xml:1454
 #, no-c-format
-msgid "The <literal>access</literal> attribute lets you control how Hibernate will access the property at runtime. By default, Hibernate will call the property get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate will bypass the get/set pair and access the field directly, using reflection. You may specify your own strategy for property access by naming a class that implements the interface <literal>org.hibernate.property.PropertyAccessor</literal>."
+msgid "The <literal>access</literal> attribute allows you to control how Hibernate accesses the property at runtime. By default, Hibernate will call the property get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate will bypass the get/set pair and access the field directly using reflection. You can specify your own strategy for property access by naming a class that implements the interface <literal>org.hibernate.property.PropertyAccessor</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1460
+#: basic_mapping.xml:1463
 #, no-c-format
-msgid "An especially powerful feature are derived properties. These properties are by definition read-only, the property value is computed at load time. You declare the computation as a SQL expression, this translates to a <literal>SELECT</literal> clause subquery in the SQL query that loads an instance:"
+msgid "A powerful feature is derived properties. These properties are by definition read-only. The property value is computed at load time. You declare the computation as an SQL expression. This then translates to a <literal>SELECT</literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1467
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -1569,25 +1581,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1469
+#: basic_mapping.xml:1472
 #, no-c-format
-msgid "Note that you can reference the entities own table by not declaring an alias on a particular column (<literal>customerId</literal> in the given example). Also note that you can use the nested <literal>&lt;formula&gt;</literal> mapping element if you don't like to use the attribute."
+msgid "You can reference the entity table by not declaring an alias on a particular column. This would be <literal>customerId</literal> in the given example. You can also use the nested <literal>&lt;formula&gt;</literal> mapping element if you do not want to use the attribute."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1479
+#: basic_mapping.xml:1482
 #, no-c-format
-msgid "many-to-one"
+msgid "Many-to-one"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1481
+#: basic_mapping.xml:1484
 #, no-c-format
-msgid "An ordinary association to another persistent class is declared using a <literal>many-to-one</literal> element. The relational model is a many-to-one association: a foreign key in one table is referencing the primary key column(s) of the target table."
+msgid "An ordinary association to another persistent class is declared using a <literal>many-to-one</literal> element. The relational model is a many-to-one association; a foreign key in one table is referencing the primary key column(s) of the target table."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1509
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
       "<![CDATA[<many-to-one\n"
@@ -1616,169 +1628,163 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
 #, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+msgid "<literal>name</literal>: the name of the property."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1517 basic_mapping.xml:2308
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, no-c-format
-msgid "<literal>column</literal> (optional): The name of the foreign key column. This may also be specified by nested <literal>&lt;column&gt;</literal> element(s)."
+msgid "<literal>column</literal> (optional): the name of the foreign key column. This can also be specified by nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1524 basic_mapping.xml:1698
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
 #, no-c-format
-msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): The name of the associated class."
+msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): the name of the associated class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1530
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
 #, no-c-format
-msgid "<literal>cascade</literal> (optional): Specifies which operations should be cascaded from the parent object to the associated object."
+msgid "<literal>cascade</literal> (optional): specifies which operations should be cascaded from the parent object to the associated object."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1536 basic_mapping.xml:1719
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, no-c-format
-msgid "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): Chooses between outer-join fetching or sequential select fetching."
+msgid "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1542
+#: basic_mapping.xml:1545
 #, no-c-format
-msgid "<literal>update, insert</literal> (optional - defaults to <literal>true</literal>) specifies that the mapped columns should be included in SQL <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. Setting both to <literal>false</literal> allows a pure \"derived\" association whose value is initialized from some other property that maps to the same colum(s) or by a trigger or other application."
+msgid "<literal>update, insert</literal> (optional - defaults to <literal>true</literal>): specifies that the mapped columns should be included in SQL <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. Setting both to <literal>false</literal> allows a pure \"derived\" association whose value is initialized from another property that maps to the same column(s), or by a trigger or other application."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1551
+#: basic_mapping.xml:1554
 #, no-c-format
-msgid "<literal>property-ref</literal>: (optional) The name of a property of the associated class that is joined to this foreign key. If not specified, the primary key of the associated class is used."
+msgid "<literal>property-ref</literal> (optional): the name of a property of the associated class that is joined to this foreign key. If not specified, the primary key of the associated class is used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1564
+#: basic_mapping.xml:1567
 #, no-c-format
-msgid "<literal>unique</literal> (optional): Enable the DDL generation of a unique constraint for the foreign-key column. Also, allow this to be the target of a <literal>property-ref</literal>. This makes the association multiplicity effectively one to one."
+msgid "<literal>unique</literal> (optional): enables the DDL generation of a unique constraint for the foreign-key column. By allowing this to be the target of a <literal>property-ref</literal>, you can make the association multiplicity one-to-one."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1572
+#: basic_mapping.xml:1575
 #, no-c-format
-msgid "<literal>not-null</literal> (optional): Enable the DDL generation of a nullability constraint for the foreign key columns."
+msgid "<literal>not-null</literal> (optional): enables the DDL generation of a nullability constraint for the foreign key columns."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1578
+#: basic_mapping.xml:1589
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Specifies that updates to this property do or do not require acquisition of the optimistic lock. In other words, dertermines if a version increment should occur when this property is dirty."
+msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): by default, single point associations are proxied. <literal>lazy=\"no-proxy\"</literal> specifies that the property should be fetched lazily when the instance variable is first accessed. This requires build-time bytecode instrumentation. <literal>lazy=\"false\"</literal> specifies that the association will always be eagerly fetched."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1586
+#: basic_mapping.xml:1599
 #, no-c-format
-msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): By default, single point associations are proxied. <literal>lazy=\"no-proxy\"</literal> specifies that the property should be fetched lazily when the instance variable is first accessed (requires build-time bytecode instrumentation). <literal>lazy=\"false\"</literal> specifies that the association will always be eagerly fetched."
+msgid "<literal>not-found</literal> (optional - defaults to <literal>exception</literal>): specifies how foreign keys that reference missing rows will be handled. <literal>ignore</literal> will treat a missing row as a null association."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1596
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
 #, no-c-format
-msgid "<literal>not-found</literal> (optional - defaults to <literal>exception</literal>): Specifies how foreign keys that reference missing rows will be handled: <literal>ignore</literal> will treat a missing row as a null association."
+msgid "<literal>entity-name</literal> (optional): the entity name of the associated class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1603 basic_mapping.xml:1757
+#: basic_mapping.xml:1611
 #, no-c-format
-msgid "<literal>entity-name</literal> (optional): The entity name of the associated class."
-msgstr ""
-
-#. Tag: para
-#: basic_mapping.xml:1608
-#, no-c-format
 msgid "<literal>formula</literal> (optional): an SQL expression that defines the value for a <emphasis>computed</emphasis> foreign key."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1616
+#: basic_mapping.xml:1619
 #, no-c-format
-msgid "Setting a value of the <literal>cascade</literal> attribute to any meaningful value other than <literal>none</literal> will propagate certain operations to the associated object. The meaningful values are the names of Hibernate's basic operations, <literal>persist, merge, delete, save-update, evict, replicate, lock, refresh</literal>, as well as the special values <literal>delete-orphan</literal> and <literal>all</literal> and comma-separated combinations of operation names, for example, <literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> for a full explanation. Note that single valued associations (many-to-one and one-to-one associations) do not support orphan delete."
+msgid "Setting a value of the <literal>cascade</literal> attribute to any meaningful value other than <literal>none</literal> will propagate certain operations to the associated object. The meaningful values are divided into three categories. First, basic operations, which include: <literal>persist, merge, delete, save-update, evict, replicate, lock and refresh</literal>; second, special values: <literal>delete-orphan</literal>; and third,<literal>all</literal> comma-separated combinations of operation names: <literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> for a full explanation. Note that single valued, many-to-one and one-to-one, associations do not support orphan delete."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1629
+#: basic_mapping.xml:1632
 #, no-c-format
-msgid "A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+msgid "Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1633
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1635
+#: basic_mapping.xml:1638
 #, no-c-format
-msgid "The <literal>property-ref</literal> attribute should only be used for mapping legacy data where a foreign key refers to a unique key of the associated table other than the primary key. This is an ugly relational model. For example, suppose the <literal>Product</literal> class had a unique serial number, that is not the primary key. (The <literal>unique</literal> attribute controls Hibernate's DDL generation with the SchemaExport tool.)"
+msgid "The <literal>property-ref</literal> attribute should only be used for mapping legacy data where a foreign key refers to a unique key of the associated table other than the primary key. This is a complicated and confusing relational model. For example, if the <literal>Product</literal> class had a unique serial number that is not the primary key. The <literal>unique</literal> attribute controls Hibernate's DDL generation with the SchemaExport tool."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1644
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" column=\"SERIAL_NUMBER\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1646
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1650
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column=\"PRODUCT_SERIAL_NUMBER\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1652
+#: basic_mapping.xml:1655
 #, no-c-format
-msgid "This is certainly not encouraged, however."
+msgid "This is not encouraged, however."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1656
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid "If the referenced unique key comprises multiple properties of the associated entity, you should map the referenced properties inside a named <literal>&lt;properties&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1661
+#: basic_mapping.xml:1664
 #, no-c-format
-msgid "If the referenced unique key is the property of a component, you may specify a property path:"
+msgid "If the referenced unique key is the property of a component, you can specify a property path:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1665
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column=\"OWNER_SSN\"/>]]>"
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1670
+#: basic_mapping.xml:1673
 #, no-c-format
-msgid "one-to-one"
+msgid "One-to-one"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1672
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid "A one-to-one association to another persistent class is declared using a <literal>one-to-one</literal> element."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1690
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
       "<![CDATA[<one-to-one\n"
@@ -1799,85 +1805,79 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1704
+#: basic_mapping.xml:1713
 #, no-c-format
-msgid "<literal>cascade</literal> (optional) specifies which operations should be cascaded from the parent object to the associated object."
+msgid "<literal>constrained</literal> (optional): specifies that a foreign key constraint on the primary key of the mapped table and references the table of the associated class. This option affects the order in which <literal>save()</literal> and <literal>delete()</literal> are cascaded, and determines whether the association can be proxied. It is also used by the schema export tool."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1710
+#: basic_mapping.xml:1728
 #, no-c-format
-msgid "<literal>constrained</literal> (optional) specifies that a foreign key constraint on the primary key of the mapped table references the table of the associated class. This option affects the order in which <literal>save()</literal> and <literal>delete()</literal> are cascaded, and determines whether the association may be proxied (it is also used by the schema export tool)."
+msgid "<literal>property-ref</literal> (optional): the name of a property of the associated class that is joined to the primary key of this class. If not specified, the primary key of the associated class is used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1725
+#: basic_mapping.xml:1741
 #, no-c-format
-msgid "<literal>property-ref</literal>: (optional) The name of a property of the associated class that is joined to the primary key of this class. If not specified, the primary key of the associated class is used."
+msgid "<literal>formula</literal> (optional): almost all one-to-one associations map to the primary key of the owning entity. If this is not the case, you can specify another column, columns or expression to join on using an SQL formula. See <literal>org.hibernate.test.onetooneformula</literal> for an example."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1738
+#: basic_mapping.xml:1749
 #, no-c-format
-msgid "<literal>formula</literal> (optional): Almost all one to one associations map to the primary key of the owning entity. In the rare case that this is not the case, you may specify a some other column, columns or expression to join on using an SQL formula. (See <literal>org.hibernate.test.onetooneformula</literal> for an example.)"
+msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): by default, single point associations are proxied. <literal>lazy=\"no-proxy\"</literal> specifies that the property should be fetched lazily when the instance variable is first accessed. It requires build-time bytecode instrumentation. <literal>lazy=\"false\"</literal> specifies that the association will always be eagerly fetched. <emphasis>Note that if <literal>constrained=\"false\"</literal>, proxying is impossible and Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1746
+#: basic_mapping.xml:1767
 #, no-c-format
-msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): By default, single point associations are proxied. <literal>lazy=\"no-proxy\"</literal> specifies that the property should be fetched lazily when the instance variable is first accessed (requires build-time bytecode instrumentation). <literal>lazy=\"false\"</literal> specifies that the association will always be eagerly fetched. <emphasis>Note that if <literal>constrained=\"false\"</literal>, proxying is impossible and Hibernate will eager fetch the association!</emphasis>"
+msgid "There are two varieties of one-to-one associations:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1771
 #, no-c-format
-msgid "There are two varieties of one-to-one association:"
-msgstr ""
-
-#. Tag: para
-#: basic_mapping.xml:1768
-#, no-c-format
 msgid "primary key associations"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1771
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1776
+#: basic_mapping.xml:1779
 #, no-c-format
-msgid "Primary key associations don't need an extra table column; if two rows are related by the association then the two table rows share the same primary key value. So if you want two objects to be related by a primary key association, you must make sure that they are assigned the same identifier value!"
+msgid "Primary key associations do not need an extra table column. If two rows are related by the association, then the two table rows share the same primary key value. To relate two objects by a primary key association, ensure that they are assigned the same identifier value."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1783
+#: basic_mapping.xml:1786
 #, no-c-format
-msgid "For a primary key association, add the following mappings to <literal>Employee</literal> and <literal>Person</literal>, respectively."
+msgid "For a primary key association, add the following mappings to <literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1788
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1789
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1791
+#: basic_mapping.xml:1794
 #, no-c-format
-msgid "Now we must ensure that the primary keys of related rows in the PERSON and EMPLOYEE tables are equal. We use a special Hibernate identifier generation strategy called <literal>foreign</literal>:"
+msgid "Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE tables are equal. You use a special Hibernate identifier generation strategy called <literal>foreign</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1797
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -1894,43 +1894,43 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1799
+#: basic_mapping.xml:1802
 #, no-c-format
-msgid "A newly saved instance of <literal>Person</literal> is then assigned the same primary key value as the <literal>Employee</literal> instance refered with the <literal>employee</literal> property of that <literal>Person</literal>."
+msgid "A newly saved instance of <literal>Person</literal> is assigned the same primary key value as the <literal>Employee</literal> instance referred with the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1805
+#: basic_mapping.xml:1808
 #, no-c-format
-msgid "Alternatively, a foreign key with a unique constraint, from <literal>Employee</literal> to <literal>Person</literal>, may be expressed as:"
+msgid "Alternatively, a foreign key with a unique constraint, from <literal>Employee</literal> to <literal>Person</literal>, can be expressed as:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1810
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" unique=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1812
+#: basic_mapping.xml:1815
 #, no-c-format
-msgid "And this association may be made bidirectional by adding the following to the <literal>Person</literal> mapping:"
+msgid "This association can be made bidirectional by adding the following to the <literal>Person</literal> mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1817
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref=\"person\"/>]]>"
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1822
+#: basic_mapping.xml:1825
 #, no-c-format
-msgid "natural-id"
+msgid "Natural-id"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1824
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
       "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -1941,43 +1941,43 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1826
+#: basic_mapping.xml:1829
 #, no-c-format
-msgid "Even though we recommend the use of surrogate keys as primary keys, you should still try to identify natural keys for all entities. A natural key is a property or combination of properties that is unique and non-null. If it is also immutable, even better. Map the properties of the natural key inside the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate the necessary unique key and nullability constraints, and your mapping will be more self-documenting."
+msgid "Although we recommend the use of surrogate keys as primary keys, you should try to identify natural keys for all entities. A natural key is a property or combination of properties that is unique and non-null. It is also immutable. Map the properties of the natural key inside the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate the necessary unique key and nullability constraints and, as a result, your mapping will be more self-documenting."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1835
+#: basic_mapping.xml:1838
 #, no-c-format
-msgid "We strongly recommend that you implement <literal>equals()</literal> and <literal>hashCode()</literal> to compare the natural key properties of the entity."
+msgid "It is recommended that you implement <literal>equals()</literal> and <literal>hashCode()</literal> to compare the natural key properties of the entity."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1840
+#: basic_mapping.xml:1843
 #, no-c-format
-msgid "This mapping is not intended for use with entities with natural primary keys."
+msgid "This mapping is not intended for use with entities that have natural primary keys."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1846
+#: basic_mapping.xml:1849
 #, no-c-format
-msgid "<literal>mutable</literal> (optional, defaults to <literal>false</literal>): By default, natural identifier properties as assumed to be immutable (constant)."
+msgid "<literal>mutable</literal> (optional - defaults to <literal>false</literal>): by default, natural identifier properties are assumed to be immutable (constant)."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1856
+#: basic_mapping.xml:1859
 #, no-c-format
-msgid "component, dynamic-component"
+msgid "Component and dynamic-component"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1858
+#: basic_mapping.xml:1861
 #, no-c-format
-msgid "The <literal>&lt;component&gt;</literal> element maps properties of a child object to columns of the table of a parent class. Components may, in turn, declare their own properties, components or collections. See \"Components\" below."
+msgid "The <literal>&lt;component&gt;</literal> element maps properties of a child object to columns of the table of a parent class. Components can, in turn, declare their own properties, components or collections. See the \"Component\" examples below:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1876
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
       "<![CDATA[<component\n"
@@ -1999,73 +1999,73 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1884
+#: basic_mapping.xml:1887
 #, no-c-format
-msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): The name of the component (child) class."
+msgid "<literal>class</literal> (optional - defaults to the property type determined by reflection): the name of the component (child) class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1890 basic_mapping.xml:1979
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
 #, no-c-format
-msgid "<literal>insert</literal>: Do the mapped columns appear in SQL <literal>INSERT</literal>s?"
+msgid "<literal>insert</literal>: do the mapped columns appear in SQL <literal>INSERTs</literal>?"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1896 basic_mapping.xml:1985
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
 #, no-c-format
-msgid "<literal>update</literal>: Do the mapped columns appear in SQL <literal>UPDATE</literal>s?"
+msgid "<literal>update</literal>: do the mapped columns appear in SQL <literal>UPDATEs</literal>?"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1911
 #, no-c-format
-msgid "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): Specifies that this component should be fetched lazily when the instance variable is first accessed (requires build-time bytecode instrumentation)."
+msgid "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): specifies that this component should be fetched lazily when the instance variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1915
+#: basic_mapping.xml:1918
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Specifies that updates to this component do or do not require acquisition of the optimistic lock. In other words, determines if a version increment should occur when this property is dirty."
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): specifies that updates to this component either do or do not require acquisition of the optimistic lock. It determines if a version increment should occur when this property is dirty."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1923 basic_mapping.xml:1999
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
 #, no-c-format
-msgid "<literal>unique</literal> (optional - defaults to <literal>false</literal>): Specifies that a unique constraint exists upon all mapped columns of the component."
+msgid "<literal>unique</literal> (optional - defaults to <literal>false</literal>): specifies that a unique constraint exists upon all mapped columns of the component."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1932
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid "The child <literal>&lt;property&gt;</literal> tags map properties of the child class to table columns."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1937
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;parent&gt;</literal> subelement that maps a property of the component class as a reference back to the containing entity."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1943
+#: basic_mapping.xml:1946
 #, no-c-format
-msgid "The <literal>&lt;dynamic-component&gt;</literal> element allows a <literal>Map</literal> to be mapped as a component, where the property names refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+msgid "The <literal>&lt;dynamic-component&gt;</literal> element allows a <literal>Map</literal> to be mapped as a component, where the property names refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1952
+#: basic_mapping.xml:1955
 #, no-c-format
-msgid "properties"
+msgid "Properties"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1954
+#: basic_mapping.xml:1957
 #, no-c-format
-msgid "The <literal>&lt;properties&gt;</literal> element allows the definition of a named, logical grouping of properties of a class. The most important use of the construct is that it allows a combination of properties to be the target of a <literal>property-ref</literal>. It is also a convenient way to define a multi-column unique constraint."
+msgid "The <literal>&lt;properties&gt;</literal> element allows the definition of a named, logical grouping of the properties of a class. The most important use of the construct is that it allows a combination of properties to be the target of a <literal>property-ref</literal>. It is also a convenient way to define a multi-column unique constraint. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1970
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
       "<![CDATA[<properties\n"
@@ -2083,29 +2083,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1973
+#: basic_mapping.xml:1976
 #, no-c-format
-msgid "<literal>name</literal>: The logical name of the grouping - <emphasis>not</emphasis> an actual property name."
+msgid "<literal>name</literal>: the logical name of the grouping. It is <emphasis>not</emphasis> an actual property name."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1991
+#: basic_mapping.xml:1994
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Specifies that updates to these properties do or do not require acquisition of the optimistic lock. In other words, determines if a version increment should occur when these properties are dirty."
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): specifies that updates to these properties either do or do not require acquisition of the optimistic lock. It determines if a version increment should occur when these properties are dirty."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2008
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid "For example, if we have the following <literal>&lt;properties&gt;</literal> mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2012
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
       "    <id name=\"personNumber\"/>\n"
+      "\n"
       "    ...\n"
       "    <properties name=\"name\"\n"
       "            unique=\"true\" update=\"false\">\n"
@@ -2117,13 +2118,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2014
+#: basic_mapping.xml:2017
 #, no-c-format
-msgid "Then we might have some legacy data association which refers to this unique key of the <literal>Person</literal> table, instead of to the primary key:"
+msgid "You might have some legacy data association that refers to this unique key of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2019
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
       "<![CDATA[<many-to-one name=\"person\"\n"
@@ -2135,25 +2136,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2021
+#: basic_mapping.xml:2024
 #, no-c-format
-msgid "We don't recommend the use of this kind of thing outside the context of mapping legacy data."
+msgid "The use of this outside the context of mapping legacy data is not recommended."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2029
+#: basic_mapping.xml:2032
 #, no-c-format
-msgid "subclass"
+msgid "Subclass"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2031
+#: basic_mapping.xml:2034
 #, no-c-format
-msgid "Finally, polymorphic persistence requires the declaration of each subclass of the root persistent class. For the table-per-class-hierarchy mapping strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+msgid "Polymorphic persistence requires the declaration of each subclass of the root persistent class. For the table-per-class-hierarchy mapping strategy, the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2044
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
       "<![CDATA[<subclass\n"
@@ -2173,55 +2174,55 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
 #, 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 ""
 
 #. Tag: para
-#: basic_mapping.xml:2052
+#: basic_mapping.xml:2055
 #, no-c-format
-msgid "<literal>discriminator-value</literal> (optional - defaults to the class name): A value that distiguishes individual subclasses."
+msgid "<literal>discriminator-value</literal> (optional - defaults to the class name): a value that distinguishes individual subclasses."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
+#: basic_mapping.xml:2061
 #, no-c-format
-msgid "<literal>proxy</literal> (optional): Specifies a class or interface to use for lazy initializing proxies."
+msgid "<literal>proxy</literal> (optional): specifies a class or interface used for lazy initializing proxies."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
+#: basic_mapping.xml:2067
 #, no-c-format
-msgid "<literal>lazy</literal> (optional, defaults to <literal>true</literal>): Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgid "<literal>lazy</literal> (optional - defaults to <literal>true</literal>): setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2072
+#: basic_mapping.xml:2075
 #, no-c-format
-msgid "Each subclass should declare its own persistent properties and subclasses. <literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> properties are assumed to be inherited from the root class. Each subclass in a heirarchy must define a unique <literal>discriminator-value</literal>. If none is specified, the fully qualified Java class name is used."
+msgid "Each subclass declares its own persistent properties and subclasses. <literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> properties are assumed to be inherited from the root class. Each subclass in a hierarchy must define a unique <literal>discriminator-value</literal>. If this is not specified, the fully qualified Java class name is used."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
 #, no-c-format
-msgid "For information about inheritance mappings, see <xref linkend=\"inheritance\"/>."
+msgid "For information about inheritance mappings see <xref linkend=\"inheritance\"/>."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2087
+#: basic_mapping.xml:2090
 #, no-c-format
-msgid "joined-subclass"
+msgid "Joined-subclass"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2089
+#: basic_mapping.xml:2092
 #, no-c-format
-msgid "Alternatively, each subclass may be mapped to its own table (table-per-subclass mapping strategy). Inherited state is retrieved by joining with the table of the superclass. We use the <literal>&lt;joined-subclass&gt;</literal> element."
+msgid "Each subclass can also be mapped to its own table. This is called the table-per-subclass mapping strategy. An inherited state is retrieved by joining with the table of the superclass. To do this you use the <literal>&lt;joined-subclass&gt;</literal> element. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2102
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
       "<![CDATA[<joined-subclass\n"
@@ -2247,19 +2248,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2110 basic_mapping.xml:2173
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
 #, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2129
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
 #, no-c-format
-msgid "No discriminator column is required for this mapping strategy. Each subclass must, however, declare a table column holding the object identifier using the <literal>&lt;key&gt;</literal> element. The mapping at the start of the chapter would be re-written as:"
+msgid "<literal>proxy</literal> (optional): specifies a class or interface to use for lazy initializing proxies."
 msgstr ""
 
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, no-c-format
+msgid "<literal>lazy</literal> (optional, defaults to <literal>true</literal>): setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, no-c-format
+msgid "A discriminator column is not required for this mapping strategy. Each subclass must, however, declare a table column holding the object identifier using the <literal>&lt;key&gt;</literal> element. The mapping at the start of the chapter would then be re-written as:"
+msgstr ""
+
 #. Tag: programlisting
-#: basic_mapping.xml:2136
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -2296,19 +2309,19 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2145
+#: basic_mapping.xml:2148
 #, no-c-format
-msgid "union-subclass"
+msgid "Union-subclass"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2147
+#: basic_mapping.xml:2150
 #, no-c-format
-msgid "A third option is to map only the concrete classes of an inheritance hierarchy to tables, (the table-per-concrete-class strategy) where each table defines all persistent state of the class, including inherited state. In Hibernate, it is not absolutely necessary to explicitly map such inheritance hierarchies. You can simply map each class with a separate <literal>&lt;class&gt;</literal> declaration. However, if you wish use polymorphic associations (e.g. an association to the superclass of your hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> mapping."
+msgid "A third option is to map only the concrete classes of an inheritance hierarchy to tables. This is called the table-per-concrete-class strategy. Each table defines all persistent states of the class, including the inherited state. In Hibernate, it is not necessary to explicitly map such inheritance hierarchies. You can map each class with a separate <literal>&lt;class&gt;</literal> declaration. However, if you wish use polymorphic associations (e.g. an association to the superclass of your hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2165
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
       "<![CDATA[<union-subclass\n"
@@ -2333,25 +2346,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2192
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid "No discriminator column or key column is required for this mapping strategy."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2203
+#: basic_mapping.xml:2206
 #, no-c-format
-msgid "join"
+msgid "Join"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2205
+#: basic_mapping.xml:2208
 #, no-c-format
-msgid "Using the <literal>&lt;join&gt;</literal> element, it is possible to map properties of one class to several tables, when there's a 1-to-1 relationship between the tables."
+msgid "Using the <literal>&lt;join&gt;</literal> element, it is possible to map properties of one class to several tables that have a one-to-one relationship. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2219
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
       "<![CDATA[<join\n"
@@ -2370,37 +2383,37 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2223
+#: basic_mapping.xml:2226
 #, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2240
+#: basic_mapping.xml:2243
 #, no-c-format
-msgid "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): If set to <literal>join</literal>, the default, Hibernate will use an inner join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined by a subclass. If set to <literal>select</literal> then Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> defined on a subclass, which will be issued only if a row turns out to represent an instance of the subclass. Inner joins will still be used to retrieve a <literal>&lt;join&gt;</literal> defined by the class and its superclasses."
+msgid "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): if set to <literal>join</literal>, the default, Hibernate will use an inner join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its superclasses. It will use an outer join for a <literal>&lt;join&gt;</literal> defined by a subclass. If set to <literal>select</literal> then Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> defined on a subclass. This will be issued only if a row represents an instance of the subclass. Inner joins will still be used to retrieve a <literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2253
+#: basic_mapping.xml:2256
 #, no-c-format
-msgid "<literal>inverse</literal> (optional - defaults to <literal>false</literal>): If enabled, Hibernate will not try to insert or update the properties defined by this join."
+msgid "<literal>inverse</literal> (optional - defaults to <literal>false</literal>): if enabled, Hibernate will not insert or update the properties defined by this join."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2260
+#: basic_mapping.xml:2263
 #, no-c-format
-msgid "<literal>optional</literal> (optional - defaults to <literal>false</literal>): If enabled, Hibernate will insert a row only if the properties defined by this join are non-null and will always use an outer join to retrieve the properties."
+msgid "<literal>optional</literal> (optional - defaults to <literal>false</literal>): if enabled, Hibernate will insert a row only if the properties defined by this join are non-null. It will always use an outer join to retrieve the properties."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2269
+#: basic_mapping.xml:2272
 #, no-c-format
-msgid "For example, the address information for a person can be mapped to a separate table (while preserving value type semantics for all properties):"
+msgid "For example, address information for a person can be mapped to a separate table while preserving value type semantics for all properties:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2274
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\"\n"
@@ -2418,25 +2431,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2276
+#: basic_mapping.xml:2279
 #, no-c-format
-msgid "This feature is often only useful for legacy data models, we recommend fewer tables than classes and a fine-grained domain model. However, it is useful for switching between inheritance mapping strategies in a single hierarchy, as explained later."
+msgid "This feature is often only useful for legacy data models. We recommend fewer tables than classes and a fine-grained domain model. However, it is useful for switching between inheritance mapping strategies in a single hierarchy, as explained later."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2286
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2288
+#: basic_mapping.xml:2291
 #, no-c-format
-msgid "We've seen the <literal>&lt;key&gt;</literal> element crop up a few times now. It appears anywhere the parent mapping element defines a join to a new table, and defines the foreign key in the joined table, that references the primary key of the original table."
+msgid "The <literal>&lt;key&gt;</literal> element has featured a few times within this guide. It appears anywhere the parent mapping element defines a join to a new table that references the primary key of the original table. It also defines the foreign key in the joined table:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2304
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
       "<![CDATA[<key\n"
@@ -2450,61 +2463,61 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2315
+#: basic_mapping.xml:2318
 #, no-c-format
-msgid "<literal>on-delete</literal> (optional, defaults to <literal>noaction</literal>): Specifies whether the foreign key constraint has database-level cascade delete enabled."
+msgid "<literal>on-delete</literal> (optional - defaults to <literal>noaction</literal>): specifies whether the foreign key constraint has database-level cascade delete enabled."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2322
+#: basic_mapping.xml:2325
 #, no-c-format
-msgid "<literal>property-ref</literal> (optional): Specifies that the foreign key refers to columns that are not the primary key of the orginal table. (Provided for legacy data.)"
+msgid "<literal>property-ref</literal> (optional): specifies that the foreign key refers to columns that are not the primary key of the original table. It is provided for legacy data."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2329
+#: basic_mapping.xml:2332
 #, no-c-format
-msgid "<literal>not-null</literal> (optional): Specifies that the foreign key columns are not nullable (this is implied whenever the foreign key is also part of the primary key)."
+msgid "<literal>not-null</literal> (optional): specifies that the foreign key columns are not nullable. This is implied whenever the foreign key is also part of the primary key."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2336
+#: basic_mapping.xml:2339
 #, no-c-format
-msgid "<literal>update</literal> (optional): Specifies that the foreign key should never be updated (this is implied whenever the foreign key is also part of the primary key)."
+msgid "<literal>update</literal> (optional): specifies that the foreign key should never be updated. This is implied whenever the foreign key is also part of the primary key."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2343
+#: basic_mapping.xml:2346
 #, no-c-format
-msgid "<literal>unique</literal> (optional): Specifies that the foreign key should have a unique constraint (this is implied whenever the foreign key is also the primary key)."
+msgid "<literal>unique</literal> (optional): specifies that the foreign key should have a unique constraint. This is implied whenever the foreign key is also the primary key."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2351
+#: basic_mapping.xml:2354
 #, no-c-format
-msgid "We recommend that for systems where delete performance is important, all keys should be defined <literal>on-delete=\"cascade\"</literal>, and Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> constraint, instead of many individual <literal>DELETE</literal> statements. Be aware that this feature bypasses Hibernate's usual optimistic locking strategy for versioned data."
+msgid "For systems where delete performance is important, we recommend that all keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate uses a database-level <literal>ON CASCADE DELETE</literal> constraint, instead of many individual <literal>DELETE</literal> statements. Be aware that this feature bypasses Hibernate's usual optimistic locking strategy for versioned data."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2359
+#: basic_mapping.xml:2362
 #, no-c-format
-msgid "The <literal>not-null</literal> and <literal>update</literal> attributes are useful when mapping a unidirectional one to many association. If you map a unidirectional one to many to a non-nullable foreign key, you <emphasis>must</emphasis> declare the key column using <literal>&lt;key not-null=\"true\"&gt;</literal>."
+msgid "The <literal>not-null</literal> and <literal>update</literal> attributes are useful when mapping a unidirectional one-to-many association. If you map a unidirectional one-to-many association to a non-nullable foreign key, you <emphasis>must</emphasis> declare the key column using <literal>&lt;key not-null=\"true\"&gt;</literal>."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2369
+#: basic_mapping.xml:2372
 #, no-c-format
-msgid "column and formula elements"
+msgid "Column and formula elements"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2370
+#: basic_mapping.xml:2373
 #, no-c-format
-msgid "Any mapping element which accepts a <literal>column</literal> attribute will alternatively accept a <literal>&lt;column&gt;</literal> subelement. Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the <literal>formula</literal> attribute."
+msgid "Mapping elements which accept a <literal>column</literal> attribute will alternatively accept a <literal>&lt;column&gt;</literal> subelement. Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the <literal>formula</literal> attribute. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
       "<![CDATA[<column\n"
@@ -2522,19 +2535,19 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2378
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2380
+#: basic_mapping.xml:2383
 #, no-c-format
-msgid "<literal>column</literal> and <literal>formula</literal> attributes may even be combined within the same property or association mapping to express, for example, exotic join conditions."
+msgid "<literal>column</literal> and <literal>formula</literal> attributes can even be combined within the same property or association mapping to express, for example, exotic join conditions."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2386
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
       "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -2545,25 +2558,25 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2391
+#: basic_mapping.xml:2394
 #, no-c-format
-msgid "import"
+msgid "Import"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2393
+#: basic_mapping.xml:2396
 #, no-c-format
-msgid "Suppose your application has two persistent classes with the same name, and you don't want to specify the fully qualified (package) name in Hibernate queries. Classes may be \"imported\" explicitly, rather than relying upon <literal>auto-import=\"true\"</literal>. You may even import classes and interfaces that are not explicitly mapped."
+msgid "If your application has two persistent classes with the same name, and you do not want to specify the fully qualified package name in Hibernate queries, classes can be \"imported\" explicitly, rather than relying upon <literal>auto-import=\"true\"</literal>. You can also import classes and interfaces that are not explicitly mapped:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2400
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2407
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
       "<![CDATA[<import\n"
@@ -2573,37 +2586,37 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2410
+#: basic_mapping.xml:2413
 #, no-c-format
-msgid "<literal>class</literal>: The fully qualified class name of of any Java class."
+msgid "<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2415
+#: basic_mapping.xml:2418
 #, no-c-format
-msgid "<literal>rename</literal> (optional - defaults to the unqualified class name): A name that may be used in the query language."
+msgid "<literal>rename</literal> (optional - defaults to the unqualified class name): a name that can be used in the query language."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2426
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2428
+#: basic_mapping.xml:2431
 #, no-c-format
-msgid "There is one further type of property mapping. The <literal>&lt;any&gt;</literal> mapping element defines a polymorphic association to classes from multiple tables. This type of mapping always requires more than one column. The first column holds the type of the associated entity. The remaining columns hold the identifier. It is impossible to specify a foreign key constraint for this kind of association, so this is most certainly not meant as the usual way of mapping (polymorphic) associations. You should use this only in very special cases (eg. audit logs, user session data, etc)."
+msgid "There is one more type of property mapping. The <literal>&lt;any&gt;</literal> mapping element defines a polymorphic association to classes from multiple tables. This type of mapping requires more than one column. The first column contains the type of the associated entity. The remaining columns contain the identifier. It is impossible to specify a foreign key constraint for this kind of association. This is not the usual way of mapping polymorphic associations and you should use this only in special cases. For example, for audit logs, user session data, etc."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2438
+#: basic_mapping.xml:2441
 #, no-c-format
-msgid "The <literal>meta-type</literal> attribute lets the application specify a custom type that maps database column values to persistent classes which have identifier properties of the type specified by <literal>id-type</literal>. You must specify the mapping from values of the meta-type to class names."
+msgid "The <literal>meta-type</literal> attribute allows the application to specify a custom type that maps database column values to persistent classes that have identifier properties of the type specified by <literal>id-type</literal>. You must specify the mapping from values of the meta-type to class names."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2445
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
       "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -2616,7 +2629,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2456
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
       "<![CDATA[<any\n"
@@ -2637,277 +2650,277 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2459
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2464
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2469
+#: basic_mapping.xml:2472
 #, no-c-format
-msgid "<literal>meta-type</literal> (optional - defaults to <literal>string</literal>): Any type that is allowed for a discriminator mapping."
+msgid "<literal>meta-type</literal> (optional - defaults to <literal>string</literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2475
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): the cascade style."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2487
+#: basic_mapping.xml:2490
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Specifies that updates to this property do or do not require acquisition of the optimistic lock. In other words, define if a version increment should occur if this property is dirty."
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): specifies that updates to this property either do or do not require acquisition of the optimistic lock. It defines whether a version increment should occur if this property is dirty."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2502
+#: basic_mapping.xml:2505
 #, no-c-format
-msgid "Hibernate Types"
+msgid "Hibernate types"
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2505
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2507
+#: basic_mapping.xml:2510
 #, no-c-format
-msgid "To understand the behaviour of various Java language-level objects with respect to the persistence service, we need to classify them into two groups:"
+msgid "In relation to the persistence service, Java language-level objects are classified into two groups:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2512
+#: basic_mapping.xml:2515
 #, no-c-format
-msgid "An <emphasis>entity</emphasis> exists independently of any other objects holding references to the entity. Contrast this with the usual Java model where an unreferenced object is garbage collected. Entities must be explicitly saved and deleted (except that saves and deletions may be <emphasis>cascaded</emphasis> from a parent entity to its children). This is different from the ODMG model of object persistence by reachablity - and corresponds more closely to how application objects are usually used in large systems. Entities support circular and shared references. They may also be versioned."
+msgid "An <emphasis>entity</emphasis> exists independently of any other objects holding references to the entity. Contrast this with the usual Java model, where an unreferenced object is garbage collected. Entities must be explicitly saved and deleted. Saves and deletions, however, can be <emphasis>cascaded</emphasis> from a parent entity to its children. This is different from the ODMG model of object persistence by reachability and corresponds more closely to how application objects are usually used in large systems. Entities support circular and shared references. They can also be versioned."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2523
+#: basic_mapping.xml:2526
 #, no-c-format
-msgid "An entity's persistent state consists of references to other entities and instances of <emphasis>value</emphasis> types. Values are primitives, collections (not what's inside a collection), components and certain immutable objects. Unlike entities, values (in particular collections and components) <emphasis>are</emphasis> persisted and deleted by reachability. Since value objects (and primitives) are persisted and deleted along with their containing entity they may not be independently versioned. Values have no independent identity, so they cannot be shared by two entities or collections."
+msgid "An entity's persistent state consists of references to other entities and instances of <emphasis>value</emphasis> types. Values are primitives: collections (not what is inside a collection), components and certain immutable objects. Unlike entities, values in particular collections and components, <emphasis>are</emphasis> persisted and deleted by reachability. Since value objects and primitives are persisted and deleted along with their containing entity, they cannot be independently versioned. Values have no independent identity, so they cannot be shared by two entities or collections."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2534
+#: basic_mapping.xml:2537
 #, no-c-format
-msgid "Up until now, we've been using the term \"persistent class\" to refer to entities. We will continue to do that. Strictly speaking, however, not all user-defined classes with persistent state are entities. A <emphasis>component</emphasis> is a user defined class with value semantics. A Java property of type <literal>java.lang.String</literal> also has value semantics. Given this definition, we can say that all types (classes) provided by the JDK have value type semantics in Java, while user-defined types may be mapped with entity or value type semantics. This decision is up to the application developer. A good hint for an entity class in a domain model are shared references to a single instance of that class, while composition or aggregation usually translates to a value type."
+msgid "Until now, we have been using the term \"persistent class\" to refer to entities. We will continue to do that. Not all user-defined classes with a persistent state, however, are entities. A <emphasis>component</emphasis> is a user-defined class with value semantics. A Java property of type <literal>java.lang.String</literal> also has value semantics. Given this definition, all types (classes) provided by the JDK have value type semantics in Java, while user-defined types can be mapped with entity or value type semantics. This decision is up to the application developer. An entity class in a domain model will normally have shared references to a single instance of that class, while composition or aggregation usually translates to a value type."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2551
 #, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2552
+#: basic_mapping.xml:2555
 #, no-c-format
-msgid "The challenge is to map the Java type system (and the developers' definition of entities and value types) to the SQL/database type system. The bridge between both systems is provided by Hibernate: for entities we use <literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;component&gt;</literal>, etc, usually with a <literal>type</literal> attribute. The value of this attribute is the name of a Hibernate <emphasis>mapping type</emphasis>. Hibernate provides many mappings (for standard JDK value types) out of the box. You can write your own mapping types and implement your custom conversion strategies as well, as you'll see later."
+msgid "The challenge is to map the Java type system, and the developers' definition of entities and value types, to the SQL/database type system. The bridge between both systems is provided by Hibernate. For entities, <literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;component&gt;</literal>etc., that usually have a <literal>type</literal> attribute. The value of this attribute is the name of a Hibernate <emphasis>mapping type</emphasis>. Hibernate provides a range of mappings for standard JDK value types out of the box. You can write your own mapping types and implement your own custom conversion strategies."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2565
+#: basic_mapping.xml:2568
 #, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+msgid "With the exception of collections, all built-in Hibernate types support null semantics."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2572
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2574
+#: basic_mapping.xml:2577
 #, no-c-format
-msgid "The built-in <emphasis>basic mapping types</emphasis> may be roughly categorized into"
+msgid "The built-in <emphasis>basic mapping types</emphasis> can be roughly categorized into the following:"
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2579
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid "integer, long, short, float, double, character, byte, boolean, yes_no, true_false"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2582
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid "Type mappings from Java primitives or wrapper classes to appropriate (vendor-specific) SQL column types. <literal>boolean, yes_no</literal> and <literal>true_false</literal> are all alternative encodings for a Java <literal>boolean</literal> or <literal>java.lang.Boolean</literal>."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2591
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2593
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>)."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2600
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2602
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid "Type mappings from <literal>java.util.Date</literal> and its subclasses to SQL types <literal>DATE</literal>, <literal>TIME</literal> and <literal>TIMESTAMP</literal> (or equivalent)."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2610
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2612
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid "Type mappings from <literal>java.util.Calendar</literal> to SQL types <literal>TIMESTAMP</literal> and <literal>DATE</literal> (or equivalent)."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2620
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java.math.BigInteger</literal> to <literal>NUMERIC</literal> (or Oracle <literal>NUMBER</literal>)."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util.TimeZone</literal> and <literal>java.util.Currency</literal> to <literal>VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>). Instances of <literal>Locale</literal> and <literal>Currency</literal> are mapped to their ISO codes. Instances of <literal>TimeZone</literal> are mapped to their <literal>ID</literal>."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2644
+#: basic_mapping.xml:2647
 #, no-c-format
-msgid "<literal>class</literal>"
+msgid "class"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2646
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>). A <literal>Class</literal> is mapped to its fully qualified name."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2654
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2656
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2662
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2664
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</literal> type."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2671
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2673
+#: basic_mapping.xml:2676
 #, no-c-format
-msgid "Maps serializable Java types to an appropriate SQL binary type. You may also indicate the Hibernate type <literal>serializable</literal> with the name of a serializable Java class or interface that does not default to a basic type."
+msgid "Maps serializable Java types to an appropriate SQL binary type. You can also indicate the Hibernate type <literal>serializable</literal> with the name of a serializable Java class or interface that does not default to a basic type."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2682
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2684
+#: basic_mapping.xml:2687
 #, no-c-format
-msgid "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and <literal>java.sql.Blob</literal>. These types may be inconvenient for some applications, since the blob or clob object may not be reused outside of a transaction. (Furthermore, driver support is patchy and inconsistent.)"
+msgid "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and <literal>java.sql.Blob</literal>. These types can be inconvenient for some applications, since the blob or clob object cannot be reused outside of a transaction. Driver support is patchy and inconsistent."
 msgstr ""
 
 #. Tag: literal
-#: basic_mapping.xml:2694
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, imm_serializable, imm_binary"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2698
+#: basic_mapping.xml:2701
 #, no-c-format
-msgid "Type mappings for what are usually considered mutable Java types, where Hibernate makes certain optimizations appropriate only for immutable Java types, and the application treats the object as immutable. For example, you should not call <literal>Date.setTime()</literal> for an instance mapped as <literal>imm_timestamp</literal>. To change the value of the property, and have that change made persistent, the application must assign a new (nonidentical) object to the property."
+msgid "Type mappings for what are considered mutable Java types. This is where Hibernate makes certain optimizations appropriate only for immutable Java types, and the application treats the object as immutable. For example, you should not call <literal>Date.setTime()</literal> for an instance mapped as <literal>imm_timestamp</literal>. To change the value of the property, and have that change made persistent, the application must assign a new, nonidentical, object to the property."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2713
+#: basic_mapping.xml:2716
 #, no-c-format
-msgid "Unique identifiers of entities and collections may be of any basic type except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</literal>. (Composite identifiers are also allowed, see below.)"
+msgid "Unique identifiers of entities and collections can be of any basic type except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</literal>. Composite identifiers are also allowed. See below for more information."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2719
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid "The basic value types have corresponding <literal>Type</literal> constants defined on <literal>org.hibernate.Hibernate</literal>. For example, <literal>Hibernate.STRING</literal> represents the <literal>string</literal> type."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2728
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2730
+#: basic_mapping.xml:2733
 #, no-c-format
-msgid "It is relatively easy for developers to create their own value types. For example, you might want to persist properties of type <literal>java.lang.BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does not provide a built-in type for this. But custom types are not limited to mapping a property (or collection element) to a single table column. So, for example, you might have a Java property <literal>getName()</literal>/<literal>setName()</literal> of type <literal>java.lang.String</literal> that is persisted to the columns <literal>FIRST_NAME</literal>, <literal>INITIAL</literal>, <literal>SURNAME</literal>."
+msgid "It is relatively easy for developers to create their own value types. For example, you might want to persist properties of type <literal>java.lang.BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does not provide a built-in type for this. Custom types are not limited to mapping a property, or collection element, to a single table column. So, for example, you might have a Java property <literal>getName()</literal>/<literal>setName()</literal> of type <literal>java.lang.String</literal> that is persisted to the columns <literal>FIRST_NAME</literal>, <literal>INITIAL</literal>, <literal>SURNAME</literal>."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2741
+#: basic_mapping.xml:2744
 #, no-c-format
-msgid "To implement a custom type, implement either <literal>org.hibernate.UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and declare properties using the fully qualified classname of the type. Check out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind of things that are possible."
+msgid "To implement a custom type, implement either <literal>org.hibernate.UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and declare properties using the fully qualified classname of the type. View <literal>org.hibernate.test.DoubleStringType</literal> to see the kind of things that are possible."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2749
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
       "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test.DoubleStringType\">\n"
@@ -2917,25 +2930,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2751
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property to multiple columns."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2756
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</literal>, <literal>UserCollectionType</literal>, and <literal>UserVersionType</literal> interfaces provide support for more specialized uses."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2765
 #, no-c-format
-msgid "You may even supply parameters to a <literal>UserType</literal> in the mapping file. To do this, your <literal>UserType</literal> must implement the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. To supply parameters to your custom type, you can use the <literal>&lt;type&gt;</literal> element in your mapping files."
+msgid "You can even supply parameters to a <literal>UserType</literal> in the mapping file. To do this, your <literal>UserType</literal> must implement the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. To supply parameters to your custom type, you can use the <literal>&lt;type&gt;</literal> element in your mapping files."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2770
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
       "<![CDATA[<property name=\"priority\">\n"
@@ -2946,19 +2959,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2772
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid "The <literal>UserType</literal> can now retrieve the value for the parameter named <literal>default</literal> from the <literal>Properties</literal> object passed to it."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2777
+#: basic_mapping.xml:2780
 #, no-c-format
-msgid "If you use a certain <literal>UserType</literal> very often, it may be useful to define a shorter name for it. You can do this using the <literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a custom type, and may also contain a list of default parameter values if the type is parameterized."
+msgid "If you regularly use a certain <literal>UserType</literal>, it is useful to define a shorter name for it. You can do this using the <literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a custom type, and can also contain a list of default parameter values if the type is parameterized."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2784
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
       "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" name=\"default_zero\">\n"
@@ -2967,37 +2980,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2786
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2788
+#: basic_mapping.xml:2791
 #, no-c-format
 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 ""
 
 #. Tag: para
-#: basic_mapping.xml:2793
+#: basic_mapping.xml:2796
 #, no-c-format
-msgid "Even though Hibernate's rich range of built-in types and support for components means you will very rarely <emphasis>need</emphasis> to use a custom type, it is nevertheless considered good form to use custom types for (non-entity) classes that occur frequently in your application. For example, a <literal>MonetaryAmount</literal> class is a good candidate for a <literal>CompositeUserType</literal>, even though it could easily be mapped as a component. One motivation for this is abstraction. With a custom type, your mapping documents would be future-proofed against possible changes in your way of representing monetary values."
+msgid "Even though Hibernate's rich range of built-in types and support for components means you will rarely need to use a custom type, it is considered good practice to use custom types for non-entity classes that occur frequently in your application. For example, a <literal>MonetaryAmount</literal> class is a good candidate for a <literal>CompositeUserType</literal>, even though it could be mapped as a component. One reason for this is abstraction. With a custom type, your mapping documents would be protected against changes to the way monetary values are represented."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2809
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2810
+#: basic_mapping.xml:2813
 #, no-c-format
-msgid "It is possible to provide more than one mapping for a particular persistent class. In this case you must specify an <emphasis>entity name</emphasis> do disambiguate between instances of the two mapped entities. (By default, the entity name is the same as the class name.) Hibernate lets you specify the entity name when working with persistent objects, when writing queries, or when mapping associations to the named entity."
+msgid "It is possible to provide more than one mapping for a particular persistent class. In this case, you must specify an <emphasis>entity name</emphasis> to disambiguate between instances of the two mapped entities. By default, the entity name is the same as the class name. Hibernate lets you specify the entity name when working with persistent objects, when writing queries, or when mapping associations to the named entity."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -3020,25 +3033,25 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2820
+#: basic_mapping.xml:2823
 #, no-c-format
-msgid "Notice how associations are now specified using <literal>entity-name</literal> instead of <literal>class</literal>."
+msgid "Associations are now specified using <literal>entity-name</literal> instead of <literal>class</literal>."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2828
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2829
+#: basic_mapping.xml:2832
 #, no-c-format
-msgid "You may force Hibernate to quote an identifier in the generated SQL by enclosing the table or column name in backticks in the mapping document. Hibernate will use the correct quotation style for the SQL <literal>Dialect</literal> (usually double quotes, but brackets for SQL Server and backticks for MySQL)."
+msgid "You can force Hibernate to quote an identifier in the generated SQL by enclosing the table or column name in backticks in the mapping document. Hibernate will use the correct quotation style for the SQL <literal>Dialect</literal>. This is usually double quotes, but the SQL Server uses brackets and MySQL uses backticks."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2836
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -3049,31 +3062,31 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2842
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2844
+#: basic_mapping.xml:2847
 #, no-c-format
-msgid "XML isn't for everyone, and so there are some alternative ways to define O/R mapping metadata in Hibernate."
+msgid "XML does not suit all users so there are some alternative ways to define O/R mapping metadata in Hibernate."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2849
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2851
+#: basic_mapping.xml:2854
 #, no-c-format
-msgid "Many Hibernate users prefer to embed mapping information directly in sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not cover this approach in this document, since strictly it is considered part of XDoclet. However, we include the following example of the <literal>Cat</literal> class with XDoclet mappings."
+msgid "Many Hibernate users prefer to embed mapping information directly in sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover this approach in this reference guide since it is considered part of XDoclet. However, we include the following example of the <literal>Cat</literal> class with XDoclet mappings:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2858
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
       "<![CDATA[package eg;\n"
@@ -3183,31 +3196,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2860
+#: basic_mapping.xml:2863
 #, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2867
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2869
+#: basic_mapping.xml:2872
 #, no-c-format
-msgid "JDK 5.0 introduced XDoclet-style annotations at the language level, type-safe and checked at compile time. This mechnism is more powerful than XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, for example, supports auto-completion and syntax highlighting of JDK 5.0 annotations. The new revision of the EJB specification (JSR-220) uses JDK 5.0 annotations as the primary metadata mechanism for entity beans. Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the persistence API), support for mapping metadata is available via the <emphasis>Hibernate Annotations</emphasis> package, as a separate download. Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
+msgid "JDK 5.0 introduced XDoclet-style annotations at the language level that are type-safe and checked at compile time. This mechanism is more powerful than XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, for example, supports auto-completion and syntax highlighting of JDK 5.0 annotations. The new revision of the EJB specification (JSR-220) uses JDK 5.0 annotations as the primary metadata mechanism for entity beans. Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the persistence API). Support for mapping metadata is available via the <emphasis>Hibernate Annotations</emphasis> package as a separate download. Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2880
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2884
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
       "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -3235,67 +3248,67 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2886
+#: basic_mapping.xml:2891
 #, no-c-format
-msgid "Note that support for JDK 5.0 Annotations (and JSR-220) is still work in progress and not completed. Please refer to the Hibernate Annotations module for more details."
+msgid "Support for JDK 5.0 Annotations (and JSR-220) is currently under development. Please refer to the Hibernate Annotations module for more details."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2895
+#: basic_mapping.xml:2901
 #, no-c-format
-msgid "Generated Properties"
+msgid "Generated properties"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2896
+#: basic_mapping.xml:2902
 #, no-c-format
-msgid "Generated properties are properties which have their values generated by the database. Typically, Hibernate applications needed to <literal>refresh</literal> objects which contain any properties for which the database was generating values. Marking properties as generated, however, lets the application delegate this responsibility to Hibernate. Essentially, whenever Hibernate issues an SQL INSERT or UPDATE for an entity which has defined generated properties, it immediately issues a select afterwards to retrieve the generated values."
+msgid "Generated properties are properties that have their values generated by the database. Typically, Hibernate applications needed to <literal>refresh</literal> objects that contain any properties for which the database was generating values. Marking properties as generated, however, lets the application delegate this responsibility to Hibernate. When Hibernate issues an SQL INSERT or UPDATE for an entity that has defined generated properties, it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2905
+#: basic_mapping.xml:2911
 #, no-c-format
-msgid "Properties marked as generated must additionally be non-insertable and non-updateable. Only <link linkend=\"mapping-declaration-version\">versions</link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, and <link linkend=\"mapping-declaration-property\">simple properties</link> can be marked as generated."
+msgid "Properties marked as generated must additionally be non-insertable and non-updateable. Only <link linkend=\"mapping-declaration-version\">versions</link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, and <link linkend=\"mapping-declaration-property\">simple properties</link>, can be marked as generated."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2912
+#: basic_mapping.xml:2918
 #, no-c-format
-msgid "<literal>never</literal> (the default) - means that the given property value is not generated within the database."
+msgid "<literal>never</literal> (the default): the given property value is not generated within the database."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2916
+#: basic_mapping.xml:2922
 #, no-c-format
-msgid "<literal>insert</literal> - states that the given property value is generated on insert, but is not regenerated on subsequent updates. Things like created-date would fall into this category. Note that even thought <link linkend=\"mapping-declaration-version\">version</link> and <link linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be marked as generated, this option is not available there..."
+msgid "<literal>insert</literal>: the given property value is generated on insert, but is not regenerated on subsequent updates. Properties like created-date fall into this category. Even though <link linkend=\"mapping-declaration-version\">version</link> and <link linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be marked as generated, this option is not available."
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2924
+#: basic_mapping.xml:2930
 #, no-c-format
-msgid "<literal>always</literal> - states that the property value is generated both on insert and on update."
+msgid "<literal>always</literal>: the property value is generated both on insert and on update."
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2931
+#: basic_mapping.xml:2937
 #, no-c-format
-msgid "Auxiliary Database Objects"
+msgid "Auxiliary database objects"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2938
 #, no-c-format
-msgid "Allows CREATE and DROP of arbitrary database objects, in conjunction with Hibernate's schema evolution tools, to provide the ability to fully define a user schema within the Hibernate mapping files. Although designed specifically for creating and dropping things like triggers or stored procedures, really any SQL command that can be run via a <literal>java.sql.Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). There are essentially two modes for defining auxiliary database objects..."
+msgid "Auxiliary database objects allow for the CREATE and DROP of arbitrary database objects. In conjunction with Hibernate's schema evolution tools, they have the ability to fully define a user schema within the Hibernate mapping files. Although designed specifically for creating and dropping things like triggers or stored procedures, any SQL command that can be run via a <literal>java.sql.Statement.execute()</literal> method is valid (for example, ALTERs, INSERTS, etc.). There are essentially two modes for defining auxiliary database objects:"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2941
+#: basic_mapping.xml:2947
 #, no-c-format
-msgid "The first mode is to explicitly list the CREATE and DROP commands out in the mapping file:"
+msgid "The first mode is to explicitly list the CREATE and DROP commands in the mapping file:"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2945
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -3308,13 +3321,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2946
+#: basic_mapping.xml:2952
 #, no-c-format
-msgid "The second mode is to supply a custom class which knows how to construct the CREATE and DROP commands. This custom class must implement the <literal>org.hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+msgid "The second mode is to supply a custom class that constructs the CREATE and DROP commands. This custom class must implement the <literal>org.hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2951
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -3326,21 +3339,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2952
+#: basic_mapping.xml:2958
 #, no-c-format
-msgid "Additionally, these database objects can be optionally scoped such that they only apply when certain dialects are used."
+msgid "Additionally, these database objects can be optionally scoped so that they only apply when certain dialects are used."
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2956
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
       "    ...\n"
       "    <database-object>\n"
       "        <definition class=\"MyTriggerDefinition\"/>\n"
-      "        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-      "        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+      "        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+      "        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
       "    </database-object>\n"
       "</hibernate-mapping>]]>"
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: batch.xml:31
 #, no-c-format
-msgid "A naive approach to inserting 100 000 rows in the database using Hibernate might look like this:"
+msgid "A naive approach to inserting 100,000 rows in the database using Hibernate might look like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -43,59 +43,59 @@
 #. Tag: para
 #: batch.xml:38
 #, no-c-format
-msgid "This would fall over with an <literal>OutOfMemoryException</literal> somewhere around the 50 000th row. That's because Hibernate caches all the newly inserted <literal>Customer</literal> instances in the session-level cache."
+msgid "This would fall over with an <literal>OutOfMemoryException</literal> somewhere around the 50,000th row. That is because Hibernate caches all the newly inserted <literal>Customer</literal> instances in the session-level cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:44
+#: batch.xml:45
 #, no-c-format
-msgid "In this chapter we'll show you how to avoid this problem. First, however, if you are doing batch processing, it is absolutely critical that you enable the use of JDBC batching, if you intend to achieve reasonable performance. Set the JDBC batch size to a reasonable number (say, 10-50):"
+msgid "If you are undertaking batch processing you will need to enable the use of JDBC batching. This is absolutely essential if you want to achieve optimal performance. Set the JDBC batch size to a reasonable number (10-50, for example):"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:51
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:53
+#: batch.xml:54
 #, no-c-format
-msgid "Note that Hibernate disables insert batching at the JDBC level transparently if you use an <literal>identiy</literal> identifier generator."
+msgid "Hibernate disables insert batching at the JDBC level transparently if you use an <literal>identity</literal> identifier generator."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:58
+#: batch.xml:59
 #, no-c-format
-msgid "You also might like to do this kind of work in a process where interaction with the second-level cache is completely disabled:"
+msgid "You can also do this kind of work in a process where interaction with the second-level cache is completely disabled:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:63
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:65
+#: batch.xml:66
 #, no-c-format
 msgid "However, this is not absolutely necessary, since we can explicitly set the <literal>CacheMode</literal> to disable interaction with the second-level cache."
 msgstr ""
 
 #. Tag: title
-#: batch.xml:71
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:73
+#: batch.xml:74
 #, no-c-format
-msgid "When making new objects persistent, you must <literal>flush()</literal> and then <literal>clear()</literal> the session regularly, to control the size of the first-level cache."
+msgid "When making new objects persistent <literal>flush()</literal> and then <literal>clear()</literal> the session regularly in order to control the size of the first-level cache."
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:79
+#: batch.xml:80
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -116,19 +116,19 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:84
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:86
+#: batch.xml:87
 #, no-c-format
-msgid "For retrieving and updating data the same ideas apply. In addition, you need to use <literal>scroll()</literal> to take advantage of server-side cursors for queries that return many rows of data."
+msgid "For retrieving and updating data, the same ideas apply. In addition, you need to use <literal>scroll()</literal> to take advantage of server-side cursors for queries that return many rows of data."
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:92
+#: batch.xml:93
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -153,19 +153,19 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:97
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:98
+#: batch.xml:99
 #, no-c-format
-msgid "Alternatively, Hibernate provides a command-oriented API that may be used for streaming data to and from the database in the form of detached objects. A <literal>StatelessSession</literal> has no persistence context associated with it and does not provide many of the higher-level life cycle semantics. In particular, a stateless session does not implement a first-level cache nor interact with any second-level or query cache. It does not implement transactional write-behind or automatic dirty checking. Operations performed using a stateless session do not ever cascade to associated instances. Collections are ignored by a stateless session. Operations performed via a stateless session bypass Hibernate's event model and interceptors. Stateless sessions are vulnerable to data aliasing effects, due to the lack of a first-level cache. A stateless session is a lower-level abstraction, much closer to the underlying JDBC."
+msgid "Alternatively, Hibernate provides a command-oriented API that can be used for streaming data to and from the database in the form of detached objects. A <literal>StatelessSession</literal> has no persistence context associated with it and does not provide many of the higher-level life cycle semantics. In particular, a stateless session does not implement a first-level cache nor interact with any second-level or query cache. It does not implement transactional write-behind or automatic dirty checking. Operations performed using a stateless session never cascade to associated instances. Collections are ignored by a stateless session. Operations performed via a stateless session bypass Hibernate's event model and interceptors. Due to the lack of a first-level cache, Stateless sessions are vulnerable to data aliasing effects. A stateless session is a lower-level abstraction that is much closer to the underlying JDBC."
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:113
+#: batch.xml:114
 #, no-c-format
 msgid ""
       "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -184,67 +184,73 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:115
+#: batch.xml:116
 #, no-c-format
-msgid "Note that in this code example, the <literal>Customer</literal> instances returned by the query are immediately detached. They are never associated with any persistence context."
+msgid "In this code example, the <literal>Customer</literal> instances returned by the query are immediately detached. They are never associated with any persistence context."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:121
+#: batch.xml:122
 #, no-c-format
-msgid "The <literal>insert(), update()</literal> and <literal>delete()</literal> operations defined by the <literal>StatelessSession</literal> interface are considered to be direct database row-level operations, which result in immediate execution of a SQL <literal>INSERT, UPDATE</literal> or <literal>DELETE</literal> respectively. Thus, they have very different semantics to the <literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> operations defined by the <literal>Session</literal> interface."
+msgid "The <literal>insert(), update()</literal> and <literal>delete()</literal> operations defined by the <literal>StatelessSession</literal> interface are considered to be direct database row-level operations. They result in the immediate execution of a SQL <literal>INSERT, UPDATE</literal> or <literal>DELETE</literal> respectively. They have different semantics to the <literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> operations defined by the <literal>Session</literal> interface."
 msgstr ""
 
 #. Tag: title
-#: batch.xml:134
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:136
+#: batch.xml:137
 #, no-c-format
-msgid "As already discussed, automatic and transparent object/relational mapping is concerned with the management of object state. This implies that the object state is available in memory, hence manipulating (using the SQL <literal>Data Manipulation Language</literal> (DML) statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>) data directly in the database will not affect in-memory state. However, Hibernate provides methods for bulk SQL-style DML statement execution which are performed through the Hibernate Query Language (<link linkend=\"queryhql\">HQL</link>)."
+msgid "As already discussed, automatic and transparent object/relational mapping is concerned with the management of the object state. The object state is available in memory. This means that manipulating data directly in the database (using the SQL <literal>Data Manipulation Language</literal> (DML) the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>) will not affect in-memory state. However, Hibernate provides methods for bulk SQL-style DML statement execution that is performed through the Hibernate Query Language (<link linkend=\"queryhql\">HQL</link>)."
 msgstr ""
 
 #. Tag: para
 #: batch.xml:146
 #, no-c-format
-msgid "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE where_conditions)?</literal>. Some points to note:"
+msgid "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE where_conditions)?</literal>."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:154
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:159
+#: batch.xml:162
 #, no-c-format
-msgid "There can only be a single entity named in the from-clause; it can optionally be aliased. If the entity name is aliased, then any property references must be qualified using that alias; if the entity name is not aliased, then it is illegal for any property references to be qualified."
+msgid "There can only be a single entity named in the from-clause. It can, however, be aliased. If the entity name is aliased, then any property references must be qualified using that alias. If the entity name is not aliased, then it is illegal for any property references to be qualified."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:167
+#: batch.xml:170
 #, no-c-format
-msgid "No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or explicit) can be specified in a bulk HQL query. Sub-queries may be used in the where-clause; the subqueries, themselves, may contain joins."
+msgid "No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or explicit, can be specified in a bulk HQL query. Sub-queries can be used in the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:174
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:180
+#: batch.xml:183
 #, no-c-format
-msgid "As an example, to execute an HQL <literal>UPDATE</literal>, use the <literal>Query.executeUpdate()</literal> method (the method is named for those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</literal>):"
+msgid "As an example, to execute an HQL <literal>UPDATE</literal>, use the <literal>Query.executeUpdate()</literal> method. The method is named for those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:189
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -261,13 +267,13 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
+#: batch.xml:191
 #, no-c-format
-msgid "HQL <literal>UPDATE</literal> statements, by default do not effect the <link linkend=\"mapping-declaration-version\">version</link> or the <link linkend=\"mapping-declaration-timestamp\">timestamp</link> property values for the affected entities; this is in keeping with the EJB3 specification. However, you can force Hibernate to properly reset the <literal>version</literal> or <literal>timestamp</literal> property values through the use of a <literal>versioned update</literal>. This is achieved by adding the <literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> keyword."
+msgid "In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> statements, by default, do not effect the <link linkend=\"mapping-declaration-version\">version</link> or the <link linkend=\"mapping-declaration-timestamp\">timestamp</link> property values for the affected entities. However, you can force Hibernate to reset the <literal>version</literal> or <literal>timestamp</literal> property values through the use of a <literal>versioned update</literal>. This is achieved by adding the <literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> keyword."
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:198
+#: batch.xml:201
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -282,19 +288,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:200
+#: batch.xml:203
 #, no-c-format
-msgid "Note that custom version types (<literal>org.hibernate.usertype.UserVersionType</literal>) are not allowed in conjunction with a <literal>update versioned</literal> statement."
+msgid "Custom version types, <literal>org.hibernate.usertype.UserVersionType</literal>, are not allowed in conjunction with a <literal>update versioned</literal> statement."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:205
+#: batch.xml:208
 #, no-c-format
 msgid "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query.executeUpdate()</literal> method:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:210
+#: batch.xml:213
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -310,55 +316,55 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:212
+#: batch.xml:215
 #, no-c-format
-msgid "The <literal>int</literal> value returned by the <literal>Query.executeUpdate()</literal> method indicate the number of entities effected by the operation. Consider this may or may not correlate to the number of rows effected in the database. An HQL bulk operation might result in multiple actual SQL statements being executed, for joined-subclass, for example. The returned number indicates the number of actual entities affected by the statement. Going back to the example of joined-subclass, a delete against one of the subclasses may actually result in deletes against not just the table to which that subclass is mapped, but also the \"root\" table and potentially joined-subclass tables further down the inheritence hierarchy."
+msgid "The <literal>int</literal> value returned by the <literal>Query.executeUpdate()</literal> method indicates the number of entities effected by the operation. This may or may not correlate to the number of rows effected in the database. An HQL bulk operation might result in multiple actual SQL statements being executed (for joined-subclass, for example). The returned number indicates the number of actual entities affected by the statement. Going back to the example of joined-subclass, a delete against one of the subclasses may actually result in deletes against not just the table to which that subclass is mapped, but also the \"root\" table and potentially joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:223
+#: batch.xml:226
 #, no-c-format
 msgid "The pseudo-syntax for <literal>INSERT</literal> statements is: <literal>INSERT INTO EntityName properties_list select_statement</literal>. Some points to note:"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:231
+#: batch.xml:234
 #, no-c-format
 msgid "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT INTO ... VALUES ... form."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:234
+#: batch.xml:237
 #, no-c-format
-msgid "The properties_list is analogous to the <literal>column speficiation</literal> in the SQL <literal>INSERT</literal> statement. For entities involved in mapped inheritence, only properties directly defined on that given class-level can be used in the properties_list. Superclass properties are not allowed; and subclass properties do not make sense. In other words, <literal>INSERT</literal> statements are inherently non-polymorphic."
+msgid "The properties_list is analogous to the <literal>column specification</literal> in the SQL <literal>INSERT</literal> statement. For entities involved in mapped inheritance, only properties directly defined on that given class-level can be used in the properties_list. Superclass properties are not allowed and subclass properties do not make sense. In other words, <literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:244
+#: batch.xml:247
 #, no-c-format
-msgid "select_statement can be any valid HQL select query, with the caveat that the return types must match the types expected by the insert. Currently, this is checked during query compilation rather than allowing the check to relegate to the database. Note however that this might cause problems between Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> as opposed to <emphasis>equal</emphasis>. This might cause issues with mismatches between a property defined as a <literal>org.hibernate.type.DateType</literal> and a property defined as a <literal>org.hibernate.type.TimestampType</literal>, even though the database might not make a distinction or might be able to handle the conversion."
+msgid "select_statement can be any valid HQL select query, with the caveat that the return types must match the types expected by the insert. Currently, this is checked during query compilation rather than allowing the check to relegate to the database. This might, however, cause problems between Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> as opposed to <emphasis>equal</emphasis>. This might cause issues with mismatches between a property defined as a <literal>org.hibernate.type.DateType</literal> and a property defined as a <literal>org.hibernate.type.TimestampType</literal>, even though the database might not make a distinction or might be able to handle the conversion."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:256
+#: batch.xml:259
 #, no-c-format
-msgid "For the id property, the insert statement gives you two options. You can either explicitly specify the id property in the properties_list (in which case its value is taken from the corresponding select expression) or omit it from the properties_list (in which case a generated value is used). This later option is only available when using id generators that operate in the database; attempting to use this option with any \"in memory\" type generators will cause an exception during parsing. Note that for the purposes of this discussion, in-database generators are considered to be <literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) and any implementors of <literal>org.hibernate.id.PostInsertIdentifierGenerator</literal>. The most notable exception here is <literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used because it does not expose a selectable way to get its values."
+msgid "For the id property, the insert statement gives you two options. You can either explicitly specify the id property in the properties_list, in which case its value is taken from the corresponding select expression, or omit it from the properties_list, in which case a generated value is used. This latter option is only available when using id generators that operate in the database; attempting to use this option with any \"in memory\" type generators will cause an exception during parsing. For the purposes of this discussion, in-database generators are considered to be <literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) and any implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</literal>. The most notable exception here is <literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used because it does not expose a selectable way to get its values."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:271
+#: batch.xml:274
 #, no-c-format
-msgid "For properties mapped as either <literal>version</literal> or <literal>timestamp</literal>, the insert statement gives you two options. You can either specify the property in the properties_list (in which case its value is taken from the corresponding select expressions) or omit it from the properties_list (in which case the <literal>seed value</literal> defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+msgid "For properties mapped as either <literal>version</literal> or <literal>timestamp</literal>, the insert statement gives you two options. You can either specify the property in the properties_list, in which case its value is taken from the corresponding select expressions, or omit it from the properties_list, in which case the <literal>seed value</literal> defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 
 #. Tag: para
-#: batch.xml:281
+#: batch.xml:284
 #, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+msgid "The following is an example of an HQL <literal>INSERT</literal> statement execution:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:285
+#: batch.xml:288
 #, no-c-format
 msgid ""
       "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: term
 #: best_practices.xml:33
 #, no-c-format
-msgid "Write fine-grained classes and map them using <literal>&lt;component&gt;</literal>."
+msgid "Write fine-grained classes and map them using <literal>&lt;component&gt;</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -35,19 +35,19 @@
 #. Tag: term
 #: best_practices.xml:43
 #, no-c-format
-msgid "Declare identifier properties on persistent classes."
+msgid "Declare identifier properties on persistent classes:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:45
 #, no-c-format
-msgid "Hibernate makes identifier properties optional. There are all sorts of reasons why you should use them. We recommend that identifiers be 'synthetic' (generated, with no business meaning)."
+msgid "Hibernate makes identifier properties optional. There are a range of reasons why you should use them. We recommend that identifiers be 'synthetic', that is, generated with no business meaning."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:53
 #, no-c-format
-msgid "Identify natural keys."
+msgid "Identify natural keys:"
 msgstr ""
 
 #. Tag: para
@@ -59,19 +59,19 @@
 #. Tag: term
 #: best_practices.xml:63
 #, no-c-format
-msgid "Place each class mapping in its own file."
+msgid "Place each class mapping in its own file:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:65
 #, no-c-format
-msgid "Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes particularly good sense in a team environment."
+msgid "Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes sense, particularly in a team environment."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:73
 #, no-c-format
-msgid "Load mappings as resources."
+msgid "Load mappings as resources:"
 msgstr ""
 
 #. Tag: para
@@ -83,13 +83,13 @@
 #. Tag: term
 #: best_practices.xml:81
 #, no-c-format
-msgid "Consider externalising query strings."
+msgid "Consider externalizing query strings:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:83
 #, no-c-format
-msgid "This is a good practice if your queries call non-ANSI-standard SQL functions. Externalising the query strings to mapping files will make the application more portable."
+msgid "This is recommended if your queries call non-ANSI-standard SQL functions. Externalizing the query strings to mapping files will make the application more portable."
 msgstr ""
 
 #. Tag: term
@@ -101,145 +101,145 @@
 #. Tag: para
 #: best_practices.xml:93
 #, no-c-format
-msgid "As in JDBC, always replace non-constant values by \"?\". Never use string manipulation to bind a non-constant value in a query! Even better, consider using named parameters in queries."
+msgid "As in JDBC, always replace non-constant values by \"?\". Do not use string manipulation to bind a non-constant value in a query. You should also consider using named parameters in queries."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:101
 #, no-c-format
-msgid "Don't manage your own JDBC connections."
+msgid "Do not manage your own JDBC connections:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:103
 #, no-c-format
-msgid "Hibernate lets the application manage JDBC connections. This approach should be considered a last-resort. If you can't use the built-in connections providers, consider providing your own implementation of <literal>org.hibernate.connection.ConnectionProvider</literal>."
+msgid "Hibernate allows the application to manage JDBC connections, but his approach should be considered a last-resort. If you cannot use the built-in connection providers, consider providing your own implementation of <literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:111
 #, no-c-format
-msgid "Consider using a custom type."
+msgid "Consider using a custom type:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:113
 #, no-c-format
-msgid "Suppose you have a Java type, say from some library, that needs to be persisted but doesn't provide the accessors needed to map it as a component. You should consider implementing <literal>org.hibernate.UserType</literal>. This approach frees the application code from implementing transformations to / from a Hibernate type."
+msgid "Suppose you have a Java type from a library that needs to be persisted but does not provide the accessors needed to map it as a component. You should consider implementing <literal>org.hibernate.UserType</literal>. This approach frees the application code from implementing transformations to/from a Hibernate type."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:122
 #, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:124
 #, no-c-format
-msgid "In performance-critical areas of the system, some kinds of operations might benefit from direct JDBC. But please, wait until you <emphasis>know</emphasis> something is a bottleneck. And don't assume that direct JDBC is necessarily faster. If you need to use direct JDBC, it might be worth opening a Hibernate <literal>Session</literal> and using that JDBC connection. That way you can still use the same transaction strategy and underlying connection provider."
+msgid "In performance-critical areas of the system, some kinds of operations might benefit from direct JDBC. Do not assume, however, that JDBC is necessarily faster. Please wait until you <emphasis>know</emphasis> something is a bottleneck. If you need to use direct JDBC, you can open a Hibernate <literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index.html that JDBC connection. This way you can still use the same transaction strategy and underlying connection provider."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:134
 #, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:136
 #, no-c-format
-msgid "From time to time the Session synchronizes its persistent state with the database. Performance will be affected if this process occurs too often. You may sometimes minimize unnecessary flushing by disabling automatic flushing or even by changing the order of queries and other operations within a particular transaction."
+msgid "Sometimes the Session synchronizes its persistent state with the database. Performance will be affected if this process occurs too often. You can sometimes minimize unnecessary flushing by disabling automatic flushing, or even by changing the order of queries and other operations within a particular transaction."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:145
 #, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:147
 #, no-c-format
-msgid "When using a servlet / session bean architecture, you could pass persistent objects loaded in the session bean to and from the servlet / JSP layer. Use a new session to service each request. Use <literal>Session.merge()</literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the database."
+msgid "When using a servlet/session bean architecture, you can pass persistent objects loaded in the session bean to and from the servlet/JSP layer. Use a new session to service each request. Use <literal>Session.merge()</literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the database."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:156
 #, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:158
 #, no-c-format
-msgid "Database Transactions have to be as short as possible for best scalability. However, it is often neccessary to implement long running <emphasis>application transactions</emphasis>, a single unit-of-work from the point of view of a user. An application transaction might span several client request/response cycles. It is common to use detached objects to implement application transactions. An alternative, extremely appropriate in two tiered architecture, is to maintain a single open persistence contact (session) for the whole life cycle of the application transaction and simply disconnect from the JDBC connection at the end of each request and reconnect at the beginning of the subsequent request. Never share a single session across more than one application transaction, or you will be working with stale data."
+msgid "Database Transactions have to be as short as possible for best scalability. However, it is often necessary to implement long running <emphasis>application transactions</emphasis>, a single unit-of-work from the point of view of a user. An application transaction might span several client request/response cycles. It is common to use detached objects to implement application transactions. An appropriate alternative in a two tiered architecture, is to maintain a single open persistence contact session for the whole life cycle of the application transaction. Then simply disconnect from the JDBC connection at the end of each request and reconnect at the beginning of the subsequent request. Never share a single session across more than one application transaction or you will be working with stale data."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:172
 #, no-c-format
-msgid "Don't treat exceptions as recoverable."
+msgid "Do not treat exceptions as recoverable:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:174
 #, no-c-format
-msgid "This is more of a necessary practice than a \"best\" practice. When an exception occurs, roll back the <literal>Transaction</literal> and close the <literal>Session</literal>. If you don't, Hibernate can't guarantee that in-memory state accurately represents persistent state. As a special case of this, do not use <literal>Session.load()</literal> to determine if an instance with the given identifier exists on the database; use <literal>Session.get()</literal> or a query instead."
+msgid "This is more of a necessary practice than a \"best\" practice. When an exception occurs, roll back the <literal>Transaction</literal> and close the <literal>Session</literal>. If you do not do this, Hibernate cannot guarantee that in-memory state accurately represents the persistent state. For example, do not use <literal>Session.load()</literal> to determine if an instance with the given identifier exists on the database; use <literal>Session.get()</literal> or a query instead."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:184
 #, no-c-format
-msgid "Prefer lazy fetching for associations."
+msgid "Prefer lazy fetching for associations:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:186
 #, no-c-format
-msgid "Use eager fetching sparingly. Use proxies and lazy collections for most associations to classes that are not likely to be completely held in the second-level cache. For associations to cached classes, where there is an a extremely high probability of a cache hit, explicitly disable eager fetching using <literal>lazy=\"false\"</literal>. When an join fetching is appropriate to a particular use case, use a query with a <literal>left join fetch</literal>."
+msgid "Use eager fetching sparingly. Use proxies and lazy collections for most associations to classes that are not likely to be completely held in the second-level cache. For associations to cached classes, where there is an a extremely high probability of a cache hit, explicitly disable eager fetching using <literal>lazy=\"false\"</literal>. When join fetching is appropriate to a particular use case, use a query with a <literal>left join fetch</literal>."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:196
 #, no-c-format
-msgid "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined <emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+msgid "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined <emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:201
 #, no-c-format
-msgid "Hibernate frees the developer from writing tedious <emphasis>Data Transfer Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual purposes: first, they work around the problem that entity beans are not serializable; second, they implicitly define an assembly phase where all data to be used by the view is fetched and marshalled into the DTOs before returning control to the presentation tier. Hibernate eliminates the first purpose. However, you will still need an assembly phase (think of your business methods as having a strict contract with the presentation tier about what data is available in the detached objects) unless you are prepared to hold the persistence context (the session) open across the view rendering process. This is not a limitation of Hibernate! It is a fundamental requirement of safe transactional data access."
+msgid "Hibernate frees the developer from writing tedious <emphasis>Data Transfer Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual purposes: first, they work around the problem that entity beans are not serializable; second, they implicitly define an assembly phase where all data to be used by the view is fetched and marshalled into the DTOs before returning control to the presentation tier. Hibernate eliminates the first purpose. Unless you are prepared to hold the persistence context (the session) open across the view rendering process, you will still need an assembly phase. Think of your business methods as having a strict contract with the presentation tier about what data is available in the detached objects. This is not a limitation of Hibernate. It is a fundamental requirement of safe transactional data access."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:215
 #, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:217
 #, no-c-format
-msgid "Hide (Hibernate) data-access code behind an interface. Combine the <emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> patterns. You can even have some classes persisted by handcoded JDBC, associated to Hibernate via a <literal>UserType</literal>. (This advice is intended for \"sufficiently large\" applications; it is not appropriate for an application with five tables!)"
+msgid "Hide Hibernate data-access code behind an interface. Combine the <emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> patterns. You can even have some classes persisted by handcoded JDBC associated to Hibernate via a <literal>UserType</literal>. This advice is, however, intended for \"sufficiently large\" applications. It is not appropriate for an application with five tables."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:227
 #, no-c-format
-msgid "Don't use exotic association mappings."
+msgid "Do not use exotic association mappings:"
 msgstr ""
 
 #. Tag: para
 #: best_practices.xml:229
 #, no-c-format
-msgid "Good usecases for a real many-to-many associations are rare. Most of the time you need additional information stored in the \"link table\". In this case, it is much better to use two one-to-many associations to an intermediate link class. In fact, we think that most associations are one-to-many and many-to-one, you should be careful when using any other association style and ask yourself if it is really neccessary."
+msgid "Practical test cases for real many-to-many associations are rare. Most of the time you need additional information stored in the \"link table\". In this case, it is much better to use two one-to-many associations to an intermediate link class. In fact, most associations are one-to-many and many-to-one. For this reason, you should proceed cautiously when using any other association style."
 msgstr ""
 
 #. Tag: term
 #: best_practices.xml:239
 #, no-c-format
-msgid "Prefer bidirectional associations."
+msgid "Prefer bidirectional associations:"
 msgstr ""
 
 #. Tag: para

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -17,7 +17,7 @@
 #. Tag: title
 #: collection_mapping.xml:29
 #, no-c-format
-msgid "Collection Mapping"
+msgid "Collection mapping"
 msgstr ""
 
 #. Tag: title
@@ -29,7 +29,7 @@
 #. Tag: para
 #: collection_mapping.xml:34
 #, no-c-format
-msgid "Hibernate requires that persistent collection-valued fields be declared as an interface type, for example:"
+msgid "Hibernate requires that persistent collection-valued fields be declared as an interface type. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -50,13 +50,13 @@
 #. Tag: para
 #: collection_mapping.xml:41
 #, no-c-format
-msgid "The actual interface might be <literal>java.util.Set</literal>, <literal>java.util.Collection</literal>, <literal>java.util.List</literal>, <literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, <literal>java.util.SortedMap</literal> or ... anything you like! (Where \"anything you like\" means you will have to write an implementation of <literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+msgid "The actual interface might be <literal>java.util.Set</literal>, <literal>java.util.Collection</literal>, <literal>java.util.List</literal>, <literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, <literal>java.util.SortedMap</literal> or anything you like (\"anything you like\" means you will have to write an implementation of <literal>org.hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:50
 #, no-c-format
-msgid "Notice how we initialized the instance variable with an instance of <literal>HashSet</literal>. This is the best way to initialize collection valued properties of newly instantiated (non-persistent) instances. When you make the instance persistent - by calling <literal>persist()</literal>, for example - Hibernate will actually replace the <literal>HashSet</literal> with an instance of Hibernate's own implementation of <literal>Set</literal>. Watch out for errors like this:"
+msgid "Notice how the instance variable was initialized with an instance of <literal>HashSet</literal>. This is the best way to initialize collection valued properties of newly instantiated (non-persistent) instances. When you make the instance persistent, by calling <literal>persist()</literal> for example, Hibernate will actually replace the <literal>HashSet</literal> with an instance of Hibernate's own implementation of <literal>Set</literal>. Be aware of the following errors:"
 msgstr ""
 
 #. Tag: programlisting
@@ -77,19 +77,19 @@
 #. Tag: para
 #: collection_mapping.xml:62
 #, no-c-format
-msgid "The persistent collections injected by Hibernate behave like <literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, depending upon the interface type."
+msgid "The persistent collections injected by Hibernate behave like <literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, depending on the interface type."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:69
 #, no-c-format
-msgid "Collections instances have the usual behavior of value types. They are automatically persisted when referenced by a persistent object and automatically deleted when unreferenced. If a collection is passed from one persistent object to another, its elements might be moved from one table to another. Two entities may not share a reference to the same collection instance. Due to the underlying relational model, collection-valued properties do not support null value semantics; Hibernate does not distinguish between a null collection reference and an empty collection."
+msgid "Collections instances have the usual behavior of value types. They are automatically persisted when referenced by a persistent object and are automatically deleted when unreferenced. If a collection is passed from one persistent object to another, its elements might be moved from one table to another. Two entities cannot share a reference to the same collection instance. Due to the underlying relational model, collection-valued properties do not support null value semantics. Hibernate does not distinguish between a null collection reference and an empty collection."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:80
 #, no-c-format
-msgid "You shouldn't have to worry much about any of this. Use persistent collections the same way you use ordinary Java collections. Just make sure you understand the semantics of bidirectional associations (discussed later)."
+msgid "Use persistent collections the same way you use ordinary Java collections. However, please ensure you understand the semantics of bidirectional associations (these are discussed later)."
 msgstr ""
 
 #. Tag: title
@@ -101,13 +101,13 @@
 #. Tag: para
 #: collection_mapping.xml:92
 #, no-c-format
-msgid "There are quite a range of mappings that can be generated for collections, covering many common relational models. We suggest you experiment with the schema generation tool to get a feeling for how various mapping declarations translate to database tables."
+msgid "There are quite a range of mappings that can be generated for collections that cover many common relational models. We suggest you experiment with the schema generation tool so that you understand how various mapping declarations translate to database tables."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:99
 #, no-c-format
-msgid "The Hibernate mapping element used for mapping a collection depends upon the type of the interface. For example, a <literal>&lt;set&gt;</literal> element is used for mapping properties of type <literal>Set</literal>."
+msgid "The Hibernate mapping element used for mapping a collection depends upon the type of interface. For example, a <literal>&lt;set&gt;</literal> element is used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -161,85 +161,85 @@
 #. Tag: para
 #: collection_mapping.xml:135
 #, no-c-format
-msgid "<literal>name</literal> the collection property name"
+msgid "<literal>name</literal>: the collection property name"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:140
 #, no-c-format
-msgid "<literal>table</literal> (optional - defaults to property name) the name of the collection table (not used for one-to-many associations)"
+msgid "<literal>table</literal> (optional - defaults to property name): the name of the collection table. It is not used for one-to-many associations."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:146
 #, no-c-format
-msgid "<literal>schema</literal> (optional) the name of a table schema to override the schema declared on the root element"
+msgid "<literal>schema</literal> (optional): the name of a table schema to override the schema declared on the root element"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:152
 #, no-c-format
-msgid "<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may be used to disable lazy fetching and specify that the association is always eagerly fetched, or to enable \"extra-lazy\" fetching where most operations do not initialize the collection (suitable for very large collections)"
+msgid "<literal>lazy</literal> (optional - defaults to <literal>true</literal>): disables lazy fetching and specifies that the association is always eagerly fetched. It can also be used to enable \"extra-lazy\" fetching where most operations do not initialize the collection. This is suitable for large collections."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:161
 #, no-c-format
-msgid "<literal>inverse</literal> (optional - defaults to <literal>false</literal>) mark this collection as the \"inverse\" end of a bidirectional association"
+msgid "<literal>inverse</literal> (optional - defaults to <literal>false</literal>): marks this collection as the \"inverse\" end of a bidirectional association."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:167
 #, no-c-format
-msgid "<literal>cascade</literal> (optional - defaults to <literal>none</literal>) enable operations to cascade to child entities"
+msgid "<literal>cascade</literal> (optional - defaults to <literal>none</literal>): enables operations to cascade to child entities."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:173
 #, no-c-format
-msgid "<literal>sort</literal> (optional) specify a sorted collection with <literal>natural</literal> sort order, or a given comparator class"
+msgid "<literal>sort</literal> (optional): specifies a sorted collection with <literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:179
 #, no-c-format
-msgid "<literal>order-by</literal> (optional, JDK1.4 only) specify a table column (or columns) that define the iteration order of the <literal>Map</literal>, <literal>Set</literal> or bag, together with an optional <literal>asc</literal> or <literal>desc</literal>"
+msgid "<literal>order-by</literal> (optional, JDK1.4 only): specifies a table column or columns that define the iteration order of the <literal>Map</literal>, <literal>Set</literal> or bag, together with an optional <literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:186
 #, no-c-format
-msgid "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</literal> condition to be used when retrieving or removing the collection (useful if the collection should contain only a subset of the available data)"
+msgid "<literal>where</literal> (optional): specifies an arbitrary SQL <literal>WHERE</literal> condition that is used when retrieving or removing the collection. This is useful if the collection needs to contain only a subset of the available data."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:193
 #, no-c-format
-msgid "<literal>fetch</literal> (optional, defaults to <literal>select</literal>) Choose between outer-join fetching, fetching by sequential select, and fetching by sequential subselect."
+msgid "<literal>fetch</literal> (optional, defaults to <literal>select</literal>): chooses between outer-join fetching, fetching by sequential select, and fetching by sequential subselect."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:200
 #, no-c-format
-msgid "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) specify a \"batch size\" for lazily fetching instances of this collection."
+msgid "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:206
 #, no-c-format
-msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): The strategy Hibernate should use for accessing the collection property value."
+msgid "<literal>access</literal> (optional - defaults to <literal>property</literal>): the strategy Hibernate uses for accessing the collection property value."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:212
 #, no-c-format
-msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): Species that changes to the state of the collection results in increment of the owning entity's version. (For one to many associations, it is often reasonable to disable this setting.)"
+msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>): specifies that changes to the state of the collection results in increments of the owning entity's version. For one-to-many associations you may want to disable this setting."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:220
 #, no-c-format
-msgid "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): A value of <literal>false</literal> specifies that the elements of the collection never change (a minor performance optimization in some cases)."
+msgid "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): a value of <literal>false</literal> specifies that the elements of the collection never change. This allows for minor performance optimization in some cases."
 msgstr ""
 
 #. Tag: title
@@ -251,13 +251,13 @@
 #. Tag: para
 #: collection_mapping.xml:232
 #, no-c-format
-msgid "Collection instances are distinguished in the database by the foreign key of the entity that owns the collection. This foreign key is referred to as the <emphasis>collection key column</emphasis> (or columns) of the collection table. The collection key column is mapped by the <literal>&lt;key&gt;</literal> element."
+msgid "Collection instances are distinguished in the database by the foreign key of the entity that owns the collection. This foreign key is referred to as the <emphasis>collection key column</emphasis>, or columns, of the collection table. The collection key column is mapped by the <literal>&lt;key&gt;</literal> element."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:240
 #, no-c-format
-msgid "There may be a nullability constraint on the foreign key column. For most collections, this is implied. For unidirectional one to many associations, the foreign key column is nullable by default, so you might need to specify <literal>not-null=\"true\"</literal>."
+msgid "There can be a nullability constraint on the foreign key column. For most collections, this is implied. For unidirectional one-to-many associations, the foreign key column is nullable by default, so you may need to specify <literal>not-null=\"true\"</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -269,7 +269,7 @@
 #. Tag: para
 #: collection_mapping.xml:249
 #, no-c-format
-msgid "The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+msgid "The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -293,7 +293,7 @@
 #. Tag: para
 #: collection_mapping.xml:265
 #, no-c-format
-msgid "Collections may contain almost any other Hibernate type, including all basic types, custom types, components, and of course, references to other entities. This is an important distinction: an object in a collection might be handled with \"value\" semantics (its life cycle fully depends on the collection owner) or it might be a reference to another entity, with its own life cycle. In the latter case, only the \"link\" between the two objects is considered to be state held by the collection."
+msgid "Collections can contain almost any other Hibernate type, including: basic types, custom types, components and references to other entities. This is an important distinction. An object in a collection might be handled with \"value\" semantics (its life cycle fully depends on the collection owner), or it might be a reference to another entity with its own life cycle. In the latter case, only the \"link\" between the two objects is considered to be a state held by the collection."
 msgstr ""
 
 #. Tag: para
@@ -311,7 +311,7 @@
 #. Tag: para
 #: collection_mapping.xml:288
 #, no-c-format
-msgid "All collection mappings, except those with set and bag semantics, need an <emphasis>index column</emphasis> in the collection table - a column that maps to an array index, or <literal>List</literal> index, or <literal>Map</literal> key. The index of a <literal>Map</literal> may be of any basic type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</literal>. The index of an array or list is always of type <literal>integer</literal> and is mapped using the <literal>&lt;list-index&gt;</literal> element. The mapped column contains sequential integers (numbered from zero, by default)."
+msgid "All collection mappings, except those with set and bag semantics, need an <emphasis>index column</emphasis> in the collection table. An index column is a column that maps to an array index, or <literal>List</literal> index, or <literal>Map</literal> key. The index of a <literal>Map</literal> may be of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it can be a composite type mapped with <literal>&lt;composite-map-key&gt;</literal>. The index of an array or list is always of type <literal>integer</literal> and is mapped using the <literal>&lt;list-index&gt;</literal> element. The mapped column contains sequential integers that are numbered from zero by default."
 msgstr ""
 
 #. Tag: sect2
@@ -320,22 +320,22 @@
 msgid ""
       "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id=\"index2\" coords=\"3 45\"/> </areaspec> <programlisting><![CDATA[<list-index \n"
       "        column=\"column_name\"\n"
-      "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The name of the column holding the collection index values. </para> </callout> <callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, defaults to <literal>0</literal>): The value of the index column that corresponds to the first element of the list or array. </para> </callout> </calloutlist> </programlistingco> <programlistingco> <areaspec> <area id=\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area id=\"mapkey3\" coords=\"4 45\"/> </areaspec> <programlisting><![CDATA[<map-key \n"
+      "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the name of the column holding the collection index values. </para> </callout> <callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - defaults to <literal>0</literal>): the value of the index column that corresponds to the first element of the list or array. </para> </callout> </calloutlist> </programlistingco> <programlistingco> <areaspec> <area id=\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area id=\"mapkey3\" coords=\"4 45\"/> </areaspec> <programlisting><![CDATA[<map-key \n"
       "        column=\"column_name\"\n"
       "        formula=\"any SQL expression\"\n"
       "        type=\"type_name\"\n"
       "        node=\"@attribute-name\"\n"
-      "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs=\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the column holding the collection index values. </para> </callout> <callout arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL formula used to evaluate the key of the map. </para> </callout> <callout arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of the map keys. </para> </callout> </calloutlist> </programlistingco> <programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3\" coords=\"3 45\"/> </areaspec> <programlisting><![CDATA[<map-key-many-to-many\n"
+      "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs=\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the column holding the collection index values. </para> </callout> <callout arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL formula used to evaluate the key of the map. </para> </callout> <callout arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of the map keys. </para> </callout> </calloutlist> </programlistingco> <programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3\" coords=\"3 45\"/> </areaspec> <programlisting><![CDATA[<map-key-many-to-many\n"
       "        column=\"column_name\"\n"
       "        formula=\"any SQL expression\"\n"
       "        class=\"ClassName\"\n"
-      "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> <para> <literal>column</literal> (optional): The name of the foreign key column for the collection index values. </para> </callout> <callout arearefs=\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL formula used to evaluate the foreign key of the map key. </para> </callout> <callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> (required): The entity class used as the map key. </para> </callout> </calloutlist> </programlistingco>"
+      "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> <para> <literal>column</literal> (optional): the name of the foreign key column for the collection index values. </para> </callout> <callout arearefs=\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ formula used to evaluate the foreign key of the map key. </para> </callout> <callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> (required): the entity class used as the map key. </para> </callout> </calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:380
 #, no-c-format
-msgid "If your table doesn't have an index column, and you still wish to use <literal>List</literal> as the property type, you should map the property as a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order when it is retrieved from the database, but it may be optionally sorted or ordered."
+msgid "If your table does not have an index column, and you still wish to use <literal>List</literal> as the property type, you can map the property as a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order when it is retrieved from the database, but it can be optionally sorted or ordered."
 msgstr ""
 
 #. Tag: title
@@ -347,13 +347,13 @@
 #. Tag: para
 #: collection_mapping.xml:392
 #, no-c-format
-msgid "Any collection of values or many-to-many association requires a dedicated <emphasis>collection table</emphasis> with a foreign key column or columns, <emphasis>collection element column</emphasis> or columns and possibly an index column or columns."
+msgid "Any collection of values or many-to-many associations requires a dedicated <emphasis>collection table</emphasis> with a foreign key column or columns, <emphasis>collection element column</emphasis> or columns, and possibly an index column or columns."
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:399
 #, no-c-format
-msgid "For a collection of values, we use the <literal>&lt;element&gt;</literal> tag."
+msgid "For a collection of values use the <literal>&lt;element&gt;</literal> tag. For example:"
 msgstr ""
 
 #. Tag: sect2
@@ -370,7 +370,7 @@
       "        not-null=\"true|false\"\n"
       "        unique=\"true|false\"\n"
       "        node=\"element-name\"\n"
-      "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> <literal>column</literal> (optional): The name of the column holding the collection element values. </para> </callout> <callout arearefs=\"element2b\"> <para> <literal>formula</literal> (optional): An SQL formula used to evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> <para> <literal>type</literal> (required): The type of the collection element. </para> </callout> </calloutlist> </programlistingco> <para> A <emphasis>many-to-many association</emphasis> is specified using the <literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> <areaspec> <area id=\"manytomany1\" coords=\"2 60\"/> <area id=\"manytomany2\" coords=\"3 60\"/> <area id=\"manytomany3\" coords=\"4 60\"/> <area id=\"manytomany4\" coords=\"5 60\"/> <area id=\"manytomany5\" coords=\"6 60\"/> <area id=\"manytomany6\" coords=\"7 60\"/> <area id=\"manytomany7\" coords=\"8 60\"/> <area id=\!
 "manytomany8\" coords=\"9 60\"/> </areaspec> <programlisting><![CDATA[<many-to-many\n"
+      "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> <literal>column</literal> (optional): the name of the column holding the collection element values. </para> </callout> <callout arearefs=\"element2b\"> <para> <literal>formula</literal> (optional): an SQL formula used to evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> <para> <literal>type</literal> (required): the type of the collection element. </para> </callout> </calloutlist> </programlistingco> <para> A <emphasis>many-to-many association</emphasis> is specified using the <literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> <areaspec> <area id=\"manytomany1\" coords=\"2 60\"/> <area id=\"manytomany2\" coords=\"3 60\"/> <area id=\"manytomany3\" coords=\"4 60\"/> <area id=\"manytomany4\" coords=\"5 60\"/> <area id=\"manytomany5\" coords=\"6 60\"/> <area id=\"manytomany6\" coords=\"7 60\"/> <area id=\"manytomany7\" coords=\"8 60\"/> <area id=\!
 "manytomany8\" coords=\"9 60\"/> </areaspec> <programlisting><![CDATA[<many-to-many\n"
       "        column=\"column_name\"\n"
       "        formula=\"any SQL expression\"\n"
       "        class=\"ClassName\"\n"
@@ -381,17 +381,23 @@
       "        property-ref=\"propertyNameFromAssociatedClass\"\n"
       "        node=\"element-name\"\n"
       "        embed-xml=\"true|false\"\n"
-      "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> <para> <literal>column</literal> (optional): The name of the element foreign key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> <literal>formula</literal> (optional): An SQL formula used to evaluate the element foreign key value. </para> </callout> <callout arearefs=\"manytomany3\"> <para> <literal>class</literal> (required): The name of the associated class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> <literal>fetch</literal> (optional - defaults to <literal>join</literal>): enables outer-join or sequential select fetching for this association. This is a special case; for full eager fetching (in a single <literal>SELECT</literal>) of an entity and its many-to-many relationships to other entities, you would enable <literal>join</literal> fetching not only of the collection itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</literal!
 > nested element. </para> </callout> <callout arearefs=\"manytomany5\"> <para> <literal>unique</literal> (optional): Enable the DDL generation of a unique constraint for the foreign-key column. This makes the association multiplicity effectively one to many. </para> </callout> <callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> (optional - defaults to <literal>exception</literal>): Specifies how foreign keys that reference missing rows will be handled: <literal>ignore</literal> will treat a missing row as a null association. </para> </callout> <callout arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): The entity name of the associated class, as an alternative to <literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8\"> <para> <literal>property-ref</literal>: (optional) The name of a property of the associated class that is joined to this foreign key. If not specified, the primary key of the associated class !
 is used. </para> </callout> </calloutlist> </programlistingco>"
+      "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> <para> <literal>column</literal> (optional): the name of the element foreign key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> <literal>formula</literal> (optional): an SQL formula used to evaluate the element foreign key value. </para> </callout> <callout arearefs=\"manytomany3\"> <para> <literal>class</literal> (required): the name of the associated class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> <literal>fetch</literal> (optional - defaults to <literal>join</literal>): enables outer-join or sequential select fetching for this association. This is a special case; for full eager fetching in a single <literal>SELECT</literal> of an entity and its many-to-many relationships to other entities, you would enable <literal>join</literal> fetching,not only of the collection itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</literal> !
 nested element. </para> </callout> <callout arearefs=\"manytomany5\"> <para> <literal>unique</literal> (optional): enables the DDL generation of a unique constraint for the foreign-key column. This makes the association multiplicity effectively one-to-many. </para> </callout> <callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> (optional - defaults to <literal>exception</literal>): specifies how foreign keys that reference missing rows will be handled: <literal>ignore</literal> will treat a missing row as a null association. </para> </callout> <callout arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): the entity name of the associated class, as an alternative to <literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8\"> <para> <literal>property-ref</literal> (optional): the name of a property of the associated class that is joined to this foreign key. If not specified, the primary key of the associated class i!
 s used. </para> </callout> </calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
+msgid "Here are some examples."
 msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:510
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -401,13 +407,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:512
+#: collection_mapping.xml:515
 #, no-c-format
-msgid "A bag containing integers (with an iteration order determined by the <literal>order-by</literal> attribute):"
+msgid "A bag containing integers with an iteration order determined by the <literal>order-by</literal> attribute:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:517
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
       "<![CDATA[<bag name=\"sizes\" \n"
@@ -419,13 +425,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:519
+#: collection_mapping.xml:522
 #, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:523
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
       "<![CDATA[<array name=\"addresses\" \n"
@@ -438,13 +444,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:525
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:529
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
       "<![CDATA[<map name=\"holidays\" \n"
@@ -458,13 +464,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:531
+#: collection_mapping.xml:534
 #, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:535
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
       "<![CDATA[<list name=\"carComponents\" \n"
@@ -480,37 +486,37 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:540
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:542
+#: collection_mapping.xml:545
 #, no-c-format
-msgid "A <emphasis>one to many association</emphasis> links the tables of two classes via a foreign key, with no intervening collection table. This mapping loses certain semantics of normal Java collections:"
+msgid "A <emphasis>one-to-many association</emphasis> links the tables of two classes via a foreign key with no intervening collection table. This mapping loses certain semantics of normal Java collections:"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:550
+#: collection_mapping.xml:553
 #, no-c-format
-msgid "An instance of the contained entity class may not belong to more than one instance of the collection"
+msgid "An instance of the contained entity class cannot belong to more than one instance of the collection."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:556
+#: collection_mapping.xml:559
 #, no-c-format
-msgid "An instance of the contained entity class may not appear at more than one value of the collection index"
+msgid "An instance of the contained entity class cannot appear at more than one value of the collection index."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:563
+#: collection_mapping.xml:566
 #, no-c-format
-msgid "An association from <literal>Product</literal> to <literal>Part</literal> requires existence of a foreign key column and possibly an index column to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> tag indicates that this is a one to many association."
+msgid "An association from <literal>Product</literal> to <literal>Part</literal> requires the existence of a foreign key column and possibly an index column to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> tag indicates that this is a one-to-many association."
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:576
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
       "<![CDATA[<one-to-many \n"
@@ -523,43 +529,43 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:579
+#: collection_mapping.xml:582
 #, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:584
+#: collection_mapping.xml:587
 #, no-c-format
-msgid "<literal>not-found</literal> (optional - defaults to <literal>exception</literal>): Specifies how cached identifiers that reference missing rows will be handled: <literal>ignore</literal> will treat a missing row as a null association."
+msgid "<literal>not-found</literal> (optional - defaults to <literal>exception</literal>): specifies how cached identifiers that reference missing rows will be handled. <literal>ignore</literal> will treat a missing row as a null association."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:591
+#: collection_mapping.xml:594
 #, no-c-format
-msgid "<literal>entity-name</literal> (optional): The entity name of the associated class, as an alternative to <literal>class</literal>."
+msgid "<literal>entity-name</literal> (optional): the entity name of the associated class, as an alternative to <literal>class</literal>."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:599
+#: collection_mapping.xml:602
 #, no-c-format
-msgid "Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need to declare any columns. Nor is it necessary to specify the <literal>table</literal> name anywhere."
+msgid "The <literal>&lt;one-to-many&gt;</literal> element does not need to declare any columns. Nor is it necessary to specify the <literal>table</literal> name anywhere."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:609
 #, no-c-format
-msgid "<emphasis>Very important note:</emphasis> If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional association</emphasis> with the collection mapping marked <literal>inverse=\"true\"</literal>. See the discussion of bidirectional associations later in this chapter."
+msgid "If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional association</emphasis> with the collection mapping marked <literal>inverse=\"true\"</literal>. See the discussion of bidirectional associations later in this chapter for more information."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:614
+#: collection_mapping.xml:619
 #, no-c-format
-msgid "This example shows a map of <literal>Part</literal> entities by name (where <literal>partName</literal> is a persistent property of <literal>Part</literal>). Notice the use of a formula-based index."
+msgid "The following example shows a map of <literal>Part</literal> entities by name, where <literal>partName</literal> is a persistent property of <literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:620
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
       "<![CDATA[<map name=\"parts\"\n"
@@ -571,25 +577,25 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:626
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:629
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:631
+#: collection_mapping.xml:636
 #, no-c-format
 msgid "Hibernate supports collections implementing <literal>java.util.SortedMap</literal> and <literal>java.util.SortedSet</literal>. You must specify a comparator in the mapping file:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:636
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"aliases\" \n"
@@ -607,25 +613,25 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:638
+#: collection_mapping.xml:643
 #, no-c-format
 msgid "Allowed values of the <literal>sort</literal> attribute are <literal>unsorted</literal>, <literal>natural</literal> and the name of a class implementing <literal>java.util.Comparator</literal>."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:644
+#: collection_mapping.xml:649
 #, no-c-format
 msgid "Sorted collections actually behave like <literal>java.util.TreeSet</literal> or <literal>java.util.TreeMap</literal>."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:649
+#: collection_mapping.xml:654
 #, no-c-format
-msgid "If you want the database itself to order the collection elements use the <literal>order-by</literal> attribute of <literal>set</literal>, <literal>bag</literal> or <literal>map</literal> mappings. This solution is only available under JDK 1.4 or higher (it is implemented using <literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This performs the ordering in the SQL query, not in memory."
+msgid "If you want the database itself to order the collection elements, use the <literal>order-by</literal> attribute of <literal>set</literal>, <literal>bag</literal> or <literal>map</literal> mappings. This solution is only available under JDK 1.4 or higher and is implemented using <literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This performs the ordering in the SQL query and not in the memory."
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:658
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower(name) asc\">\n"
@@ -640,74 +646,80 @@
       "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:660
+#: collection_mapping.xml:667
 #, no-c-format
-msgid "Note that the value of the <literal>order-by</literal> attribute is an SQL ordering, not a HQL ordering!"
+msgid "The value of the <literal>order-by</literal> attribute is an SQL ordering, not an HQL ordering."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:665
+#: collection_mapping.xml:673
 #, no-c-format
-msgid "Associations may even be sorted by some arbitrary criteria at runtime using a collection <literal>filter()</literal>."
+msgid "Associations can even be sorted by arbitrary criteria at runtime using a collection <literal>filter()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:670
+#: collection_mapping.xml:678
 #, no-c-format
 msgid "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name\" ).list();]]>"
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:675
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:677
+#: collection_mapping.xml:685
 #, no-c-format
 msgid "A <emphasis>bidirectional association</emphasis> allows navigation from both \"ends\" of the association. Two kinds of bidirectional association are supported:"
 msgstr ""
 
 #. Tag: term
-#: collection_mapping.xml:684
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:686
+#: collection_mapping.xml:694
 #, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr ""
 
 #. Tag: term
-#: collection_mapping.xml:692
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:694
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:703
+#: collection_mapping.xml:711
 #, no-c-format
-msgid "You may specify a bidirectional many-to-many association simply by mapping two many-to-many associations to the same database table and declaring one end as <emphasis>inverse</emphasis> (which one is your choice, but it can not be an indexed collection)."
+msgid "You can specify a bidirectional many-to-many association by mapping two many-to-many associations to the same database table and declaring one end as <emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:710
+#: collection_mapping.xml:718
 #, no-c-format
-msgid "Here's an example of a bidirectional many-to-many association; each category can have many items and each item can be in many categories:"
+msgid "Here is an example of a bidirectional many-to-many association that illustrates how each category can have many items and each item can be in many categories:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:715
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Category\">\n"
@@ -732,13 +744,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:717
+#: collection_mapping.xml:725
 #, no-c-format
-msgid "Changes made only to the inverse end of the association are <emphasis>not</emphasis> persisted. This means that Hibernate has two representations in memory for every bidirectional association, one link from A to B and another link from B to A. This is easier to understand if you think about the Java object model and how we create a many-to-many relationship in Java:"
+msgid "Changes made only to the inverse end of the association are <emphasis>not</emphasis> persisted. This means that Hibernate has two representations in memory for every bidirectional association: one link from A to B and another link from B to A. This is easier to understand if you think about the Java object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:725
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -750,19 +762,19 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:727
+#: collection_mapping.xml:735
 #, no-c-format
 msgid "The non-inverse side is used to save the in-memory representation to the database."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
+#: collection_mapping.xml:739
 #, no-c-format
-msgid "You may define a bidirectional one-to-many association by mapping a one-to-many association to the same table column(s) as a many-to-one association and declaring the many-valued end <literal>inverse=\"true\"</literal>."
+msgid "You can define a bidirectional one-to-many association by mapping a one-to-many association to the same table column(s) as a many-to-one association and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:737
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Parent\">\n"
@@ -785,25 +797,25 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:739
+#: collection_mapping.xml:747
 #, no-c-format
-msgid "Mapping one end of an association with <literal>inverse=\"true\"</literal> doesn't affect the operation of cascades, these are orthogonal concepts!"
+msgid "Mapping one end of an association with <literal>inverse=\"true\"</literal> does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:747
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:748
+#: collection_mapping.xml:756
 #, no-c-format
-msgid "A bidirectional association where one end is represented as a <literal>&lt;list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special consideration. If there is a property of the child class which maps to the index column, no problem, we can continue using <literal>inverse=\"true\"</literal> on the collection mapping:"
+msgid "A bidirectional association where one end is represented as a <literal>&lt;list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special consideration. If there is a property of the child class that maps to the index column you can use <literal>inverse=\"true\"</literal> on the collection mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Parent\">\n"
@@ -830,13 +842,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:757
+#: collection_mapping.xml:765
 #, no-c-format
-msgid "But, if there is no such property on the child class, we can't think of the association as truly bidirectional (there is information available at one end of the association that is not available at the other end). In this case, we can't map the collection <literal>inverse=\"true\"</literal>. Instead, we could use the following mapping:"
+msgid "If there is no such property on the child class, the association cannot be considered truly bidirectional. That is, there is information available at one end of the association that is not available at the other end. In this case, you cannot map the collection <literal>inverse=\"true\"</literal>. Instead, you could use the following mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:764
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Parent\">\n"
@@ -864,25 +876,25 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:766
+#: collection_mapping.xml:774
 #, no-c-format
-msgid "Note that in this mapping, the collection-valued end of the association is responsible for updates to the foreign key. TODO: Does this really result in some unnecessary update statements?"
+msgid "Note that in this mapping, the collection-valued end of the association is responsible for updates to the foreign key."
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:774
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:776
+#: collection_mapping.xml:784
 #, no-c-format
-msgid "There are three possible approaches to mapping a ternary association. One is to use a <literal>Map</literal> with an association as its index:"
+msgid "There are three possible approaches to mapping a ternary association. One approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:781
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
       "<![CDATA[<map name=\"contracts\">\n"
@@ -893,7 +905,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:783
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
       "<![CDATA[<map name=\"connections\">\n"
@@ -904,37 +916,37 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:785
+#: collection_mapping.xml:793
 #, no-c-format
-msgid "A second approach is to simply remodel the association as an entity class. This is the approach we use most commonly."
+msgid "A second approach is to remodel the association as an entity class. This is the most common approach."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:790
+#: collection_mapping.xml:798
 #, no-c-format
-msgid "A final alternative is to use composite elements, which we will discuss later."
+msgid "A final alternative is to use composite elements, which will be discussed later."
 msgstr ""
 
 #. Tag: literal
-#: collection_mapping.xml:797
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:799
+#: collection_mapping.xml:807
 #, no-c-format
-msgid "If you've fully embraced our view that composite keys are a bad thing and that entities should have synthetic identifiers (surrogate keys), then you might find it a bit odd that the many to many associations and collections of values that we've shown so far all map to tables with composite keys! Now, this point is quite arguable; a pure association table doesn't seem to benefit much from a surrogate key (though a collection of composite values <emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that allows you to map many to many associations and collections of values to a table with a surrogate key."
+msgid "The majority of the many-to-many associations and collections of values shown previously all map to tables with composite keys, even though it has been have suggested that entities should have synthetic identifiers (surrogate keys). A pure association table does not seem to benefit much from a surrogate key, although a collection of composite values <emphasis>might</emphasis>. It is for this reason that Hibernate provides a feature that allows you to map many-to-many associations and collections of values to a table with a surrogate key."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:810
+#: collection_mapping.xml:817
 #, no-c-format
-msgid "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</literal> (or <literal>Collection</literal>) with bag semantics."
+msgid "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:815
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
       "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -947,37 +959,43 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:817
+#: collection_mapping.xml:824
 #, no-c-format
-msgid "As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like an entity class! A different surrogate key is assigned to each collection row. Hibernate does not provide any mechanism to discover the surrogate key value of a particular row, however."
+msgid "An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like an entity class. A different surrogate key is assigned to each collection row. Hibernate does not, however, provide any mechanism for discovering the surrogate key value of a particular row."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:824
+#: collection_mapping.xml:831
 #, no-c-format
-msgid "Note that the update performance of an <literal>&lt;idbag&gt;</literal> is <emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</literal>! Hibernate can locate individual rows efficiently and update or delete them individually, just like a list, map or set."
+msgid "The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows efficiently and update or delete them individually, similar to a list, map or set."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:837
 #, no-c-format
 msgid "In the current implementation, the <literal>native</literal> identifier generation strategy is not supported for <literal>&lt;idbag&gt;</literal> collection identifiers."
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:855
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:857
+#: collection_mapping.xml:863
 #, no-c-format
-msgid "The previous sections are pretty confusing. So lets look at an example. This class:"
+msgid "This section covers collection examples."
 msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:867
+#, no-c-format
+msgid "The following class has a collection of <literal>Child</literal> instances:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:862
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
       "<![CDATA[package eg;\n"
@@ -999,13 +1017,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:864
+#: collection_mapping.xml:873
 #, no-c-format
-msgid "has a collection of <literal>Child</literal> instances. If each child has at most one parent, the most natural mapping is a one-to-many association:"
+msgid "If each child has, at most, one parent, the most natural mapping is a one-to-many association:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:870
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -1031,13 +1049,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:872
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:876
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
       "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1046,13 +1064,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:878
+#: collection_mapping.xml:887
 #, no-c-format
 msgid "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-many association:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:883
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -1079,13 +1097,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:885
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:889
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
       "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1097,13 +1115,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:891
+#: collection_mapping.xml:900
 #, no-c-format
-msgid "Alternatively, if you absolutely insist that this association should be unidirectional, you can declare the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</literal> mapping:"
+msgid "Alternatively, if this association must be unidirectional you can declare the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</literal> mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:897
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -1129,13 +1147,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:899
+#: collection_mapping.xml:908
 #, no-c-format
-msgid "On the other hand, if a child might have multiple parents, a many-to-many association is appropriate:"
+msgid "On the other hand, if a child has multiple parents, a many-to-many association is appropriate:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:904
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -1161,13 +1179,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:906
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:910
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
       "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1180,14 +1198,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:912
+#: collection_mapping.xml:921
 #, no-c-format
-msgid "For more examples and a complete walk-through a parent/child relationship mapping, see <xref linkend=\"example-parentchild\"/>."
+msgid "For more examples and a complete explanation of a parent/child relationship mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:917
+#: collection_mapping.xml:926
 #, no-c-format
-msgid "Even more exotic association mappings are possible, we will catalog all possibilities in the next chapter."
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: component_mapping.xml:31
 #, no-c-format
-msgid "The notion of a <emphasis>component</emphasis> is re-used in several different contexts, for different purposes, throughout Hibernate."
+msgid "The notion of a <emphasis>component</emphasis> is re-used in several different contexts and purposes throughout Hibernate."
 msgstr ""
 
 #. Tag: title
@@ -35,7 +35,7 @@
 #. Tag: para
 #: component_mapping.xml:39
 #, no-c-format
-msgid "A component is a contained object that is persisted as a value type, not an entity reference. The term \"component\" refers to the object-oriented notion of composition (not to architecture-level components). For example, you might model a person like this:"
+msgid "A component is a contained object that is persisted as a value type and not an entity reference. The term \"component\" refers to the object-oriented notion of composition and not to architecture-level components. For example, you can model a person like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -101,13 +101,13 @@
 #. Tag: para
 #: component_mapping.xml:49
 #, no-c-format
-msgid "Now <literal>Name</literal> may be persisted as a component of <literal>Person</literal>. Notice that <literal>Name</literal> defines getter and setter methods for its persistent properties, but doesn't need to declare any interfaces or identifier properties."
+msgid "Now <literal>Name</literal> can be persisted as a component of <literal>Person</literal>. <literal>Name</literal> defines getter and setter methods for its persistent properties, but it does not need to declare any interfaces or identifier properties."
 msgstr ""
 
 #. Tag: para
 #: component_mapping.xml:56
 #, no-c-format
-msgid "Our Hibernate mapping would look like:"
+msgid "Our Hibernate mapping would look like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -136,23 +136,23 @@
 #. Tag: para
 #: component_mapping.xml:70
 #, no-c-format
-msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name ojects, only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes."
+msgid "Like value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name objects that were only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This is suitable for most purposes."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:79
+#: component_mapping.xml:78
 #, no-c-format
-msgid "The properties of a component may be of any Hibernate type (collections, many-to-one associations, other components, etc). Nested components should <emphasis>not</emphasis> be considered an exotic usage. Hibernate is intended to support a very fine-grained object model."
+msgid "The properties of a component can be of any Hibernate type (collections, many-to-one associations, other components, etc). Nested components should <emphasis>not</emphasis> be considered an exotic usage. Hibernate is intended to support a fine-grained object model."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:86
+#: component_mapping.xml:85
 #, no-c-format
 msgid "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;parent&gt;</literal> subelement that maps a property of the component class as a reference back to the containing entity."
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:92
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -170,19 +170,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:97
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:99
+#: component_mapping.xml:98
 #, no-c-format
-msgid "Collections of components are supported (eg. an array of type <literal>Name</literal>). Declare your component collection by replacing the <literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</literal> tag."
+msgid "Collections of components are supported (e.g. an array of type <literal>Name</literal>). Declare your component collection by replacing the <literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</literal> tag:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:106
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -198,29 +198,29 @@
 #. Tag: para
 #: component_mapping.xml:108
 #, no-c-format
-msgid "Note: if you define a <literal>Set</literal> of composite elements, it is very important to implement <literal>equals()</literal> and <literal>hashCode()</literal> correctly."
+msgid "If you define a <literal>Set</literal> of composite elements, it is important to implement <literal>equals()</literal> and <literal>hashCode()</literal> correctly."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:114
+#: component_mapping.xml:115
 #, no-c-format
-msgid "Composite elements may contain components but not collections. If your composite element itself contains components, use the <literal>&lt;nested-composite-element&gt;</literal> tag. This is a pretty exotic case - a collection of components which themselves have components. By this stage you should be asking yourself if a one-to-many association is more appropriate. Try remodelling the composite element as an entity - but note that even though the Java model is the same, the relational model and persistence semantics are still slightly different."
+msgid "Composite elements can contain components but not collections. If your composite element contains components, use the <literal>&lt;nested-composite-element&gt;</literal> tag. This case is a collection of components which themselves have components. You may want to consider if a one-to-many association is more appropriate. Remodel the composite element as an entity, but be aware that even though the Java model is the same, the relational model and persistence semantics are still slightly different."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:126
+#: component_mapping.xml:127
 #, no-c-format
-msgid "Please note that a composite element mapping doesn't support null-able properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has to use each columns value to identify a record when deleting objects (there is no separate primary key column in the composite element table), which is not possible with null values. You have to either use only not-null properties in a composite-element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
+msgid "A composite element mapping does not support null-able properties if you are using a <literal>&lt;set&gt;</literal>. There is no separate primary key column in the composite element table. Hibernate uses each column's value to identify a record when deleting objects, which is not possible with null values. You have to either use only not-null properties in a composite-element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
+#: component_mapping.xml:138
 #, no-c-format
-msgid "A special case of a composite element is a composite element with a nested <literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows you to map extra columns of a many-to-many association table to the composite element class. The following is a many-to-many association from <literal>Order</literal> to <literal>Item</literal> where <literal>purchaseDate</literal>, <literal>price</literal> and <literal>quantity</literal> are properties of the association:"
+msgid "A special case of a composite element is a composite element with a nested <literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to map extra columns of a many-to-many association table to the composite element class. The following is a many-to-many association from <literal>Order</literal> to <literal>Item</literal>, where <literal>purchaseDate</literal>, <literal>price</literal> and <literal>quantity</literal> are properties of the association:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:147
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -238,19 +238,19 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:149
+#: component_mapping.xml:150
 #, no-c-format
-msgid "Of course, there can't be a reference to the purchae on the other side, for bidirectional association navigation. Remember that components are value types and don't allow shared references. A single <literal>Purchase</literal> can be in the set of an <literal>Order</literal>, but it can't be referenced by the <literal>Item</literal> at the same time."
+msgid "There cannot be a reference to the purchase on the other side for bidirectional association navigation. Components are value types and do not allow shared references. A single <literal>Purchase</literal> can be in the set of an <literal>Order</literal>, but it cannot be referenced by the <literal>Item</literal> at the same time."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:157
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:159
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -266,97 +266,103 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:161
+#: component_mapping.xml:162
 #, no-c-format
-msgid "Composite elements may appear in queries using the same syntax as associations to other entities."
+msgid "Composite elements can appear in queries using the same syntax as associations to other entities."
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:169
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:171
+#: component_mapping.xml:172
 #, no-c-format
-msgid "The <literal>&lt;composite-map-key&gt;</literal> element lets you map a component class as the key of a <literal>Map</literal>. Make sure you override <literal>hashCode()</literal> and <literal>equals()</literal> correctly on the component class."
+msgid "The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a component class as the key of a <literal>Map</literal>. Ensure that you override <literal>hashCode()</literal> and <literal>equals()</literal> correctly on the component class."
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:180
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:182
+#: component_mapping.xml:183
 #, no-c-format
-msgid "You may use a component as an identifier of an entity class. Your component class must satisfy certain requirements:"
+msgid "You can use a component as an identifier of an entity class. Your component class must satisfy certain requirements:"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:189
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:194
+#: component_mapping.xml:195
 #, no-c-format
-msgid "It must re-implement <literal>equals()</literal> and <literal>hashCode()</literal>, consistently with the database's notion of composite key equality."
+msgid "It must re-implement <literal>equals()</literal> and <literal>hashCode()</literal> consistently with the database's notion of composite key equality."
 msgstr ""
 
-#. Tag: emphasis
-#: component_mapping.xml:203
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
-msgid "Note: in Hibernate3, the second requirement is not an absolutely hard requirement of Hibernate. But do it anyway."
+msgid "Note"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:207
+#: component_mapping.xml:205
 #, no-c-format
-msgid "You can't use an <literal>IdentifierGenerator</literal> to generate composite keys. Instead the application must assign its own identifiers."
+msgid "In Hibernate3, although the second requirement is not an absolutely hard requirement of Hibernate, it is recommended."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:212
+#: component_mapping.xml:211
 #, no-c-format
-msgid "Use the <literal>&lt;composite-id&gt;</literal> tag (with nested <literal>&lt;key-property&gt;</literal> elements) in place of the usual <literal>&lt;id&gt;</literal> declaration. For example, the <literal>OrderLine</literal> class has a primary key that depends upon the (composite) primary key of <literal>Order</literal>."
+msgid "You cannot use an <literal>IdentifierGenerator</literal> to generate composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 
+#. Tag: para
+#: component_mapping.xml:216
+#, no-c-format
+msgid "Use the <literal>&lt;composite-id&gt;</literal> tag, with nested <literal>&lt;key-property&gt;</literal> elements, in place of the usual <literal>&lt;id&gt;</literal> declaration. For example, the <literal>OrderLine</literal> class has a primary key that depends upon the (composite) primary key of <literal>Order</literal>."
+msgstr ""
+
 #. Tag: programlisting
-#: component_mapping.xml:220
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"OrderLine\">\n"
-      "    \n"
+      "\n"
       "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
       "        <key-property name=\"lineId\"/>\n"
       "        <key-property name=\"orderId\"/>\n"
       "        <key-property name=\"customerId\"/>\n"
       "    </composite-id>\n"
-      "    \n"
+      "\n"
       "    <property name=\"name\"/>\n"
-      "    \n"
+      "\n"
       "    <many-to-one name=\"order\" class=\"Order\"\n"
       "            insert=\"false\" update=\"false\">\n"
       "        <column name=\"orderId\"/>\n"
       "        <column name=\"customerId\"/>\n"
       "    </many-to-one>\n"
       "    ....\n"
-      "    \n"
+      "\n"
       "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:222
+#: component_mapping.xml:226
 #, no-c-format
-msgid "Now, any foreign keys referencing the <literal>OrderLine</literal> table are also composite. You must declare this in your mappings for other classes. An association to <literal>OrderLine</literal> would be mapped like this:"
+msgid "Any foreign keys referencing the <literal>OrderLine</literal> table are now composite. Declare this in your mappings for other classes. An association to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:228
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
       "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -368,19 +374,19 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:230
+#: component_mapping.xml:235
 #, no-c-format
-msgid "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to the <literal>column</literal> attribute everywhere.)"
+msgid "The <literal>column</literal> element is an alternative to the <literal>column</literal> attribute everywhere. Using the <literal>column</literal> element just gives more declaration options, which are mostly useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:235
+#: component_mapping.xml:244
 #, no-c-format
 msgid "A <literal>many-to-many</literal> association to <literal>OrderLine</literal> also uses the composite foreign key:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:240
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -394,13 +400,13 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:242
+#: component_mapping.xml:251
 #, no-c-format
 msgid "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> would use:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:247
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -413,19 +419,19 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:249
+#: component_mapping.xml:258
 #, no-c-format
-msgid "(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no columns.)"
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:253
+#: component_mapping.xml:262
 #, no-c-format
 msgid "If <literal>OrderLine</literal> itself owns a collection, it also has a composite foreign key."
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:258
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"OrderLine\">\n"
@@ -446,19 +452,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:263
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:265
+#: component_mapping.xml:274
 #, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:269
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
       "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -469,8 +475,8 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:271
+#: component_mapping.xml:280
 #, no-c-format
-msgid "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are identical to <literal>&lt;component&gt;</literal>. The advantage of this kind of mapping is the ability to determine the actual properties of the bean at deployment time, just by editing the mapping document. Runtime manipulation of the mapping document is also possible, using a DOM parser. Even better, you can access (and change) Hibernate's configuration-time metamodel via the <literal>Configuration</literal> object."
+msgid "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are identical to <literal>&lt;component&gt;</literal>. The advantage of this kind of mapping is the ability to determine the actual properties of the bean at deployment time just by editing the mapping document. Runtime manipulation of the mapping document is also possible, using a DOM parser. You can also access, and change, Hibernate's configuration-time metamodel via the <literal>Configuration</literal> object."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: configuration.xml:31
 #, no-c-format
-msgid "Because Hibernate is designed to operate in many different environments, there are a large number of configuration parameters. Fortunately, most have sensible default values and Hibernate is distributed with an example <literal>hibernate.properties</literal> file in <literal>etc/</literal> that shows the various options. Just put the example file in your classpath and customize it."
+msgid "Hibernate is designed to operate in many different environments and, as such, there is a broad range of configuration parameters. Fortunately, most have sensible default values and Hibernate is distributed with an example <literal>hibernate.properties</literal> file in <literal>etc/</literal> that displays the various options. Simply put the example file in your classpath and customize it to suit your needs."
 msgstr ""
 
 #. Tag: title
@@ -35,13 +35,13 @@
 #. Tag: para
 #: configuration.xml:42
 #, no-c-format
-msgid "An instance of <classname>org.hibernate.cfg.Configuration</classname> represents an entire set of mappings of an application's Java types to an SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is used to build an (immutable) <interfacename>org.hibernate.SessionFactory</interfacename>. The mappings are compiled from various XML mapping files."
+msgid "An instance of <classname>org.hibernate.cfg.Configuration</classname> represents an entire set of mappings of an application's Java types to an SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is used to build an immutable <interfacename>org.hibernate.SessionFactory</interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:49
 #, no-c-format
-msgid "You may obtain a <classname>org.hibernate.cfg.Configuration</classname> instance by instantiating it directly and specifying XML mapping documents. If the mapping files are in the classpath, use <literal>addResource()</literal>:"
+msgid "You can obtain a <classname>org.hibernate.cfg.Configuration</classname> instance by instantiating it directly and specifying XML mapping documents. If the mapping files are in the classpath, use <literal>addResource()</literal>. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -56,7 +56,7 @@
 #. Tag: para
 #: configuration.xml:57
 #, no-c-format
-msgid "An alternative (sometimes better) way is to specify the mapped class, and let Hibernate find the mapping document for you:"
+msgid "An alternative way is to specify the mapped class and allow Hibernate to find the mapping document for you:"
 msgstr ""
 
 #. Tag: programlisting
@@ -71,13 +71,13 @@
 #. Tag: para
 #: configuration.xml:64
 #, no-c-format
-msgid "Then Hibernate will look for mapping files named <filename>/org/hibernate/auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm.xml</filename> in the classpath. This approach eliminates any hardcoded filenames."
+msgid "Hibernate will then search for mapping files named <filename>/org/hibernate/auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm.xml</filename> in the classpath. This approach eliminates any hardcoded filenames."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:70
 #, no-c-format
-msgid "A <classname>org.hibernate.cfg.Configuration</classname> also allows you to specify configuration properties:"
+msgid "A <classname>org.hibernate.cfg.Configuration</classname> also allows you to specify configuration properties. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -95,7 +95,7 @@
 #. Tag: para
 #: configuration.xml:77
 #, no-c-format
-msgid "This is not the only way to pass configuration properties to Hibernate. The various options include:"
+msgid "This is not the only way to pass configuration properties to Hibernate. Some alternative options include:"
 msgstr ""
 
 #. Tag: para
@@ -119,19 +119,19 @@
 #. Tag: para
 #: configuration.xml:100
 #, no-c-format
-msgid "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate.cfg.xml</literal> (discussed later)."
+msgid "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate.cfg.xml</literal> (this is discussed later)."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:107
 #, no-c-format
-msgid "<filename>hibernate.properties</filename> is the easiest approach if you want to get started quickly."
+msgid "If you want to get started quickly<filename>hibernate.properties</filename> is the easiest approach."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:111
 #, no-c-format
-msgid "The <classname>org.hibernate.cfg.Configuration</classname> is intended as a startup-time object, to be discarded once a <literal>SessionFactory</literal> is created."
+msgid "The <classname>org.hibernate.cfg.Configuration</classname> is intended as a startup-time object that will be discarded once a <literal>SessionFactory</literal> is created."
 msgstr ""
 
 #. Tag: title
@@ -167,7 +167,7 @@
 #. Tag: para
 #: configuration.xml:140
 #, no-c-format
-msgid "Usually, you want to have the <interfacename>org.hibernate.SessionFactory</interfacename> create and pool JDBC connections for you. If you take this approach, opening a <interfacename>org.hibernate.Session</interfacename> is as simple as:"
+msgid "It is advisable to have the <interfacename>org.hibernate.SessionFactory</interfacename> create and pool JDBC connections for you. If you take this approach, opening a <interfacename>org.hibernate.Session</interfacename> is as simple as:"
 msgstr ""
 
 #. Tag: programlisting
@@ -179,19 +179,19 @@
 #. Tag: para
 #: configuration.xml:148
 #, no-c-format
-msgid "As soon as you do something that requires access to the database, a JDBC connection will be obtained from the pool."
+msgid "Once you start a task that requires access to the database, a JDBC connection will be obtained from the pool."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:153
 #, no-c-format
-msgid "For this to work, we need to pass some JDBC connection properties to Hibernate. All Hibernate property names and semantics are defined on the class <classname>org.hibernate.cfg.Environment</classname>. We will now describe the most important settings for JDBC connection configuration."
+msgid "Before you can do this, you first need to pass some JDBC connection properties to Hibernate. All Hibernate property names and semantics are defined on the class <classname>org.hibernate.cfg.Environment</classname>. The most important settings for JDBC connection configuration are outlined below."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:159
 #, no-c-format
-msgid "Hibernate will obtain (and pool) connections using <classname>java.sql.DriverManager</classname> if you set the following properties:"
+msgid "Hibernate will obtain and pool connections using <classname>java.sql.DriverManager</classname> if you set the following properties:"
 msgstr ""
 
 #. Tag: title
@@ -275,19 +275,19 @@
 #. Tag: para
 #: configuration.xml:220
 #, no-c-format
-msgid "Hibernate's own connection pooling algorithm is however quite rudimentary. It is intended to help you get started and is <emphasis>not intended for use in a production system</emphasis> or even for performance testing. You should use a third party pool for best performance and stability. Just replace the <property>hibernate.connection.pool_size</property> property with connection pool specific settings. This will turn off Hibernate's internal pool. For example, you might like to use C3P0."
+msgid "Hibernate's own connection pooling algorithm is, however, quite rudimentary. It is intended to help you get started and is <emphasis>not intended for use in a production system</emphasis>, or even for performance testing. You should use a third party pool for best performance and stability. Just replace the <property>hibernate.connection.pool_size</property> property with connection pool specific settings. This will turn off Hibernate's internal pool. For example, you might like to use c3p0."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:230
 #, no-c-format
-msgid "C3P0 is an open source JDBC connection pool distributed along with Hibernate in the <filename>lib</filename> directory. Hibernate will use its <classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for connection pooling if you set <property>hibernate.c3p0.*</property> properties. If you'd like to use Proxool refer to the packaged <filename>hibernate.properties</filename> and the Hibernate web site for more information."
+msgid "C3P0 is an open source JDBC connection pool distributed along with Hibernate in the <filename>lib</filename> directory. Hibernate will use its <classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for connection pooling if you set <property>hibernate.c3p0.*</property> properties. If you would like to use Proxool, refer to the packaged <filename>hibernate.properties</filename> and the Hibernate web site for more information."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:238
 #, no-c-format
-msgid "Here is an example <filename>hibernate.properties</filename> file for C3P0:"
+msgid "The following is an example <filename>hibernate.properties</filename> file for c3p0:"
 msgstr ""
 
 #. Tag: programlisting
@@ -308,7 +308,7 @@
 #. Tag: para
 #: configuration.xml:244
 #, no-c-format
-msgid "For use inside an application server, you should almost always configure Hibernate to obtain connections from an application server <interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You'll need to set at least one of the following properties:"
+msgid "For use inside an application server, you should almost always configure Hibernate to obtain connections from an application server <interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You will need to set at least one of the following properties:"
 msgstr ""
 
 #. Tag: title
@@ -368,7 +368,7 @@
 #. Tag: para
 #: configuration.xml:306
 #, no-c-format
-msgid "Here's an example <filename>hibernate.properties</filename> file for an application server provided JNDI datasource:"
+msgid "Here is an example <filename>hibernate.properties</filename> file for an application server provided JNDI datasource:"
 msgstr ""
 
 #. Tag: programlisting
@@ -392,13 +392,13 @@
 #. Tag: para
 #: configuration.xml:318
 #, no-c-format
-msgid "Arbitrary connection properties may be given by prepending \"<literal>hibernate.connection</literal>\" to the connection property name. For example, you may specify a <property>charSet</property> connection property using <property>hibernate.connection.charSet</property>."
+msgid "Arbitrary connection properties can be given by prepending \"<literal>hibernate.connection</literal>\" to the connection property name. For example, you can specify a <property>charSet</property> connection property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:324
 #, no-c-format
-msgid "You may define your own plugin strategy for obtaining JDBC connections by implementing the interface <interfacename>org.hibernate.connection.ConnectionProvider</interfacename>, and specifying your custom implementation via the <property>hibernate.connection.provider_class</property> property."
+msgid "You can define your own plugin strategy for obtaining JDBC connections by implementing the interface <interfacename>org.hibernate.connection.ConnectionProvider</interfacename>, and specifying your custom implementation via the <property>hibernate.connection.provider_class</property> property."
 msgstr ""
 
 #. Tag: title
@@ -410,13 +410,13 @@
 #. Tag: para
 #: configuration.xml:335
 #, no-c-format
-msgid "There are a number of other properties that control the behaviour of Hibernate at runtime. All are optional and have reasonable default values."
+msgid "There are a number of other properties that control the behavior of Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 
-#. Tag: para
-#: configuration.xml:340
+#. Tag: warning
+#: configuration.xml:341
 #, no-c-format
-msgid "<emphasis>Warning: some of these properties are \"system-level\" only.</emphasis> System-level properties can be set only via <literal>java -Dproperty=value</literal> or <filename>hibernate.properties</filename>. They may <emphasis>not</emphasis> be set by the other techniques described above."
+msgid "<emphasis>Some of these properties are \"system-level\" only.</emphasis> System-level properties can be set only via <literal>java -Dproperty=value</literal> or <filename>hibernate.properties</filename>. They <emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 
 #. Tag: title
@@ -440,13 +440,13 @@
 #. Tag: para
 #: configuration.xml:365
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of.Dialect</literal>"
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:369
 #, no-c-format
-msgid "In most cases Hibernate will actually be able to chose the correct <classname>org.hibernate.dialect.Dialect</classname> implementation to use based on the <literal>JDBC metadata</literal> returned by the JDBC driver."
+msgid "In most cases Hibernate will actually be able to choose the correct <classname>org.hibernate.dialect.Dialect</classname> implementation based on the <literal>JDBC metadata</literal> returned by the JDBC driver."
 msgstr ""
 
 #. Tag: property
@@ -464,7 +464,7 @@
 #. Tag: para
 #: configuration.xml:384 configuration.xml:396 configuration.xml:490 configuration.xml:503 configuration.xml:516 configuration.xml:529 configuration.xml:583 configuration.xml:610 configuration.xml:623 configuration.xml:678 configuration.xml:906 configuration.xml:921 configuration.xml:1011
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | <literal>false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | <literal>false</literal>"
 msgstr ""
 
 #. Tag: property
@@ -494,7 +494,7 @@
 #. Tag: para
 #: configuration.xml:409
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 
 #. Tag: property
@@ -506,13 +506,13 @@
 #. Tag: entry
 #: configuration.xml:419
 #, no-c-format
-msgid "Qualify unqualified table names with the given catalog in generated SQL."
+msgid "Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:422
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 
 #. Tag: property
@@ -530,7 +530,7 @@
 #. Tag: para
 #: configuration.xml:435 configuration.xml:877
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</literal>"
 msgstr ""
 
 #. Tag: property
@@ -542,13 +542,13 @@
 #. Tag: entry
 #: configuration.xml:445
 #, no-c-format
-msgid "Set a maximum \"depth\" for the outer join fetch tree for single-ended associations (one-to-one, many-to-one). A <literal>0</literal> disables default outer join fetching."
+msgid "Sets a maximum \"depth\" for the outer join fetch tree for single-ended associations (one-to-one, many-to-one). A <literal>0</literal> disables default outer join fetching."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:449
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> recommended values between <literal>0</literal> and <literal>3</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> recommended values between <literal>0</literal> and <literal>3</literal>"
 msgstr ""
 
 #. Tag: property
@@ -560,13 +560,13 @@
 #. Tag: entry
 #: configuration.xml:460
 #, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:462
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</literal>, <literal>8</literal>, <literal>16</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 
 #. Tag: property
@@ -578,7 +578,7 @@
 #. Tag: entry
 #: configuration.xml:473
 #, no-c-format
-msgid "Set a default mode for entity representation for all sessions opened from this <literal>SessionFactory</literal>"
+msgid "Sets a default mode for entity representation for all sessions opened from this <literal>SessionFactory</literal>"
 msgstr ""
 
 #. Tag: para
@@ -596,7 +596,7 @@
 #. Tag: entry
 #: configuration.xml:486
 #, no-c-format
-msgid "Force Hibernate to order SQL updates by the primary key value of the items being updated. This will result in fewer transaction deadlocks in highly concurrent systems."
+msgid "Forces Hibernate to order SQL updates by the primary key value of the items being updated. This will result in fewer transaction deadlocks in highly concurrent systems."
 msgstr ""
 
 #. Tag: property
@@ -668,7 +668,7 @@
 #. Tag: para
 #: configuration.xml:568
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> recommended values between <literal>5</literal> and <literal>30</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> recommended values between <literal>5</literal> and <literal>30</literal>"
 msgstr ""
 
 #. Tag: property
@@ -680,7 +680,7 @@
 #. Tag: entry
 #: configuration.xml:578
 #, no-c-format
-msgid "Set this property to <literal>true</literal> if your JDBC driver returns correct row counts from <literal>executeBatch()</literal> (it is usually safe to turn this option on). Hibernate will then use batched DML for automatically versioned data. Defaults to <literal>false</literal>."
+msgid "Set this property to <literal>true</literal> if your JDBC driver returns correct row counts from <literal>executeBatch()</literal>. Iit is usually safe to turn this option on. Hibernate will then use batched DML for automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 
 #. Tag: property
@@ -698,7 +698,7 @@
 #. Tag: para
 #: configuration.xml:596
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.BatcherFactory</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.BatcherFactory</literal>"
 msgstr ""
 
 #. Tag: property
@@ -710,7 +710,7 @@
 #. Tag: entry
 #: configuration.xml:606
 #, no-c-format
-msgid "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is only necessary when using user supplied JDBC connections, Hibernate uses connection metadata otherwise."
+msgid "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is only necessary when using user-supplied JDBC connections. Hibernate uses connection metadata otherwise."
 msgstr ""
 
 #. Tag: property
@@ -734,13 +734,13 @@
 #. Tag: entry
 #: configuration.xml:633
 #, no-c-format
-msgid "Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> to retrieve natively generated keys after insert. Requires JDBC3+ driver and JRE1.4+, set to false if your driver has problems with the Hibernate identifier generators. By default, tries to determine the driver capabilities using connection metadata."
+msgid "Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> to retrieve natively generated keys after insert. Requires JDBC3+ driver and JRE1.4+, set to false if your driver has problems with the Hibernate identifier generators. By default, it tries to determine the driver capabilities using connection metadata."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:639 configuration.xml:769 configuration.xml:781 configuration.xml:795 configuration.xml:833
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 
 #. Tag: property
@@ -758,7 +758,7 @@
 #. Tag: para
 #: configuration.xml:652
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.ConnectionProvider</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.ConnectionProvider</literal>"
 msgstr ""
 
 #. Tag: property
@@ -770,13 +770,13 @@
 #. Tag: entry
 #: configuration.xml:662
 #, no-c-format
-msgid "Set the JDBC transaction isolation level. Check <interfacename>java.sql.Connection</interfacename> for meaningful values but note that most databases do not support all isolation levels and some define additional, non-standard isolations."
+msgid "Sets the JDBC transaction isolation level. Check <interfacename>java.sql.Connection</interfacename> for meaningful values, but note that most databases do not support all isolation levels and some define additional, non-standard isolations."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:666
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 
 #. Tag: property
@@ -788,7 +788,7 @@
 #. Tag: entry
 #: configuration.xml:676
 #, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 
 #. Tag: property
@@ -800,19 +800,19 @@
 #. Tag: entry
 #: configuration.xml:688
 #, no-c-format
-msgid "Specify when Hibernate should release JDBC connections. By default, a JDBC connection is held until the session is explicitly closed or disconnected. For an application server JTA datasource, you should use <literal>after_statement</literal> to aggressively release connections after every JDBC call. For a non-JTA connection, it often makes sense to release the connection at the end of each transaction, by using <literal>after_transaction</literal>. <literal>auto</literal> will choose <literal>after_statement</literal> for the JTA and CMT transaction strategies and <literal>after_transaction</literal> for the JDBC transaction strategy."
+msgid "Specifies when Hibernate should release JDBC connections. By default, a JDBC connection is held until the session is explicitly closed or disconnected. For an application server JTA datasource, use <literal>after_statement</literal> to aggressively release connections after every JDBC call. For a non-JTA connection, it often makes sense to release the connection at the end of each transaction, by using <literal>after_transaction</literal>. <literal>auto</literal> will choose <literal>after_statement</literal> for the JTA and CMT transaction strategies and <literal>after_transaction</literal> for the JDBC transaction strategy."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:699
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | <literal>on_close</literal> | <literal>after_transaction</literal> | <literal>after_statement</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) | <literal>on_close</literal> | <literal>after_transaction</literal> | <literal>after_statement</literal>"
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:704
 #, no-c-format
-msgid "Note that this setting only affects <literal>Session</literal>s returned from <literal>SessionFactory.openSession</literal>. For <literal>Session</literal>s obtained through <literal>SessionFactory.getCurrentSession</literal>, the <literal>CurrentSessionContext</literal> implementation configured for use controls the connection release mode for those <literal>Session</literal>s. See"
+msgid "This setting only affects <literal>Session</literal>s returned from <literal>SessionFactory.openSession</literal>. For <literal>Session</literal>s obtained through <literal>SessionFactory.getCurrentSession</literal>, the <literal>CurrentSessionContext</literal> implementation configured for use controls the connection release mode for those <literal>Session</literal>s. See"
 msgstr ""
 
 #. Tag: entry
@@ -860,7 +860,7 @@
 #. Tag: para
 #: configuration.xml:754
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.CacheProvider</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.CacheProvider</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -872,7 +872,7 @@
 #. Tag: entry
 #: configuration.xml:764
 #, no-c-format
-msgid "Optimize second-level cache operation to minimize writes, at the cost of more frequent reads. This setting is most useful for clustered caches and, in Hibernate3, is enabled by default for clustered cache implementations."
+msgid "Optimizes second-level cache operation to minimize writes, at the cost of more frequent reads. This setting is most useful for clustered caches and, in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
 
 #. Tag: literal
@@ -884,7 +884,7 @@
 #. Tag: entry
 #: configuration.xml:779
 #, no-c-format
-msgid "Enable the query cache, individual queries still have to be set cachable."
+msgid "Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 
 #. Tag: literal
@@ -896,7 +896,7 @@
 #. Tag: entry
 #: configuration.xml:791
 #, no-c-format
-msgid "May be used to completely disable the second level cache, which is enabled by default for classes which specify a <literal>&lt;cache&gt;</literal> mapping."
+msgid "Can be used to completely disable the second level cache, which is enabled by default for classes which specify a <literal>&lt;cache&gt;</literal> mapping."
 msgstr ""
 
 #. Tag: literal
@@ -914,7 +914,7 @@
 #. Tag: para
 #: configuration.xml:808
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -932,7 +932,7 @@
 #. Tag: para
 #: configuration.xml:820
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -968,7 +968,7 @@
 #. Tag: para
 #: configuration.xml:863
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.TransactionFactory</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.TransactionFactory</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -992,13 +992,13 @@
 #. Tag: entry
 #: configuration.xml:887
 #, no-c-format
-msgid "The classname of a <literal>TransactionManagerLookup</literal> - required when JVM-level caching is enabled or when using hilo generator in a JTA environment."
+msgid "The classname of a <literal>TransactionManagerLookup</literal>. It is required when JVM-level caching is enabled or when using hilo generator in a JTA environment."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:891
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.TransactionManagerLookup</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.TransactionManagerLookup</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -1022,7 +1022,7 @@
 #. Tag: entry
 #: configuration.xml:916
 #, no-c-format
-msgid "If enabled, the session will be automatically closed during the after completion phase of the transaction. Built-in and utomatic session context management is preferred, see <xref linkend=\"architecture-current-session\"/>."
+msgid "If enabled, the session will be automatically closed during the after completion phase of the transaction. Built-in and automatic session context management is preferred, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 
 #. Tag: title
@@ -1040,13 +1040,13 @@
 #. Tag: entry
 #: configuration.xml:947
 #, no-c-format
-msgid "Supply a (custom) strategy for the scoping of the \"current\" <literal>Session</literal>. See <xref linkend=\"architecture-current-session\"/> for more information about the built-in strategies."
+msgid "Supply a custom strategy for the scoping of the \"current\" <literal>Session</literal>. See <xref linkend=\"architecture-current-session\"/> for more information about the built-in strategies."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:952
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | <literal>thread</literal> | <literal>managed</literal> | <literal>custom.Class</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | <literal>thread</literal> | <literal>managed</literal> | <literal>custom.Class</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -1064,7 +1064,7 @@
 #. Tag: para
 #: configuration.xml:965
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast.ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic.ClassicQueryTranslatorFactory</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast.ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic.ClassicQueryTranslatorFactory</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -1076,13 +1076,13 @@
 #. Tag: entry
 #: configuration.xml:976
 #, no-c-format
-msgid "Mapping from tokens in Hibernate queries to SQL tokens (tokens might be function or literal names, for example)."
+msgid "Is used to map from tokens in Hibernate queries to SQL tokens (tokens might be function or literal names, for example)."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:979
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, hqlFunction=SQLFUNC</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, hqlFunction=SQLFUNC</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -1094,13 +1094,13 @@
 #. Tag: entry
 #: configuration.xml:989
 #, no-c-format
-msgid "Automatically validate or export schema DDL to the database when the <literal>SessionFactory</literal> is created. With <literal>create-drop</literal>, the database schema will be dropped when the <literal>SessionFactory</literal> is closed explicitly."
+msgid "Automatically validates or exports schema DDL to the database when the <literal>SessionFactory</literal> is created. With <literal>create-drop</literal>, the database schema will be dropped when the <literal>SessionFactory</literal> is closed explicitly."
 msgstr ""
 
 #. Tag: para
 #: configuration.xml:995
 #, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | <literal>update</literal> | <literal>create</literal> | <literal>create-drop</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | <literal>update</literal> | <literal>create</literal> | <literal>create-drop</literal>"
 msgstr ""
 
 #. Tag: literal
@@ -1112,7 +1112,7 @@
 #. Tag: entry
 #: configuration.xml:1006
 #, no-c-format
-msgid "Enables use of CGLIB instead of runtime reflection (System-level property). Reflection can sometimes be useful when troubleshooting, note that Hibernate always requires CGLIB even if you turn off the optimizer. You can not set this property in <literal>hibernate.cfg.xml</literal>."
+msgid "Enables the use of CGLIB instead of runtime reflection (System-level property). Reflection can sometimes be useful when troubleshooting. Hibernate always requires CGLIB even if you turn off the optimizer. You cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 
 #. Tag: title
@@ -1124,7 +1124,7 @@
 #. Tag: para
 #: configuration.xml:1024
 #, no-c-format
-msgid "You should always set the <literal>hibernate.dialect</literal> property to the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for your database. If you specify a dialect, Hibernate will use sensible defaults for some of the other properties listed above, saving you the effort of specifying them manually."
+msgid "Always set the <literal>hibernate.dialect</literal> property to the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for your database. If you specify a dialect, Hibernate will use sensible defaults for some of the other properties listed above. This means that you will not have to specify them manually."
 msgstr ""
 
 #. Tag: title
@@ -1244,455 +1244,467 @@
 #. Tag: entry
 #: configuration.xml:1070
 #, no-c-format
-msgid "Oracle 9i/10g"
+msgid "Oracle 9i"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1070
 #, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1073
 #, no-c-format
-msgid "Sybase"
+msgid "Oracle 10g"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1073
 #, no-c-format
-msgid "org.hibernate.dialect.SybaseDialect"
+msgid "org.hibernate.dialect.Oracle10gDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1076
 #, no-c-format
-msgid "Sybase Anywhere"
+msgid "Sybase"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1076
 #, no-c-format
-msgid "org.hibernate.dialect.SybaseAnywhereDialect"
+msgid "org.hibernate.dialect.SybaseDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1079
 #, no-c-format
-msgid "Microsoft SQL Server"
+msgid "Sybase Anywhere"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1079
 #, no-c-format
-msgid "org.hibernate.dialect.SQLServerDialect"
+msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1082
 #, no-c-format
-msgid "SAP DB"
+msgid "Microsoft SQL Server"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1082
 #, no-c-format
-msgid "org.hibernate.dialect.SAPDBDialect"
+msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1085
 #, no-c-format
-msgid "Informix"
+msgid "SAP DB"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1085
 #, no-c-format
-msgid "org.hibernate.dialect.InformixDialect"
+msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1088
 #, no-c-format
-msgid "HypersonicSQL"
+msgid "Informix"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1088
 #, no-c-format
-msgid "org.hibernate.dialect.HSQLDialect"
+msgid "org.hibernate.dialect.InformixDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1091
 #, no-c-format
-msgid "Ingres"
+msgid "HypersonicSQL"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1091
 #, no-c-format
-msgid "org.hibernate.dialect.IngresDialect"
+msgid "org.hibernate.dialect.HSQLDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1094
 #, no-c-format
-msgid "Progress"
+msgid "Ingres"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1094
 #, no-c-format
-msgid "org.hibernate.dialect.ProgressDialect"
+msgid "org.hibernate.dialect.IngresDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1097
 #, no-c-format
-msgid "Mckoi SQL"
+msgid "Progress"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1097
 #, no-c-format
-msgid "org.hibernate.dialect.MckoiDialect"
+msgid "org.hibernate.dialect.ProgressDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1100
 #, no-c-format
-msgid "Interbase"
+msgid "Mckoi SQL"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1100
 #, no-c-format
-msgid "org.hibernate.dialect.InterbaseDialect"
+msgid "org.hibernate.dialect.MckoiDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1103
 #, no-c-format
-msgid "Pointbase"
+msgid "Interbase"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1103
 #, no-c-format
-msgid "org.hibernate.dialect.PointbaseDialect"
+msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1106
 #, no-c-format
-msgid "FrontBase"
+msgid "Pointbase"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1106
 #, no-c-format
-msgid "org.hibernate.dialect.FrontbaseDialect"
+msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr ""
 
 #. Tag: entry
 #: configuration.xml:1109
 #, no-c-format
-msgid "Firebird"
+msgid "FrontBase"
 msgstr ""
 
 #. Tag: literal
 #: configuration.xml:1109
 #, no-c-format
+msgid "org.hibernate.dialect.FrontbaseDialect"
+msgstr ""
+
+#. Tag: entry
+#: configuration.xml:1112
+#, no-c-format
+msgid "Firebird"
+msgstr ""
+
+#. Tag: literal
+#: configuration.xml:1112
+#, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1118
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1120
+#: configuration.xml:1123
 #, no-c-format
-msgid "If your database supports ANSI, Oracle or Sybase style outer joins, <emphasis>outer join fetching</emphasis> will often increase performance by limiting the number of round trips to and from the database (at the cost of possibly more work performed by the database itself). Outer join fetching allows a whole graph of objects connected by many-to-one, one-to-many, many-to-many and one-to-one associations to be retrieved in a single SQL <literal>SELECT</literal>."
+msgid "If your database supports ANSI, Oracle or Sybase style outer joins, <emphasis>outer join fetching</emphasis> will often increase performance by limiting the number of round trips to and from the database. This is, however, at the cost of possibly more work performed by the database itself. Outer join fetching allows a whole graph of objects connected by many-to-one, one-to-many, many-to-many and one-to-one associations to be retrieved in a single SQL <literal>SELECT</literal>."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1129
+#: configuration.xml:1132
 #, no-c-format
-msgid "Outer join fetching may be disabled <emphasis>globally</emphasis> by setting the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</literal>. A setting of <literal>1</literal> or higher enables outer join fetching for one-to-one and many-to-one associations which have been mapped with <literal>fetch=\"join\"</literal>."
+msgid "Outer join fetching can be disabled <emphasis>globally</emphasis> by setting the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</literal>. A setting of <literal>1</literal> or higher enables outer join fetching for one-to-one and many-to-one associations that have been mapped with <literal>fetch=\"join\"</literal>."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1137
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1144
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1146
+#: configuration.xml:1149
 #, no-c-format
-msgid "Oracle limits the size of <literal>byte</literal> arrays that may be passed to/from its JDBC driver. If you wish to use large instances of <literal>binary</literal> or <literal>serializable</literal> type, you should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. <emphasis>This is a system-level setting only.</emphasis>"
+msgid "Oracle limits the size of <literal>byte</literal> arrays that can be passed to and/or from its JDBC driver. If you wish to use large instances of <literal>binary</literal> or <literal>serializable</literal> type, you should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. <emphasis>This is a system-level setting only.</emphasis>"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1157
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1159
+#: configuration.xml:1162
 #, no-c-format
-msgid "The properties prefixed by <literal>hibernate.cache</literal> allow you to use a process or cluster scoped second-level cache system with Hibernate. See the <xref linkend=\"performance-cache\"/> for more details."
+msgid "The properties prefixed by <literal>hibernate.cache</literal> allow you to use a process or cluster scoped second-level cache system with Hibernate. See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1169
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1171
+#: configuration.xml:1174
 #, no-c-format
-msgid "You may define new Hibernate query tokens using <literal>hibernate.query.substitutions</literal>. For example:"
+msgid "You can define new Hibernate query tokens using <literal>hibernate.query.substitutions</literal>. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1176
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1178
+#: configuration.xml:1181
 #, no-c-format
-msgid "would cause the tokens <literal>true</literal> and <literal>false</literal> to be translated to integer literals in the generated SQL."
+msgid "This would cause the tokens <literal>true</literal> and <literal>false</literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1183
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1185
+#: configuration.xml:1188
 #, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+msgid "This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1192
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1194
+#: configuration.xml:1197
 #, no-c-format
-msgid "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate will expose a number of metrics that are useful when tuning a running system via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be configured to expose these statistics via JMX. Read the Javadoc of the interfaces in <literal>org.hibernate.stats</literal> for more information."
+msgid "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate exposes a number of metrics that are useful when tuning a running system via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be configured to expose these statistics via JMX. Read the Javadoc of the interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1206
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1208
+#: configuration.xml:1211
 #, no-c-format
-msgid "Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J can direct your logging output to several logging frameworks (NOP, Simple, log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen binding. In order to setup logging properly you will need <filename>slf4j-api.jar</filename> in your classpath together with the jar file for your preferred binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</ulink> for more detail. To use Log4j you will also need to place a <filename>log4j.properties</filename> file in your classpath, an example properties file is distributed with Hibernate in the <literal>src/</literal> directory."
+msgid "Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J can direct your logging output to several logging frameworks (NOP, Simple, log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen binding. In order to setup logging you will need <filename>slf4j-api.jar</filename> in your classpath together with the jar file for your preferred binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</ulink> for more detail. To use Log4j you will also need to place a <filename>log4j.properties</filename> file in your classpath. An example properties file is distributed with Hibernate in the <literal>src/</literal> directory."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1219
+#: configuration.xml:1222
 #, no-c-format
-msgid "We strongly recommend that you familiarize yourself with Hibernate's log messages. A lot of work has been put into making the Hibernate log as detailed as possible, without making it unreadable. It is an essential troubleshooting device. The most interesting log categories are the following:"
+msgid "It is recommended that you familiarize yourself with Hibernate's log messages. A lot of work has been put into making the Hibernate log as detailed as possible, without making it unreadable. It is an essential troubleshooting device. The most interesting log categories are the following:"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1228
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1235
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1240
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1241
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1256
 #, no-c-format
 msgid "Log the state of all entities (max 20 entities) associated with the session at flush time"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1259
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1260
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1263
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1264
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1267
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1268
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1271
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1272
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1277
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1278
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1281
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1282
+#: configuration.xml:1285
 #, no-c-format
-msgid "Log everything (a lot of information, but very useful for troubleshooting)"
+msgid "Log everything. This is a lot of information but it is useful for troubleshooting"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1291
+#: configuration.xml:1294
 #, no-c-format
 msgid "When developing applications with Hibernate, you should almost always work with <literal>debug</literal> enabled for the category <literal>org.hibernate.SQL</literal>, or, alternatively, the property <literal>hibernate.show_sql</literal> enabled."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1301
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1303
+#: configuration.xml:1306
 #, no-c-format
 msgid "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you to specify a \"naming standard\" for database objects and schema elements."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1308
+#: configuration.xml:1311
 #, no-c-format
-msgid "You may provide rules for automatically generating database identifiers from Java identifiers or for processing \"logical\" column and table names given in the mapping file into \"physical\" table and column names. This feature helps reduce the verbosity of the mapping document, eliminating repetitive noise (<literal>TBL_</literal> prefixes, for example). The default strategy used by Hibernate is quite minimal."
+msgid "You can provide rules for automatically generating database identifiers from Java identifiers or for processing \"logical\" column and table names given in the mapping file into \"physical\" table and column names. This feature helps reduce the verbosity of the mapping document, eliminating repetitive noise (<literal>TBL_</literal> prefixes, for example). The default strategy used by Hibernate is quite minimal."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1317
+#: configuration.xml:1320
 #, no-c-format
-msgid "You may specify a different strategy by calling <literal>Configuration.setNamingStrategy()</literal> before adding mappings:"
+msgid "You can specify a different strategy by calling <literal>Configuration.setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1322
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
       "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -1703,31 +1715,31 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1324
+#: configuration.xml:1327
 #, no-c-format
 msgid "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in strategy that might be a useful starting point for some applications."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1332
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1334
+#: configuration.xml:1337
 #, no-c-format
 msgid "An alternative approach to configuration is to specify a full configuration in a file named <literal>hibernate.cfg.xml</literal>. This file can be used as a replacement for the <literal>hibernate.properties</literal> file or, if both are present, to override properties."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1341
+#: configuration.xml:1344
 #, no-c-format
-msgid "The XML configuration file is by default expected to be in the root o your <literal>CLASSPATH</literal>. Here is an example:"
+msgid "The XML configuration file is by default expected to be in the root of your <literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -1765,31 +1777,31 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
+#: configuration.xml:1351
 #, no-c-format
-msgid "As you can see, the advantage of this approach is the externalization of the mapping file names to configuration. The <literal>hibernate.cfg.xml</literal> is also more convenient once you have to tune the Hibernate cache. Note that is your choice to use either <literal>hibernate.properties</literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, except for the above mentioned benefits of using the XML syntax."
+msgid "The advantage of this approach is the externalization of the mapping file names to configuration. The <literal>hibernate.cfg.xml</literal> is also more convenient once you have to tune the Hibernate cache. It is your choice to use either <literal>hibernate.properties</literal> or <literal>hibernate.cfg.xml</literal>. Both are equivalent, except for the above mentioned benefits of using the XML syntax."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1357
+#: configuration.xml:1360
 #, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1361
+#: configuration.xml:1364
 #, no-c-format
 msgid "<![CDATA[SessionFactory sf = new Configuration().configure().buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1363
+#: configuration.xml:1366
 #, no-c-format
-msgid "You can pick a different XML configuration file using"
+msgid "You can select a different XML configuration file using:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1367
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
       "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -1798,331 +1810,331 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1372
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1374
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1383
 #, no-c-format
-msgid "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC connections managed by the container and provided through JNDI. Usually, a JTA compatible <literal>TransactionManager</literal> and a <literal>ResourceManager</literal> take care of transaction management (CMT), esp. distributed transaction handling across several datasources. You may of course also demarcate transaction boundaries programmatically (BMT) or you might want to use the optional Hibernate <literal>Transaction</literal> API for this to keep your code portable."
+msgid "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC connections managed by the container and provided through JNDI. Usually, a JTA compatible <literal>TransactionManager</literal> and a <literal>ResourceManager</literal> take care of transaction management (CMT), especially distributed transaction handling across several datasources. You can also demarcate transaction boundaries programmatically (BMT), or you might want to use the optional Hibernate <literal>Transaction</literal> API for this to keep your code portable."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1395
+#: configuration.xml:1398
 #, no-c-format
 msgid "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its <literal>SessionFactory</literal> to JNDI after startup."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1404
+#: configuration.xml:1407
 #, no-c-format
-msgid "<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</literal> may be automatically bound to the scope of JTA transactions. Simply lookup the <literal>SessionFactory</literal> from JNDI and get the current <literal>Session</literal>. Let Hibernate take care of flushing and closing the <literal>Session</literal> when your JTA transaction completes. Transaction demarcation is either declarative (CMT) or programmatic (BMT/UserTransaction)."
+msgid "<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</literal> can be automatically bound to the scope of JTA transactions. Simply lookup the <literal>SessionFactory</literal> from JNDI and get the current <literal>Session</literal>. Let Hibernate manage flushing and closing the <literal>Session</literal> when your JTA transaction completes. Transaction demarcation is either declarative (CMT) or programmatic (BMT/UserTransaction)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1417
+#: configuration.xml:1420
 #, no-c-format
-msgid "<emphasis>JMX deployment:</emphasis> If you have a JMX capable application server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed MBean. This saves you the one line startup code to build your <literal>SessionFactory</literal> from a <literal>Configuration</literal>. The container will startup your <literal>HibernateService</literal>, and ideally also take care of service dependencies (Datasource has to be available before Hibernate starts, etc)."
+msgid "<emphasis>JMX deployment:</emphasis> if you have a JMX capable application server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed MBean. This saves you the one line startup code to build your <literal>SessionFactory</literal> from a <literal>Configuration</literal>. The container will startup your <literal>HibernateService</literal> and also take care of service dependencies (datasource has to be available before Hibernate starts, etc)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1428
+#: configuration.xml:1431
 #, no-c-format
 msgid "Depending on your environment, you might have to set the configuration option <literal>hibernate.connection.aggressive_release</literal> to true if your application server shows \"connection containment\" exceptions."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1435
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1437
+#: configuration.xml:1440
 #, no-c-format
-msgid "The Hibernate <literal>Session</literal> API is independent of any transaction demarcation system in your architecture. If you let Hibernate use JDBC directly, through a connection pool, you may begin and end your transactions by calling the JDBC API. If you run in a J2EE application server, you might want to use bean-managed transactions and call the JTA API and <literal>UserTransaction</literal> when needed."
+msgid "The Hibernate <literal>Session</literal> API is independent of any transaction demarcation system in your architecture. If you let Hibernate use JDBC directly through a connection pool, you can begin and end your transactions by calling the JDBC API. If you run in a J2EE application server, you might want to use bean-managed transactions and call the JTA API and <literal>UserTransaction</literal> when needed."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1448
 #, no-c-format
 msgid "To keep your code portable between these two (and other) environments we recommend the optional Hibernate <literal>Transaction</literal> API, which wraps and hides the underlying system. You have to specify a factory class for <literal>Transaction</literal> instances by setting the Hibernate configuration property <literal>hibernate.transaction.factory_class</literal>."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1452
+#: configuration.xml:1455
 #, no-c-format
-msgid "There are three standard (built-in) choices:"
+msgid "There are three standard, or built-in, choices:"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1458
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1460
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1464
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1466
+#: configuration.xml:1469
 #, no-c-format
-msgid "delegates to container-managed transaction if an existing transaction is underway in this context (e.g. EJB session bean method), otherwise a new transaction is started and bean-managed transaction are used."
+msgid "delegates to container-managed transactions if an existing transaction is underway in this context (for example, EJB session bean method). Otherwise, a new transaction is started and bean-managed transactions are used."
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1474
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1476
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1481
+#: configuration.xml:1484
 #, no-c-format
-msgid "You may also define your own transaction strategies (for a CORBA transaction service, for example)."
+msgid "You can also define your own transaction strategies (for a CORBA transaction service, for example)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1486
+#: configuration.xml:1489
 #, no-c-format
-msgid "Some features in Hibernate (i.e. the second level cache, Contextual Sessions with JTA, etc.) require access to the JTA <literal>TransactionManager</literal> in a managed environment. In an application server you have to specify how Hibernate should obtain a reference to the <literal>TransactionManager</literal>, since J2EE does not standardize a single mechanism:"
+msgid "Some features in Hibernate (i.e., the second level cache, Contextual Sessions with JTA, etc.) require access to the JTA <literal>TransactionManager</literal> in a managed environment. In an application server, since J2EE does not standardize a single mechanism, you have to specify how Hibernate should obtain a reference to the <literal>TransactionManager</literal>:"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1494
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1501
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1506
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1507
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1510
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1511
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1514
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1515
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1518
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1519
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1522
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1523
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1526
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1527
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1530
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1531
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1534
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1535
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1538
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1539
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1542
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1543
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1552
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1557
 #, no-c-format
-msgid "A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the lookup of the factory and the creation of new <literal>Session</literal>s. Note that this is not related to a JNDI bound <literal>Datasource</literal>, both simply use the same registry!"
+msgid "A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the lookup function of the factory and create new <literal>Session</literal>s. This is not, however, related to a JNDI bound <literal>Datasource</literal>; both simply use the same registry."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1561
+#: configuration.xml:1564
 #, no-c-format
-msgid "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</literal>) using the property <literal>hibernate.session_factory_name</literal>. If this property is omitted, the <literal>SessionFactory</literal> will not be bound to JNDI. (This is especially useful in environments with a read-only JNDI default implementation, e.g. Tomcat.)"
+msgid "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</literal>) using the property <literal>hibernate.session_factory_name</literal>. If this property is omitted, the <literal>SessionFactory</literal> will not be bound to JNDI. This is especially useful in environments with a read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1569
+#: configuration.xml:1572
 #, no-c-format
 msgid "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will use the values of <literal>hibernate.jndi.url</literal>, <literal>hibernate.jndi.class</literal> to instantiate an initial context. If they are not specified, the default <literal>InitialContext</literal> will be used."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1576
+#: configuration.xml:1579
 #, no-c-format
-msgid "Hibernate will automatically place the <literal>SessionFactory</literal> in JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means you will at least have this call in some startup code (or utility class) in your application, unless you use JMX deployment with the <literal>HibernateService</literal> (discussed later)."
+msgid "Hibernate will automatically place the <literal>SessionFactory</literal> in JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means you will have this call in some startup code, or utility class in your application, unless you use JMX deployment with the <literal>HibernateService</literal> (this is discussed later in greater detail)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1583
+#: configuration.xml:1586
 #, no-c-format
-msgid "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+msgid "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other class, you can obtain the <literal>SessionFactory</literal> using a JNDI lookup."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1588
+#: configuration.xml:1591
 #, no-c-format
-msgid "We recommend that you bind the <literal>SessionFactory</literal> to JNDI in a managed environment and use a <literal>static</literal> singleton otherwise. To shield your application code from these details, we also recommend to hide the actual lookup code for a <literal>SessionFactory</literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory()</literal>. Note that such a class is also a convenient way to startup Hibernate&mdash;see chapter 1."
+msgid "It is recommended that you bind the <literal>SessionFactory</literal> to JNDI in a managed environment and use a <literal>static</literal> singleton otherwise. To shield your application code from these details, we also recommend to hide the actual lookup code for a <literal>SessionFactory</literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory()</literal>. Note that such a class is also a convenient way to startup Hibernate&mdash;see chapter 1."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1600
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1602
+#: configuration.xml:1605
 #, no-c-format
-msgid "The easiest way to handle <literal>Session</literal>s and transactions is Hibernates automatic \"current\" <literal>Session</literal> management. See the discussion of <link linkend=\"architecture-current-session\">current sessions</link>. Using the <literal>\"jta\"</literal> session context, if there is no Hibernate <literal>Session</literal> associated with the current JTA transaction, one will be started and associated with that JTA transaction the first time you call <literal>sessionFactory.getCurrentSession()</literal>. The <literal>Session</literal>s retrieved via <literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context will be set to automatically flush before the transaction completes, close after the transaction completes, and aggressively release JDBC connections after each statement. This allows the <literal>Session</literal>s to be managed by the life cycle of the JTA transaction to which it is associated, keeping user code clean of su!
 ch management concerns. Your code can either use JTA programmatically through <literal>UserTransaction</literal>, or (recommended for portable code) use the Hibernate <literal>Transaction</literal> API to set transaction boundaries. If you run in an EJB container, declarative transaction demarcation with CMT is preferred."
+msgid "The easiest way to handle <literal>Sessions</literal> and transactions is Hibernate's automatic \"current\" <literal>Session</literal> management. For a discussion of contextual sessions see <link linkend=\"architecture-current-session\"></link>. Using the <literal>\"jta\"</literal> session context, if there is no Hibernate <literal>Session</literal> associated with the current JTA transaction, one will be started and associated with that JTA transaction the first time you call <literal>sessionFactory.getCurrentSession()</literal>. The <literal>Session</literal>s retrieved via <literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> context are set to automatically flush before the transaction completes, close after the transaction completes, and aggressively release JDBC connections after each statement. This allows the <literal>Session</literal>s to be managed by the life cycle of the JTA transaction to which it is associated, keeping user code clean!
  of such management concerns. Your code can either use JTA programmatically through <literal>UserTransaction</literal>, or (recommended for portable code) use the Hibernate <literal>Transaction</literal> API to set transaction boundaries. If you run in an EJB container, declarative transaction demarcation with CMT is preferred."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1625
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1627
+#: configuration.xml:1630
 #, no-c-format
-msgid "The line <literal>cfg.buildSessionFactory()</literal> still has to be executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You can do this either in a <literal>static</literal> initializer block (like the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a <emphasis>managed service</emphasis>."
+msgid "The line <literal>cfg.buildSessionFactory()</literal> still has to be executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You can do this either in a <literal>static</literal> initializer block, like the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as a <emphasis>managed service</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1635
+#: configuration.xml:1638
 #, no-c-format
-msgid "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</literal> for deployment on an application server with JMX capabilities, such as JBoss AS. The actual deployment and configuration is vendor specific. Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
+msgid "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</literal> for deployment on an application server with JMX capabilities, such as JBoss AS. The actual deployment and configuration is vendor-specific. Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1642
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -2170,8 +2182,8 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1644
+#: configuration.xml:1647
 #, no-c-format
-msgid "This file is deployed in a directory called <literal>META-INF</literal> and packaged in a JAR file with the extension <literal>.sar</literal> (service archive). You also need to package Hibernate, its required third-party libraries, your compiled persistent classes, as well as your mapping files in the same archive. Your enterprise beans (usually session beans) may be kept in their own JAR file, but you may include this EJB JAR file in the main service archive to get a single (hot-)deployable unit. Consult the JBoss AS documentation for more information about JMX service and EJB deployment."
+msgid "This file is deployed in a directory called <literal>META-INF</literal> and packaged in a JAR file with the extension <literal>.sar</literal> (service archive). You also need to package Hibernate, its required third-party libraries, your compiled persistent classes, as well as your mapping files in the same archive. Your enterprise beans (usually session beans) can be kept in their own JAR file, but you can include this EJB JAR file in the main service archive to get a single (hot-)deployable unit. Consult the JBoss AS documentation for more information about JMX service and EJB deployment."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: events.xml:31
 #, no-c-format
-msgid "It is often useful for the application to react to certain events that occur inside Hibernate. This allows implementation of certain kinds of generic functionality, and extension of Hibernate functionality."
+msgid "It is useful for the application to react to certain events that occur inside Hibernate. This allows for the implementation of generic functionality and the extension of Hibernate functionality."
 msgstr ""
 
 #. Tag: title
@@ -35,13 +35,13 @@
 #. Tag: para
 #: events.xml:40
 #, no-c-format
-msgid "The <literal>Interceptor</literal> interface provides callbacks from the session to the application allowing the application to inspect and/or manipulate properties of a persistent object before it is saved, updated, deleted or loaded. One possible use for this is to track auditing information. For example, the following <literal>Interceptor</literal> automatically sets the <literal>createTimestamp</literal> when an <literal>Auditable</literal> is created and updates the <literal>lastUpdateTimestamp</literal> property when an <literal>Auditable</literal> is updated."
+msgid "The <literal>Interceptor</literal> interface provides callbacks from the session to the application, allowing the application to inspect and/or manipulate properties of a persistent object before it is saved, updated, deleted or loaded. One possible use for this is to track auditing information. For example, the following <literal>Interceptor</literal> automatically sets the <literal>createTimestamp</literal> when an <literal>Auditable</literal> is created and updates the <literal>lastUpdateTimestamp</literal> property when an <literal>Auditable</literal> is updated."
 msgstr ""
 
 #. Tag: para
 #: events.xml:51
 #, no-c-format
-msgid "You may either implement <literal>Interceptor</literal> directly or (better) extend <literal>EmptyInterceptor</literal>."
+msgid "You can either implement <literal>Interceptor</literal> directly or extend <literal>EmptyInterceptor</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -135,7 +135,7 @@
 #. Tag: para
 #: events.xml:58
 #, no-c-format
-msgid "Interceptors come in two flavors: <literal>Session</literal>-scoped and <literal>SessionFactory</literal>-scoped."
+msgid "There are two kinds of inteceptors: <literal>Session</literal>-scoped and <literal>SessionFactory</literal>-scoped."
 msgstr ""
 
 #. Tag: para
@@ -153,7 +153,7 @@
 #. Tag: para
 #: events.xml:71
 #, no-c-format
-msgid "A <literal>SessionFactory</literal>-scoped interceptor is registered with the <literal>Configuration</literal> object prior to building the <literal>SessionFactory</literal>. In this case, the supplied interceptor will be applied to all sessions opened from that <literal>SessionFactory</literal>; this is true unless a session is opened explicitly specifying the interceptor to use. <literal>SessionFactory</literal>-scoped interceptors must be thread safe, taking care to not store session-specific state since multiple sessions will use this interceptor (potentially) concurrently."
+msgid "A <literal>SessionFactory</literal>-scoped interceptor is registered with the <literal>Configuration</literal> object prior to building the <literal>SessionFactory</literal>. Unless a session is opened explicitly specifying the interceptor to use, the supplied interceptor will be applied to all sessions opened from that <literal>SessionFactory</literal>. <literal>SessionFactory</literal>-scoped interceptors must be thread safe. Ensure that you do not store session-specific states, since multiple sessions will use this interceptor potentially concurrently."
 msgstr ""
 
 #. Tag: programlisting
@@ -171,25 +171,25 @@
 #. Tag: para
 #: events.xml:87
 #, no-c-format
-msgid "If you have to react to particular events in your persistence layer, you may also use the Hibernate3 <emphasis>event</emphasis> architecture. The event system can be used in addition or as a replacement for interceptors."
+msgid "If you have to react to particular events in your persistence layer, you can also use the Hibernate3 <emphasis>event</emphasis> architecture. The event system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 
 #. Tag: para
 #: events.xml:93
 #, no-c-format
-msgid "Essentially all of the methods of the <literal>Session</literal> interface correlate to an event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD or the <literal>org.hibernate.event</literal> package for the full list of defined event types). When a request is made of one of these methods, the Hibernate <literal>Session</literal> generates an appropriate event and passes it to the configured event listeners for that type. Out-of-the-box, these listeners implement the same processing in which those methods always resulted. However, you are free to implement a customization of one of the listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by the registered implemenation of the <literal>LoadEventListener</literal> interface), in which case their implementation would be responsible for processing any <literal>load()</literal> requests made of the <literal>Session</literal>."
+msgid "All the methods of the <literal>Session</literal> interface correlate to an event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</literal>, etc. Consult the XML configuration-file DTD or the <literal>org.hibernate.event</literal> package for the full list of defined event types. When a request is made of one of these methods, the Hibernate <literal>Session</literal> generates an appropriate event and passes it to the configured event listeners for that type. Out-of-the-box, these listeners implement the same processing in which those methods always resulted. However, you are free to implement a customization of one of the listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by the registered implementation of the <literal>LoadEventListener</literal> interface), in which case their implementation would be responsible for processing any <literal>load()</literal> requests made of the <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
 #: events.xml:108
 #, no-c-format
-msgid "The listeners should be considered effectively singletons; meaning, they are shared between requests, and thus should not save any state as instance variables."
+msgid "The listeners should be considered singletons. This means they are shared between requests, and should not save any state as instance variables."
 msgstr ""
 
 #. Tag: para
 #: events.xml:113
 #, no-c-format
-msgid "A custom listener should implement the appropriate interface for the event it wants to process and/or extend one of the convenience base classes (or even the default event listeners used by Hibernate out-of-the-box as these are declared non-final for this purpose). Custom listeners can either be registered programmatically through the <literal>Configuration</literal> object, or specified in the Hibernate configuration XML (declarative configuration through the properties file is not supported). Here's an example of a custom load event listener:"
+msgid "A custom listener implements the appropriate interface for the event it wants to process and/or extend one of the convenience base classes (or even the default event listeners used by Hibernate out-of-the-box as these are declared non-final for this purpose). Custom listeners can either be registered programmatically through the <literal>Configuration</literal> object, or specified in the Hibernate configuration XML. Declarative configuration through the properties file is not supported. Here is an example of a custom load event listener:"
 msgstr ""
 
 #. Tag: programlisting
@@ -231,7 +231,7 @@
 #. Tag: para
 #: events.xml:132
 #, no-c-format
-msgid "Instead, you may register it programmatically:"
+msgid "Instead, you can register it programmatically:"
 msgstr ""
 
 #. Tag: programlisting
@@ -246,13 +246,13 @@
 #. Tag: para
 #: events.xml:138
 #, no-c-format
-msgid "Listeners registered declaratively cannot share instances. If the same class name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each reference will result in a separate instance of that class. If you need the capability to share listener instances between listener types you must use the programmatic registration approach."
+msgid "Listeners registered declaratively cannot share instances. If the same class name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each reference will result in a separate instance of that class. If you need to share listener instances between listener types you must use the programmatic registration approach."
 msgstr ""
 
 #. Tag: para
 #: events.xml:146
 #, no-c-format
-msgid "Why implement an interface and define the specific type during configuration? Well, a listener implementation could implement multiple event listener interfaces. Having the type additionally defined during registration makes it easier to turn custom listeners on or off during configuration."
+msgid "Why implement an interface and define the specific type during configuration? A listener implementation could implement multiple event listener interfaces. Having the type additionally defined during registration makes it easier to turn custom listeners on or off during configuration."
 msgstr ""
 
 #. Tag: title
@@ -264,7 +264,7 @@
 #. Tag: para
 #: events.xml:157
 #, no-c-format
-msgid "Usually, declarative security in Hibernate applications is managed in a session facade layer. Now, Hibernate3 allows certain actions to be permissioned via JACC, and authorized via JAAS. This is optional functionality built on top of the event architecture."
+msgid "Usually, declarative security in Hibernate applications is managed in a session facade layer. Hibernate3 allows certain actions to be permissioned via JACC, and authorized via JAAS. This is an optional functionality that is built on top of the event architecture."
 msgstr ""
 
 #. Tag: para
@@ -286,13 +286,13 @@
 #. Tag: para
 #: events.xml:170
 #, no-c-format
-msgid "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for a particular event type."
+msgid "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for a particular event type."
 msgstr ""
 
 #. Tag: para
 #: events.xml:176
 #, no-c-format
-msgid "Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to roles:"
+msgid "Next, while still in <literal>hibernate.cfg.xml</literal>, bind the permissions to roles:"
 msgstr ""
 
 #. Tag: programlisting

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -21,31 +21,31 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:31
+#: example_mappings.xml:32
 #, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+msgid "This chapters explores some more complex association mappings."
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:36
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:38
+#: example_mappings.xml:39
 #, no-c-format
-msgid "The following model of the relationship between <literal>Employer</literal> and <literal>Employee</literal> uses an actual entity class (<literal>Employment</literal>) to represent the association. This is done because there might be more than one period of employment for the same two parties. Components are used to model monetary values and employee names."
+msgid "The following model of the relationship between <literal>Employer</literal> and <literal>Employee</literal> uses an entity class (<literal>Employment</literal>) to represent the association. You can do this when there might be more than one period of employment for the same two parties. Components are used to model monetary values and employee names."
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:55
+#: example_mappings.xml:56
 #, no-c-format
-msgid "Heres a possible mapping document:"
+msgid "Here is a possible mapping document:"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:59
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -99,13 +99,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:61
+#: example_mappings.xml:62
 #, no-c-format
-msgid "And heres the table schema generated by <literal>SchemaExport</literal>."
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:65
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
       "<![CDATA[create table employers (\n"
@@ -144,25 +144,25 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:70
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:72
+#: example_mappings.xml:73
 #, no-c-format
-msgid "Consider the following model of the relationships between <literal>Work</literal>, <literal>Author</literal> and <literal>Person</literal>. We represent the relationship between <literal>Work</literal> and <literal>Author</literal> as a many-to-many association. We choose to represent the relationship between <literal>Author</literal> and <literal>Person</literal> as one-to-one association. Another possibility would be to have <literal>Author</literal> extend <literal>Person</literal>."
+msgid "Consider the following model of the relationships between <literal>Work</literal>, <literal>Author</literal> and <literal>Person</literal>. In the example, the relationship between <literal>Work</literal> and <literal>Author</literal> is represented as a many-to-many association and the relationship between <literal>Author</literal> and <literal>Person</literal> is represented as one-to-one association. Another possibility would be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:90
+#: example_mappings.xml:91
 #, no-c-format
 msgid "The following mapping document correctly represents these relationships:"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:94
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -219,13 +219,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:96
+#: example_mappings.xml:97
 #, no-c-format
-msgid "There are four tables in this mapping. <literal>works</literal>, <literal>authors</literal> and <literal>persons</literal> hold work, author and person data respectively. <literal>author_work</literal> is an association table linking authors to works. Heres the table schema, as generated by <literal>SchemaExport</literal>."
+msgid "There are four tables in this mapping: <literal>works</literal>, <literal>authors</literal> and <literal>persons</literal> hold work, author and person data respectively. <literal>author_work</literal> is an association table linking authors to works. Here is the table schema, as generated by <literal>SchemaExport</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:104
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
       "<![CDATA[create table works (\n"
@@ -265,25 +265,25 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:109
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:111
+#: example_mappings.xml:112
 #, no-c-format
-msgid "Now consider a model of the relationships between <literal>Customer</literal>, <literal>Order</literal> and <literal>LineItem</literal> and <literal>Product</literal>. There is a one-to-many association between <literal>Customer</literal> and <literal>Order</literal>, but how should we represent <literal>Order</literal> / <literal>LineItem</literal> / <literal>Product</literal>? I've chosen to map <literal>LineItem</literal> as an association class representing the many-to-many association between <literal>Order</literal> and <literal>Product</literal>. In Hibernate, this is called a composite element."
+msgid "In this section we consider a model of the relationships between <literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</literal> and <literal>Product</literal>. There is a one-to-many association between <literal>Customer</literal> and <literal>Order</literal>, but how can you represent <literal>Order</literal> / <literal>LineItem</literal> / <literal>Product</literal>? In the example, <literal>LineItem</literal> is mapped as an association class representing the many-to-many association between <literal>Order</literal> and <literal>Product</literal>. In Hibernate this is called a composite element."
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:131
+#: example_mappings.xml:132
 #, no-c-format
-msgid "The mapping document:"
+msgid "The mapping document will look like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -326,13 +326,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:137
+#: example_mappings.xml:138
 #, no-c-format
 msgid "<literal>customers</literal>, <literal>orders</literal>, <literal>line_items</literal> and <literal>products</literal> hold customer, order, order line item and product data respectively. <literal>line_items</literal> also acts as an association table linking orders with products."
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:144
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
       "<![CDATA[create table customers (\n"
@@ -371,31 +371,25 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:149
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:151
+#: example_mappings.xml:152
 #, no-c-format
-msgid "These examples are all taken from the Hibernate test suite. You will find many other useful example mappings there. Look in the <literal>test</literal> folder of the Hibernate distribution."
+msgid "These examples are available from the Hibernate test suite. You will find many other useful example mappings there by searching in the <literal>test</literal> folder of the Hibernate distribution."
 msgstr ""
 
-#. Tag: para
-#: example_mappings.xml:157
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr ""
-
 #. Tag: title
-#: example_mappings.xml:160
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:161
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -427,13 +421,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:165
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:166
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Customer\">\n"
@@ -552,13 +546,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:170
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:171
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -599,13 +593,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:175
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:176
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\"\n"
@@ -661,13 +655,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:180
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr ""
 
 #. Tag: programlisting
-#: example_mappings.xml:181
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: example_parentchild.xml:31
 #, no-c-format
-msgid "One of the very first things that new users try to do with Hibernate is to model a parent / child type relationship. There are two different approaches to this. For various reasons the most convenient approach, especially for new users, is to model both <literal>Parent</literal> and <literal>Child</literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> association from <literal>Parent</literal> to <literal>Child</literal>. (The alternative approach is to declare the <literal>Child</literal> as a <literal>&lt;composite-element&gt;</literal>.) Now, it turns out that default semantics of a one to many association (in Hibernate) are much less close to the usual semantics of a parent / child relationship than those of a composite element mapping. We will explain how to use a <emphasis>bidirectional one to many association with cascades</emphasis> to model a parent / child relationship efficiently and elegantly. It's not at all difficult!"
+msgid "One of the first things that new users want to do with Hibernate is to model a parent/child type relationship. There are two different approaches to this. The most convenient approach, especially for new users, is to model both <literal>Parent</literal> and <literal>Child</literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> association from <literal>Parent</literal> to <literal>Child</literal>. The alternative approach is to declare the <literal>Child</literal> as a <literal>&lt;composite-element&gt;</literal>. The default semantics of a one-to-many association in Hibernate are much less close to the usual semantics of a parent/child relationship than those of a composite element mapping. We will explain how to use a <emphasis>bidirectional one-to-many association with cascades</emphasis> to model a parent/child relationship efficiently and elegantly."
 msgstr ""
 
 #. Tag: title
@@ -35,31 +35,31 @@
 #. Tag: para
 #: example_parentchild.xml:47
 #, no-c-format
-msgid "Hibernate collections are considered to be a logical part of their owning entity; never of the contained entities. This is a crucial distinction! It has the following consequences:"
+msgid "Hibernate collections are considered to be a logical part of their owning entity and not of the contained entities. Be aware that this is a critical distinction that has the following consequences:"
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:54
 #, no-c-format
-msgid "When we remove / add an object from / to a collection, the version number of the collection owner is incremented."
+msgid "When you remove/add an object from/to a collection, the version number of the collection owner is incremented."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:60
 #, no-c-format
-msgid "If an object that was removed from a collection is an instance of a value type (eg, a composite element), that object will cease to be persistent and its state will be completely removed from the database. Likewise, adding a value type instance to the collection will cause its state to be immediately persistent."
+msgid "If an object that was removed from a collection is an instance of a value type (e.g. a composite element), that object will cease to be persistent and its state will be completely removed from the database. Likewise, adding a value type instance to the collection will cause its state to be immediately persistent."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:68
 #, no-c-format
-msgid "On the other hand, if an entity is removed from a collection (a one-to-many or many-to-many association), it will not be deleted, by default. This behaviour is completely consistent - a change to the internal state of another entity should not cause the associated entity to vanish! Likewise, adding an entity to a collection does not cause that entity to become persistent, by default."
+msgid "Conversely, if an entity is removed from a collection (a one-to-many or many-to-many association), it will not be deleted by default. This behavior is completely consistent; a change to the internal state of another entity should not cause the associated entity to vanish. Likewise, adding an entity to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:78
 #, no-c-format
-msgid "Instead, the default behaviour is that adding an entity to a collection merely creates a link between the two entities, while removing it removes the link. This is very appropriate for all sorts of cases. Where it is not appropriate at all is the case of a parent / child relationship, where the life of the child is bound to the life cycle of the parent."
+msgid "Adding an entity to a collection, by default, merely creates a link between the two entities. Removing the entity will remove the link. This is appropriate for all sorts of cases. However, it is not appropriate in the case of a parent/child relationship. In this case, the life of the child is bound to the life cycle of the parent."
 msgstr ""
 
 #. Tag: title
@@ -87,7 +87,7 @@
 #. Tag: para
 #: example_parentchild.xml:97
 #, no-c-format
-msgid "If we were to execute the following code"
+msgid "If we were to execute the following code:"
 msgstr ""
 
 #. Tag: programlisting
@@ -122,7 +122,7 @@
 #. Tag: para
 #: example_parentchild.xml:119
 #, no-c-format
-msgid "This is not only inefficient, but also violates any <literal>NOT NULL</literal> constraint on the <literal>parent_id</literal> column. We can fix the nullability constraint violation by specifying <literal>not-null=\"true\"</literal> in the collection mapping:"
+msgid "This is not only inefficient, but also violates any <literal>NOT NULL</literal> constraint on the <literal>parent_id</literal> column. You can fix the nullability constraint violation by specifying <literal>not-null=\"true\"</literal> in the collection mapping:"
 msgstr ""
 
 #. Tag: programlisting
@@ -144,7 +144,7 @@
 #. Tag: para
 #: example_parentchild.xml:130
 #, no-c-format
-msgid "The underlying cause of this behaviour is that the link (the foreign key <literal>parent_id</literal>) from <literal>p</literal> to <literal>c</literal> is not considered part of the state of the <literal>Child</literal> object and is therefore not created in the <literal>INSERT</literal>. So the solution is to make the link part of the <literal>Child</literal> mapping."
+msgid "The underlying cause of this behavior is that the link (the foreign key <literal>parent_id</literal>) from <literal>p</literal> to <literal>c</literal> is not considered part of the state of the <literal>Child</literal> object and is therefore not created in the <literal>INSERT</literal>. The solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 
 #. Tag: programlisting
@@ -156,13 +156,13 @@
 #. Tag: para
 #: example_parentchild.xml:139
 #, no-c-format
-msgid "(We also need to add the <literal>parent</literal> property to the <literal>Child</literal> class.)"
+msgid "You also need to add the <literal>parent</literal> property to the <literal>Child</literal> class."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:143
 #, no-c-format
-msgid "Now that the <literal>Child</literal> entity is managing the state of the link, we tell the collection not to update the link. We use the <literal>inverse</literal> attribute."
+msgid "Now that the <literal>Child</literal> entity is managing the state of the link, we tell the collection not to update the link. We use the <literal>inverse</literal> attribute to do this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -178,7 +178,7 @@
 #. Tag: para
 #: example_parentchild.xml:150
 #, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -196,13 +196,13 @@
 #. Tag: para
 #: example_parentchild.xml:156
 #, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:160
 #, no-c-format
-msgid "To tighten things up a bit, we could create an <literal>addChild()</literal> method of <literal>Parent</literal>."
+msgid "You could also create an <literal>addChild()</literal> method of <literal>Parent</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -218,7 +218,7 @@
 #. Tag: para
 #: example_parentchild.xml:167
 #, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -241,7 +241,7 @@
 #. Tag: para
 #: example_parentchild.xml:178
 #, no-c-format
-msgid "The explicit call to <literal>save()</literal> is still annoying. We will address this by using cascades."
+msgid "You can address the frustrations of the explicit call to <literal>save()</literal> by using cascades."
 msgstr ""
 
 #. Tag: programlisting
@@ -257,7 +257,7 @@
 #. Tag: para
 #: example_parentchild.xml:185
 #, no-c-format
-msgid "This simplifies the code above to"
+msgid "This simplifies the code above to:"
 msgstr ""
 
 #. Tag: programlisting
@@ -273,7 +273,7 @@
 #. Tag: para
 #: example_parentchild.xml:191
 #, no-c-format
-msgid "Similarly, we don't need to iterate over the children when saving or deleting a <literal>Parent</literal>. The following removes <literal>p</literal> and all its children from the database."
+msgid "Similarly, we do not need to iterate over the children when saving or deleting a <literal>Parent</literal>. The following removes <literal>p</literal> and all its children from the database."
 msgstr ""
 
 #. Tag: programlisting
@@ -288,7 +288,7 @@
 #. Tag: para
 #: example_parentchild.xml:198
 #, no-c-format
-msgid "However, this code"
+msgid "However, the following code:"
 msgstr ""
 
 #. Tag: programlisting
@@ -305,7 +305,7 @@
 #. Tag: para
 #: example_parentchild.xml:204
 #, no-c-format
-msgid "will not remove <literal>c</literal> from the database; it will ony remove the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> constraint violation, in this case). You need to explicitly <literal>delete()</literal> the <literal>Child</literal>."
+msgid "will not remove <literal>c</literal> from the database. In this case, it will only remove the link to <literal>p</literal> and cause a <literal>NOT NULL</literal> constraint violation. You need to explicitly <literal>delete()</literal> the <literal>Child</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -322,7 +322,7 @@
 #. Tag: para
 #: example_parentchild.xml:212
 #, no-c-format
-msgid "Now, in our case, a <literal>Child</literal> can't really exist without its parent. So if we remove a <literal>Child</literal> from the collection, we really do want it to be deleted. For this, we must use <literal>cascade=\"all-delete-orphan\"</literal>."
+msgid "In our case, a <literal>Child</literal> cannot exist without its parent. So if we remove a <literal>Child</literal> from the collection, we do want it to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan\"</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -338,7 +338,7 @@
 #. Tag: para
 #: example_parentchild.xml:220
 #, no-c-format
-msgid "Note: even though the collection mapping specifies <literal>inverse=\"true\"</literal>, cascades are still processed by iterating the collection elements. So if you require that an object be saved, deleted or updated by cascade, you must add it to the collection. It is not enough to simply call <literal>setParent()</literal>."
+msgid "Even though the collection mapping specifies <literal>inverse=\"true\"</literal>, cascades are still processed by iterating the collection elements. If you need an object be saved, deleted or updated by cascade, you must add it to the collection. It is not enough to simply call <literal>setParent()</literal>."
 msgstr ""
 
 #. Tag: title
@@ -350,13 +350,13 @@
 #. Tag: para
 #: example_parentchild.xml:232
 #, no-c-format
-msgid "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</literal>, made some changes in a UI action and wish to persist these changes in a new session by calling <literal>update()</literal>. The <literal>Parent</literal> will contain a collection of childen and, since cascading update is enabled, Hibernate needs to know which children are newly instantiated and which represent existing rows in the database. Lets assume that both <literal>Parent</literal> and <literal>Child</literal> have genenerated identifier properties of type <literal>Long</literal>. Hibernate will use the identifier and version/timestamp property value to determine which of the children are new. (See <xref linkend=\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an <literal>unsaved-value</literal> explicitly.</emphasis>"
+msgid "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</literal>, made some changes in a UI action and wanted to persist these changes in a new session by calling <literal>update()</literal>. The <literal>Parent</literal> will contain a collection of children and, since the cascading update is enabled, Hibernate needs to know which children are newly instantiated and which represent existing rows in the database. We will also assume that both <literal>Parent</literal> and <literal>Child</literal> have generated identifier properties of type <literal>Long</literal>. Hibernate will use the identifier and version/timestamp property value to determine which of the children are new. (See <xref linkend=\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an <literal>unsaved-value</literal> explicitly.</emphasis>"
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:244
 #, no-c-format
-msgid "The following code will update <literal>parent</literal> and <literal>child</literal> and insert <literal>newChild</literal>."
+msgid "The following code will update <literal>parent</literal> and <literal>child</literal> and insert <literal>newChild</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -374,7 +374,7 @@
 #. Tag: para
 #: example_parentchild.xml:251
 #, no-c-format
-msgid "Well, that's all very well for the case of a generated identifier, but what about assigned identifiers and composite identifiers? This is more difficult, since Hibernate can't use the identifier property to distinguish between a newly instantiated object (with an identifier assigned by the user) and an object loaded in a previous session. In this case, Hibernate will either use the timestamp or version property, or will actually query the second-level cache or, worst case, the database, to see if the row exists."
+msgid "This may be suitable for the case of a generated identifier, but what about assigned identifiers and composite identifiers? This is more difficult, since Hibernate cannot use the identifier property to distinguish between a newly instantiated object, with an identifier assigned by the user, and an object loaded in a previous session. In this case, Hibernate will either use the timestamp or version property, or will actually query the second-level cache or, worst case, the database, to see if the row exists."
 msgstr ""
 
 #. Tag: title
@@ -386,12 +386,12 @@
 #. Tag: para
 #: example_parentchild.xml:286
 #, no-c-format
-msgid "There is quite a bit to digest here and it might look confusing first time around. However, in practice, it all works out very nicely. Most Hibernate applications use the parent / child pattern in many places."
+msgid "The sections we have just covered can be a bit confusing. However, in practice, it all works out nicely. Most Hibernate applications use the parent/child pattern in many places."
 msgstr ""
 
 #. Tag: para
 #: example_parentchild.xml:291
 #, no-c-format
-msgid "We mentioned an alternative in the first paragraph. None of the above issues exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, which have exactly the semantics of a parent / child relationship. Unfortunately, there are two big limitations to composite element classes: composite elements may not own collections, and they should not be the child of any entity other than the unique parent."
+msgid "We mentioned an alternative in the first paragraph. None of the above issues exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, which have exactly the semantics of a parent/child relationship. Unfortunately, there are two big limitations with composite element classes: composite elements cannot own collections and they should not be the child of any entity other than the unique parent."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -29,7 +29,7 @@
 #. Tag: para
 #: example_weblog.xml:34
 #, no-c-format
-msgid "The persistent classes represent a weblog, and an item posted in a weblog. They are to be modelled as a standard parent/child relationship, but we will use an ordered bag, instead of a set."
+msgid "The persistent classes here represent a weblog and an item posted in a weblog. They are to be modelled as a standard parent/child relationship, but we will use an ordered bag, instead of a set:"
 msgstr ""
 
 #. Tag: programlisting
@@ -124,7 +124,7 @@
 #. Tag: para
 #: example_weblog.xml:49
 #, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+msgid "The XML mappings are now straightforward. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -230,7 +230,7 @@
 #. Tag: para
 #: example_weblog.xml:62
 #, no-c-format
-msgid "The following class demonstrates some of the kinds of things we can do with these classes, using Hibernate."
+msgid "The following class demonstrates some of the kinds of things we can do with these classes using Hibernate:"
 msgstr ""
 
 #. Tag: programlisting

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: filters.xml:31
 #, no-c-format
-msgid "Hibernate3 provides an innovative new approach to handling data with \"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, named, parameterized filter that may be enabled or disabled for a particular Hibernate session."
+msgid "Hibernate3 provides an innovative new approach to handling data with \"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, named, parameterized filter that can be enabled or disabled for a particular Hibernate session."
 msgstr ""
 
 #. Tag: title
@@ -35,7 +35,7 @@
 #. Tag: para
 #: filters.xml:40
 #, no-c-format
-msgid "Hibernate3 adds the ability to pre-define filter criteria and attach those filters at both a class and a collection level. A filter criteria is the ability to define a restriction clause very similiar to the existing \"where\" attribute available on the class and various collection elements. Except these filter conditions can be parameterized. The application can then make the decision at runtime whether given filters should be enabled and what their parameter values should be. Filters can be used like database views, but parameterized inside the application."
+msgid "Hibernate3 has the ability to pre-define filter criteria and attach those filters at both a class level and a collection level. A filter criteria allows you to define a restriction clause similar to the existing \"where\" attribute available on the class and various collection elements. These filter conditions, however, can be parameterized. The application can then decide at runtime whether certain filters should be enabled and what their parameter values should be. Filters can be used like database views, but they are parameterized inside the application."
 msgstr ""
 
 #. Tag: para
@@ -56,7 +56,7 @@
 #. Tag: para
 #: filters.xml:58
 #, no-c-format
-msgid "Then, this filter can be attached to a class:"
+msgid "This filter can then be attached to a class:"
 msgstr ""
 
 #. Tag: programlisting
@@ -72,7 +72,7 @@
 #. Tag: para
 #: filters.xml:64
 #, no-c-format
-msgid "or, to a collection:"
+msgid "Or, to a collection:"
 msgstr ""
 
 #. Tag: programlisting
@@ -87,13 +87,13 @@
 #. Tag: para
 #: filters.xml:70
 #, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+msgid "Or, to both or multiples of each at the same time."
 msgstr ""
 
 #. Tag: para
 #: filters.xml:74
 #, no-c-format
-msgid "The methods on <literal>Session</literal> are: <literal>enableFilter(String filterName)</literal>, <literal>getEnabledFilter(String filterName)</literal>, and <literal>disableFilter(String filterName)</literal>. By default, filters are <emphasis>not</emphasis> enabled for a given session; they must be explcitly enabled through use of the <literal>Session.enableFilter()</literal> method, which returns an instance of the <literal>Filter</literal> interface. Using the simple filter defined above, this would look like:"
+msgid "The methods on <literal>Session</literal> are: <literal>enableFilter(String filterName)</literal>, <literal>getEnabledFilter(String filterName)</literal>, and <literal>disableFilter(String filterName)</literal>. By default, filters are <emphasis>not</emphasis> enabled for a given session. Filters must be enabled through use of the <literal>Session.enableFilter()</literal> method, which returns an instance of the <literal>Filter</literal> interface. If you used the simple filter defined above, it would look like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -105,13 +105,13 @@
 #. Tag: para
 #: filters.xml:85
 #, no-c-format
-msgid "Note that methods on the org.hibernate.Filter interface do allow the method-chaining common to much of Hibernate."
+msgid "Methods on the org.hibernate.Filter interface do allow the method-chaining common to much of Hibernate."
 msgstr ""
 
 #. Tag: para
 #: filters.xml:89
 #, no-c-format
-msgid "A full example, using temporal data with an effective record date pattern:"
+msgid "The following is a full example, using temporal data with an effective record date pattern:"
 msgstr ""
 
 #. Tag: programlisting
@@ -150,7 +150,7 @@
 #. Tag: para
 #: filters.xml:95
 #, no-c-format
-msgid "Then, in order to ensure that you always get back currently effective records, simply enable the filter on the session prior to retrieving employee data:"
+msgid "In order to ensure that you are provided with currently effective records, enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 
 #. Tag: programlisting
@@ -168,19 +168,19 @@
 #. Tag: para
 #: filters.xml:102
 #, no-c-format
-msgid "In the HQL above, even though we only explicitly mentioned a salary constraint on the results, because of the enabled filter the query will return only currently active employees who have a salary greater than a million dollars."
+msgid "Even though a salary constraint was mentioned explicitly on the results in the above HQL, because of the enabled filter, the query will return only currently active employees who have a salary greater than one million dollars."
 msgstr ""
 
 #. Tag: para
 #: filters.xml:108
 #, no-c-format
-msgid "Note: if you plan on using filters with outer joining (either through HQL or load fetching) be careful of the direction of the condition expression. Its safest to set this up for left outer joining; in general, place the parameter first followed by the column name(s) after the operator."
+msgid "If you want to use filters with outer joining, either through HQL or load fetching, be careful of the direction of the condition expression. It is safest to set this up for left outer joining. Place the parameter first followed by the column name(s) after the operator."
 msgstr ""
 
 #. Tag: para
 #: filters.xml:115
 #, no-c-format
-msgid "After being defined a filter might be attached to multiple entities and/or collections each with its own condition. That can be tedious when the conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</literal> allows defining a default condition, either as an attribute or CDATA:"
+msgid "After being defined, a filter might be attached to multiple entities and/or collections each with its own condition. This can be problematic when the conditions are the same each time. Using <literal>&lt;filter-def/&gt;</literal> allows you to definine a default condition, either as an attribute or CDATA:"
 msgstr ""
 
 #. Tag: programlisting
@@ -194,6 +194,6 @@
 #. Tag: para
 #: filters.xml:124
 #, no-c-format
-msgid "This default condition will then be used whenever the filter is attached to something without specifying a condition. Note that this means you can give a specific condition as part of the attachment of the filter which overrides the default condition in that particular case."
+msgid "This default condition will be used whenever the filter is attached to something without specifying a condition. This means you can give a specific condition as part of the attachment of the filter that overrides the default condition in that particular case."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -17,13 +17,13 @@
 #. Tag: title
 #: inheritance_mapping.xml:29
 #, no-c-format
-msgid "Inheritance Mapping"
+msgid "Inheritance mapping"
 msgstr ""
 
 #. Tag: title
 #: inheritance_mapping.xml:32
 #, no-c-format
-msgid "The Three Strategies"
+msgid "The three strategies"
 msgstr ""
 
 #. Tag: para
@@ -65,13 +65,13 @@
 #. Tag: para
 #: inheritance_mapping.xml:69
 #, no-c-format
-msgid "It is possible to use different mapping strategies for different branches of the same inheritance hierarchy, and then make use of implicit polymorphism to achieve polymorphism across the whole hierarchy. However, Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</literal> element. It is possible to mix together the table per hierarchy and table per subclass strategies, under the the same <literal>&lt;class&gt;</literal> element, by combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</literal> elements (see below)."
+msgid "It is possible to use different mapping strategies for different branches of the same inheritance hierarchy. You can then make use of implicit polymorphism to achieve polymorphism across the whole hierarchy. However, Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, <literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</literal> element. It is possible to mix together the table per hierarchy and table per subclass strategies under the the same <literal>&lt;class&gt;</literal> element, by combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 
 #. Tag: para
 #: inheritance_mapping.xml:83
 #, no-c-format
-msgid "It is possible to define <literal>subclass</literal>, <literal>union-subclass</literal>, and <literal>joined-subclass</literal> mappings in separate mapping documents, directly beneath <literal>hibernate-mapping</literal>. This allows you to extend a class hierachy just by adding a new mapping file. You must specify an <literal>extends</literal> attribute in the subclass mapping, naming a previously mapped superclass. Note: Previously this feature made the ordering of the mapping documents important. Since Hibernate3, the ordering of mapping files does not matter when using the extends keyword. The ordering inside a single mapping file still needs to be defined as superclasses before subclasses."
+msgid "It is possible to define <literal>subclass</literal>, <literal>union-subclass</literal>, and <literal>joined-subclass</literal> mappings in separate mapping documents directly beneath <literal>hibernate-mapping</literal>. This allows you to extend a class hierarchy by adding a new mapping file. You must specify an <literal>extends</literal> attribute in the subclass mapping, naming a previously mapped superclass. Previously this feature made the ordering of the mapping documents important. Since Hibernate3, the ordering of mapping files is irrelevant when using the extends keyword. The ordering inside a single mapping file still needs to be defined as superclasses before subclasses."
 msgstr ""
 
 #. Tag: programlisting
@@ -95,7 +95,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:100
 #, no-c-format
-msgid "Suppose we have an interface <literal>Payment</literal>, with implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, <literal>ChequePayment</literal>. The table per hierarchy mapping would look like:"
+msgid "Suppose we have an interface <literal>Payment</literal> with the implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, and <literal>ChequePayment</literal>. The table per hierarchy mapping would display in the following way:"
 msgstr ""
 
 #. Tag: programlisting
@@ -125,7 +125,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:109
 #, no-c-format
-msgid "Exactly one table is required. There is one big limitation of this mapping strategy: columns declared by the subclasses, such as <literal>CCTYPE</literal>, may not have <literal>NOT NULL</literal> constraints."
+msgid "Exactly one table is required. There is a limitation of this mapping strategy: columns declared by the subclasses, such as <literal>CCTYPE</literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 
 #. Tag: title
@@ -137,7 +137,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:120
 #, no-c-format
-msgid "A table per subclass mapping would look like:"
+msgid "A table per subclass mapping looks like this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -169,19 +169,19 @@
 #. Tag: para
 #: inheritance_mapping.xml:126
 #, no-c-format
-msgid "Four tables are required. The three subclass tables have primary key associations to the superclass table (so the relational model is actually a one-to-one association)."
+msgid "Four tables are required. The three subclass tables have primary key associations to the superclass table so the relational model is actually a one-to-one association."
 msgstr ""
 
 #. Tag: title
 #: inheritance_mapping.xml:135
 #, no-c-format
-msgid "Table per subclass, using a discriminator"
+msgid "Table per subclass: using a discriminator"
 msgstr ""
 
 #. Tag: para
 #: inheritance_mapping.xml:137
 #, no-c-format
-msgid "Note that Hibernate's implementation of table per subclass requires no discriminator column. Other object/relational mappers use a different implementation of table per subclass which requires a type discriminator column in the superclass table. The approach taken by Hibernate is much more difficult to implement but arguably more correct from a relational point of view. If you would like to use a discriminator column with the table per subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</literal>, as follow:"
+msgid "Hibernate's implementation of table per subclass does not require a discriminator column. Other object/relational mappers use a different implementation of table per subclass that requires a type discriminator column in the superclass table. The approach taken by Hibernate is much more difficult to implement, but arguably more correct from a relational point of view. If you want to use a discriminator column with the table per subclass strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 
 #. Tag: programlisting
@@ -232,7 +232,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:162
 #, no-c-format
-msgid "You may even mix the table per hierarchy and table per subclass strategies using this approach:"
+msgid "You can even mix the table per hierarchy and table per subclass strategies using the following approach:"
 msgstr ""
 
 #. Tag: programlisting
@@ -282,7 +282,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:182
 #, no-c-format
-msgid "There are two ways we could go about mapping the table per concrete class strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+msgid "There are two ways we can map the table per concrete class strategy. First, you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -317,19 +317,19 @@
 #. Tag: para
 #: inheritance_mapping.xml:194
 #, no-c-format
-msgid "The limitation of this approach is that if a property is mapped on the superclass, the column name must be the same on all subclass tables. (We might relax this in a future release of Hibernate.) The identity generator strategy is not allowed in union subclass inheritance, indeed the primary key seed has to be shared accross all unioned subclasses of a hierarchy."
+msgid "The limitation of this approach is that if a property is mapped on the superclass, the column name must be the same on all subclass tables. The identity generator strategy is not allowed in union subclass inheritance. The primary key seed has to be shared across all unioned subclasses of a hierarchy."
 msgstr ""
 
 #. Tag: para
 #: inheritance_mapping.xml:203
 #, no-c-format
-msgid "If your superclass is abstract, map it with <literal>abstract=\"true\"</literal>. Of course, if it is not abstract, an additional table (defaults to <literal>PAYMENT</literal> in the example above) is needed to hold instances of the superclass."
+msgid "If your superclass is abstract, map it with <literal>abstract=\"true\"</literal>. If it is not abstract, an additional table (it defaults to <literal>PAYMENT</literal> in the example above), is needed to hold instances of the superclass."
 msgstr ""
 
 #. Tag: title
 #: inheritance_mapping.xml:213
 #, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+msgid "Table per concrete class using implicit polymorphism"
 msgstr ""
 
 #. Tag: para
@@ -370,7 +370,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:221
 #, no-c-format
-msgid "Notice that nowhere do we mention the <literal>Payment</literal> interface explicitly. Also notice that properties of <literal>Payment</literal> are mapped in each of the subclasses. If you want to avoid duplication, consider using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM \"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+msgid "Notice that the <literal>Payment</literal> interface is not mentioned explicitly. Also notice that properties of <literal>Payment</literal> are mapped in each of the subclasses. If you want to avoid duplication, consider using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM \"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 
 #. Tag: para
@@ -407,7 +407,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:248
 #, no-c-format
-msgid "There is one further thing to notice about this mapping. Since the subclasses are each mapped in their own <literal>&lt;class&gt;</literal> element (and since <literal>Payment</literal> is just an interface), each of the subclasses could easily be part of another inheritance hierarchy! (And you can still use polymorphic queries against the <literal>Payment</literal> interface.)"
+msgid "Since the subclasses are each mapped in their own <literal>&lt;class&gt;</literal> element, and since <literal>Payment</literal> is just an interface), each of the subclasses could easily be part of another inheritance hierarchy. You can still use polymorphic queries against the <literal>Payment</literal> interface."
 msgstr ""
 
 #. Tag: programlisting
@@ -446,7 +446,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:258
 #, no-c-format
-msgid "Once again, we don't mention <literal>Payment</literal> explicitly. If we execute a query against the <literal>Payment</literal> interface - for example, <literal>from Payment</literal> - Hibernate automatically returns instances of <literal>CreditCardPayment</literal> (and its subclasses, since they also implement <literal>Payment</literal>), <literal>CashPayment</literal> and <literal>ChequePayment</literal> but not instances of <literal>NonelectronicTransaction</literal>."
+msgid "Once again, <literal>Payment</literal> is not mentioned explicitly. If we execute a query against the <literal>Payment</literal> interface, for example <literal>from Payment</literal>, Hibernate automatically returns instances of <literal>CreditCardPayment</literal> (and its subclasses, since they also implement <literal>Payment</literal>), <literal>CashPayment</literal> and <literal>ChequePayment</literal>, but not instances of <literal>NonelectronicTransaction</literal>."
 msgstr ""
 
 #. Tag: title
@@ -458,7 +458,7 @@
 #. Tag: para
 #: inheritance_mapping.xml:275
 #, no-c-format
-msgid "There are certain limitations to the \"implicit polymorphism\" approach to the table per concrete-class mapping strategy. There are somewhat less restrictive limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
+msgid "There are limitations to the \"implicit polymorphism\" approach to the table per concrete-class mapping strategy. There are somewhat less restrictive limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 
 #. Tag: para
@@ -474,157 +474,157 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:301
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:302
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:303
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:304
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:305
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:306
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:307
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:308
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:314 inheritance_mapping.xml:325 inheritance_mapping.xml:336
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326 inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:315 inheritance_mapping.xml:326 inheritance_mapping.xml:337
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327 inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328 inheritance_mapping.xml:339
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329 inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:318 inheritance_mapping.xml:329 inheritance_mapping.xml:340
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330 inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:319 inheritance_mapping.xml:330 inheritance_mapping.xml:341 inheritance_mapping.xml:352
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331 inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:320 inheritance_mapping.xml:331 inheritance_mapping.xml:342
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332 inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr ""
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:321 inheritance_mapping.xml:332 inheritance_mapping.xml:343
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333 inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:324
+#: inheritance_mapping.xml:325
 #, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:335
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:338
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</literal> only)"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:346
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:347
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr ""
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:348 inheritance_mapping.xml:349 inheritance_mapping.xml:353 inheritance_mapping.xml:354
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350 inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, no-c-format
 msgid "not supported"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:350
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr ""
 
 #. Tag: literal
-#: inheritance_mapping.xml:351
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -29,7 +29,7 @@
 #. Tag: para
 #: performance.xml:34
 #, no-c-format
-msgid "A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use for retrieving associated objects if the application needs to navigate the association. Fetch strategies may be declared in the O/R mapping metadata, or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+msgid "Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve associated objects if the application needs to navigate the association. Fetch strategies can be declared in the O/R mapping metadata, or over-ridden by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 
 #. Tag: para
@@ -41,25 +41,25 @@
 #. Tag: para
 #: performance.xml:47
 #, no-c-format
-msgid "<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated instance or collection in the same <literal>SELECT</literal>, using an <literal>OUTER JOIN</literal>."
+msgid "<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated instance or collection in the same <literal>SELECT</literal>, using an <literal>OUTER JOIN</literal>."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:54
 #, no-c-format
-msgid "<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is used to retrieve the associated entity or collection. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you actually access the association."
+msgid "<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is used to retrieve the associated entity or collection. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you access the association."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:63
 #, no-c-format
-msgid "<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> is used to retrieve the associated collections for all entities retrieved in a previous query or fetch. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you actually access the association."
+msgid "<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> is used to retrieve the associated collections for all entities retrieved in a previous query or fetch. Unless you explicitly disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this second select will only be executed when you access the association."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:72
 #, no-c-format
-msgid "<emphasis>Batch fetching</emphasis> - an optimization strategy for select fetching - Hibernate retrieves a batch of entity instances or collections in a single <literal>SELECT</literal>, by specifying a list of primary keys or foreign keys."
+msgid "<emphasis>Batch fetching</emphasis>: an optimization strategy for select fetching. Hibernate retrieves a batch of entity instances or collections in a single <literal>SELECT</literal> by specifying a list of primary or foreign keys."
 msgstr ""
 
 #. Tag: para
@@ -71,43 +71,43 @@
 #. Tag: para
 #: performance.xml:87
 #, no-c-format
-msgid "<emphasis>Immediate fetching</emphasis> - an association, collection or attribute is fetched immediately, when the owner is loaded."
+msgid "<emphasis>Immediate fetching</emphasis>: an association, collection or attribute is fetched immediately when the owner is loaded."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:93
 #, no-c-format
-msgid "<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when the application invokes an operation upon that collection. (This is the default for collections.)"
+msgid "<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when the application invokes an operation upon that collection. This is the default for collections."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:100
 #, no-c-format
-msgid "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual elements of the collection are accessed from the database as needed. Hibernate tries not to fetch the whole collection into memory unless absolutely needed (suitable for very large collections)"
+msgid "<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements of the collection are accessed from the database as needed. Hibernate tries not to fetch the whole collection into memory unless absolutely needed. It is suitable for large collections."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:108
 #, no-c-format
-msgid "<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched when a method other than the identifier getter is invoked upon the associated object."
+msgid "<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched when a method other than the identifier getter is invoked upon the associated object."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:115
 #, no-c-format
-msgid "<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is fetched when the instance variable is accessed. Compared to proxy fetching, this approach is less lazy (the association is fetched even when only the identifier is accessed) but more transparent, since no proxy is visible to the application. This approach requires buildtime bytecode instrumentation and is rarely necessary."
+msgid "<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is fetched when the instance variable is accessed. Compared to proxy fetching, this approach is less lazy; the association is fetched even when only the identifier is accessed. It is also more transparent, since no proxy is visible to the application. This approach requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:125
 #, no-c-format
-msgid "<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued association is fetched when the instance variable is accessed. This approach requires buildtime bytecode instrumentation and is rarely necessary."
+msgid "<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued association is fetched when the instance variable is accessed. This approach requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:134
 #, no-c-format
-msgid "We have two orthogonal notions here: <emphasis>when</emphasis> is the association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is used). Don't confuse them! We use <literal>fetch</literal> to tune performance. We may use <literal>lazy</literal> to define a contract for what data is always available in any detached instance of a particular class."
+msgid "We have two orthogonal notions here: <emphasis>when</emphasis> is the association fetched and <emphasis>how</emphasis> is it fetched. It is important that you do not confuse them. We use <literal>fetch</literal> to tune performance. We can use <literal>lazy</literal> to define a contract for what data is always available in any detached instance of a particular class."
 msgstr ""
 
 #. Tag: title
@@ -119,19 +119,19 @@
 #. Tag: para
 #: performance.xml:145
 #, no-c-format
-msgid "By default, Hibernate3 uses lazy select fetching for collections and lazy proxy fetching for single-valued associations. These defaults make sense for almost all associations in almost all applications."
+msgid "By default, Hibernate3 uses lazy select fetching for collections and lazy proxy fetching for single-valued associations. These defaults make sense for most associations in the majority of applications."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:151
 #, no-c-format
-msgid "<emphasis>Note:</emphasis> if you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate will use the batch fetch optimization for lazy fetching (this optimization may also be enabled at a more granular level)."
+msgid "If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate will use the batch fetch optimization for lazy fetching. This optimization can also be enabled at a more granular level."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:158
 #, no-c-format
-msgid "However, lazy fetching poses one problem that you must be aware of. Access to a lazy association outside of the context of an open Hibernate session will result in an exception. For example:"
+msgid "Please be aware that access to a lazy association outside of the context of an open Hibernate session will result in an exception. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -154,19 +154,19 @@
 #. Tag: para
 #: performance.xml:166
 #, no-c-format
-msgid "Since the permissions collection was not initialized when the <literal>Session</literal> was closed, the collection will not be able to load its state. <emphasis>Hibernate does not support lazy initialization for detached objects</emphasis>. The fix is to move the code that reads from the collection to just before the transaction is committed."
+msgid "Since the permissions collection was not initialized when the <literal>Session</literal> was closed, the collection will not be able to load its state. <emphasis>Hibernate does not support lazy initialization for detached objects</emphasis>. This can be fixed by moving the code that reads from the collection to just before the transaction is committed."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:174
 #, no-c-format
-msgid "Alternatively, we could use a non-lazy collection or association, by specifying <literal>lazy=\"false\"</literal> for the association mapping. However, it is intended that lazy initialization be used for almost all collections and associations. If you define too many non-lazy associations in your object model, Hibernate will end up needing to fetch the entire database into memory in every transaction!"
+msgid "Alternatively, you can use a non-lazy collection or association, by specifying <literal>lazy=\"false\"</literal> for the association mapping. However, it is intended that lazy initialization be used for almost all collections and associations. If you define too many non-lazy associations in your object model, Hibernate will fetch the entire database into memory in every transaction."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:183
 #, no-c-format
-msgid "On the other hand, we often want to choose join fetching (which is non-lazy by nature) instead of select fetching in a particular transaction. We'll now see how to customize the fetching strategy. In Hibernate3, the mechanisms for choosing a fetch strategy are identical for single-valued associations and collections."
+msgid "On the other hand, you can use join fetching, which is non-lazy by nature, instead of select fetching in a particular transaction. We will now explain how to customize the fetching strategy. In Hibernate3, the mechanisms for choosing a fetch strategy are identical for single-valued associations and collections."
 msgstr ""
 
 #. Tag: title
@@ -231,19 +231,19 @@
 #. Tag: para
 #: performance.xml:232
 #, no-c-format
-msgid "No matter what fetching strategy you use, the defined non-lazy graph is guaranteed to be loaded into memory. Note that this might result in several immediate selects being used to execute a particular HQL query."
+msgid "Irrespective of the fetching strategy you use, the defined non-lazy graph is guaranteed to be loaded into memory. This might, however, result in several immediate selects being used to execute a particular HQL query."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:238
 #, no-c-format
-msgid "Usually, we don't use the mapping document to customize fetching. Instead, we keep the default behavior, and override it for a particular transaction, using <literal>left join fetch</literal> in HQL. This tells Hibernate to fetch the association eagerly in the first select, using an outer join. In the <literal>Criteria</literal> query API, you would use <literal>setFetchMode(FetchMode.JOIN)</literal>."
+msgid "Usually, the mapping document is not used to customize fetching. Instead, we keep the default behavior, and override it for a particular transaction, using <literal>left join fetch</literal> in HQL. This tells Hibernate to fetch the association eagerly in the first select, using an outer join. In the <literal>Criteria</literal> query API, you would use <literal>setFetchMode(FetchMode.JOIN)</literal>."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:247
 #, no-c-format
-msgid "If you ever feel like you wish you could change the fetching strategy used by <literal>get()</literal> or <literal>load()</literal>, simply use a <literal>Criteria</literal> query, for example:"
+msgid "If you want to change the fetching strategy used by <literal>get()</literal> or <literal>load()</literal>, you can use a <literal>Criteria</literal> query. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -259,13 +259,13 @@
 #. Tag: para
 #: performance.xml:255
 #, no-c-format
-msgid "(This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan\".)"
+msgid "This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan\"."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:259
 #, no-c-format
-msgid "A completely different way to avoid problems with N+1 selects is to use the second-level cache."
+msgid "A completely different approach to problems with N+1 selects is to use the second-level cache."
 msgstr ""
 
 #. Tag: title
@@ -277,29 +277,29 @@
 #. Tag: para
 #: performance.xml:269
 #, no-c-format
-msgid "Lazy fetching for collections is implemented using Hibernate's own implementation of persistent collections. However, a different mechanism is needed for lazy behavior in single-ended associations. The target entity of the association must be proxied. Hibernate implements lazy initializing proxies for persistent objects using runtime bytecode enhancement (via the excellent CGLIB library)."
+msgid "Lazy fetching for collections is implemented using Hibernate's own implementation of persistent collections. However, a different mechanism is needed for lazy behavior in single-ended associations. The target entity of the association must be proxied. Hibernate implements lazy initializing proxies for persistent objects using runtime bytecode enhancement which is accessed via the CGLIB library."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:277
 #, no-c-format
-msgid "By default, Hibernate3 generates proxies (at startup) for all persistent classes and uses them to enable lazy fetching of <literal>many-to-one</literal> and <literal>one-to-one</literal> associations."
+msgid "At startup, Hibernate3 generates proxies by default for all persistent classes and uses them to enable lazy fetching of <literal>many-to-one</literal> and <literal>one-to-one</literal> associations."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:283
 #, no-c-format
-msgid "The mapping file may declare an interface to use as the proxy interface for that class, with the <literal>proxy</literal> attribute. By default, Hibernate uses a subclass of the class. <emphasis>Note that the proxied class must implement a default constructor with at least package visibility. We recommend this constructor for all persistent classes!</emphasis>"
+msgid "The mapping file may declare an interface to use as the proxy interface for that class, with the <literal>proxy</literal> attribute. By default, Hibernate uses a subclass of the class. <emphasis>The proxied class must implement a default constructor with at least package visibility. This constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:290
 #, no-c-format
-msgid "There are some gotchas to be aware of when extending this approach to polymorphic classes, eg."
+msgid "There are potential problems to note when extending this approach to polymorphic classes.For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:295
+#: performance.xml:294
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -311,13 +311,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:297
+#: performance.xml:296
 #, no-c-format
 msgid "Firstly, instances of <literal>Cat</literal> will never be castable to <literal>DomesticCat</literal>, even if the underlying instance is an instance of <literal>DomesticCat</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:303
+#: performance.xml:302
 #, no-c-format
 msgid ""
       "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a proxy (does not hit the db)\n"
@@ -328,13 +328,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:305
+#: performance.xml:304
 #, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:309
+#: performance.xml:308
 #, no-c-format
 msgid ""
       "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // instantiate a Cat proxy\n"
@@ -344,13 +344,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:311
+#: performance.xml:310
 #, no-c-format
 msgid "However, the situation is not quite as bad as it looks. Even though we now have two references to different proxy objects, the underlying instance will still be the same object:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:316
+#: performance.xml:315
 #, no-c-format
 msgid ""
       "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -358,25 +358,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:318
+#: performance.xml:317
 #, no-c-format
-msgid "Third, you may not use a CGLIB proxy for a <literal>final</literal> class or a class with any <literal>final</literal> methods."
+msgid "Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or a class with any <literal>final</literal> methods."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:322
 #, no-c-format
-msgid "Finally, if your persistent object acquires any resources upon instantiation (eg. in initializers or default constructor), then those resources will also be acquired by the proxy. The proxy class is an actual subclass of the persistent class."
+msgid "Finally, if your persistent object acquires any resources upon instantiation (e.g. in initializers or default constructor), then those resources will also be acquired by the proxy. The proxy class is an actual subclass of the persistent class."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:329
+#: performance.xml:328
 #, no-c-format
-msgid "These problems are all due to fundamental limitations in Java's single inheritance model. If you wish to avoid these problems your persistent classes must each implement an interface that declares its business methods. You should specify these interfaces in the mapping file. eg."
+msgid "These problems are all due to fundamental limitations in Java's single inheritance model. To avoid these problems your persistent classes must each implement an interface that declares its business methods. You should specify these interfaces in the mapping file where <literal>CatImpl</literal> implements the interface <literal>Cat</literal> and <literal>DomesticCatImpl</literal> implements the interface <literal>DomesticCat</literal>. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:335
+#: performance.xml:336
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -388,13 +388,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:337
+#: performance.xml:338
 #, no-c-format
-msgid "where <literal>CatImpl</literal> implements the interface <literal>Cat</literal> and <literal>DomesticCatImpl</literal> implements the interface <literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</literal> and <literal>DomesticCat</literal> may be returned by <literal>load()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</literal> does not usually return proxies.)"
+msgid "Then proxies for instances of <literal>Cat</literal> and <literal>DomesticCat</literal> can be returned by <literal>load()</literal> or <literal>iterate()</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:345
+#: performance.xml:343
 #, no-c-format
 msgid ""
       "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -402,164 +402,176 @@
       "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
 #: performance.xml:347
 #, no-c-format
-msgid "Relationships are also lazily initialized. This means you must declare any properties to be of type <literal>Cat</literal>, not <literal>CatImpl</literal>."
+msgid "<literal>list()</literal> does not usually return proxies."
 msgstr ""
 
 #. Tag: para
 #: performance.xml:352
 #, no-c-format
-msgid "Certain operations do <emphasis>not</emphasis> require proxy initialization"
+msgid "Relationships are also lazily initialized. This means you must declare any properties to be of type <literal>Cat</literal>, not <literal>CatImpl</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:358
+#: performance.xml:357
 #, no-c-format
-msgid "<literal>equals()</literal>, if the persistent class does not override <literal>equals()</literal>"
+msgid "Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:364
+#: performance.xml:363
 #, no-c-format
-msgid "<literal>hashCode()</literal>, if the persistent class does not override <literal>hashCode()</literal>"
+msgid "<literal>equals()</literal>: if the persistent class does not override <literal>equals()</literal>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:370
+#: performance.xml:369
 #, no-c-format
+msgid "<literal>hashCode()</literal>: if the persistent class does not override <literal>hashCode()</literal>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:375
+#, no-c-format
 msgid "The identifier getter method"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:376
+#: performance.xml:381
 #, no-c-format
 msgid "Hibernate will detect persistent classes that override <literal>equals()</literal> or <literal>hashCode()</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:381
+#: performance.xml:386
 #, no-c-format
-msgid "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default <literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with typecasting. However, we will require buildtime bytecode instrumentation, and all operations will result in immediate proxy initialization."
+msgid "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default <literal>lazy=\"proxy\"</literal>, you can avoid problems associated with typecasting. However, buildtime bytecode instrumentation is required, and all operations will result in immediate proxy initialization."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:391
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:393
+#: performance.xml:398
 #, no-c-format
-msgid "A <literal>LazyInitializationException</literal> will be thrown by Hibernate if an uninitialized collection or proxy is accessed outside of the scope of the <literal>Session</literal>, ie. when the entity owning the collection or having the reference to the proxy is in the detached state."
+msgid "A <literal>LazyInitializationException</literal> will be thrown by Hibernate if an uninitialized collection or proxy is accessed outside of the scope of the <literal>Session</literal>, i.e., when the entity owning the collection or having the reference to the proxy is in the detached state."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:399
+#: performance.xml:404
 #, no-c-format
-msgid "Sometimes we need to ensure that a proxy or collection is initialized before closing the <literal>Session</literal>. Of course, we can alway force initialization by calling <literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</literal>, for example. But that is confusing to readers of the code and is not convenient for generic code."
+msgid "Sometimes a proxy or collection needs to be initialized before closing the <literal>Session</literal>. You can force initialization by calling <literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</literal>, for example. However, this can be confusing to readers of the code and it is not convenient for generic code."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:406
+#: performance.xml:411
 #, no-c-format
-msgid "The static methods <literal>Hibernate.initialize()</literal> and <literal>Hibernate.isInitialized()</literal> provide the application with a convenient way of working with lazily initialized collections or proxies. <literal>Hibernate.initialize(cat)</literal> will force the initialization of a proxy, <literal>cat</literal>, as long as its <literal>Session</literal> is still open. <literal>Hibernate.initialize( cat.getKittens() )</literal> has a similar effect for the collection of kittens."
+msgid "The static methods <literal>Hibernate.initialize()</literal> and <literal>Hibernate.isInitialized()</literal>, provide the application with a convenient way of working with lazily initialized collections or proxies. <literal>Hibernate.initialize(cat)</literal> will force the initialization of a proxy, <literal>cat</literal>, as long as its <literal>Session</literal> is still open. <literal>Hibernate.initialize( cat.getKittens() )</literal> has a similar effect for the collection of kittens."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:415
+#: performance.xml:420
 #, no-c-format
-msgid "Another option is to keep the <literal>Session</literal> open until all needed collections and proxies have been loaded. In some application architectures, particularly where the code that accesses data using Hibernate, and the code that uses it are in different application layers or different physical processes, it can be a problem to ensure that the <literal>Session</literal> is open when a collection is initialized. There are two basic ways to deal with this issue:"
+msgid "Another option is to keep the <literal>Session</literal> open until all required collections and proxies have been loaded. In some application architectures, particularly where the code that accesses data using Hibernate, and the code that uses it are in different application layers or different physical processes, it can be a problem to ensure that the <literal>Session</literal> is open when a collection is initialized. There are two basic ways to deal with this issue:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:426
+#: performance.xml:431
 #, no-c-format
-msgid "In a web-based application, a servlet filter can be used to close the <literal>Session</literal> only at the very end of a user request, once the rendering of the view is complete (the <emphasis>Open Session in View</emphasis> pattern). Of course, this places heavy demands on the correctness of the exception handling of your application infrastructure. It is vitally important that the <literal>Session</literal> is closed and the transaction ended before returning to the user, even when an exception occurs during rendering of the view. See the Hibernate Wiki for examples of this \"Open Session in View\" pattern."
+msgid "In a web-based application, a servlet filter can be used to close the <literal>Session</literal> only at the end of a user request, once the rendering of the view is complete (the <emphasis>Open Session in View</emphasis> pattern). Of course, this places heavy demands on the correctness of the exception handling of your application infrastructure. It is vitally important that the <literal>Session</literal> is closed and the transaction ended before returning to the user, even when an exception occurs during rendering of the view. See the Hibernate Wiki for examples of this \"Open Session in View\" pattern."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:439
+#: performance.xml:444
 #, no-c-format
-msgid "In an application with a separate business tier, the business logic must \"prepare\" all collections that will be needed by the web tier before returning. This means that the business tier should load all the data and return all the data already initialized to the presentation/web tier that is required for a particular use case. Usually, the application calls <literal>Hibernate.initialize()</literal> for each collection that will be needed in the web tier (this call must occur before the session is closed) or retrieves the collection eagerly using a Hibernate query with a <literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</literal>. This is usually easier if you adopt the <emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
+msgid "In an application with a separate business tier, the business logic must \"prepare\" all collections that the web tier needs before returning. This means that the business tier should load all the data and return all the data already initialized to the presentation/web tier that is required for a particular use case. Usually, the application calls <literal>Hibernate.initialize()</literal> for each collection that will be needed in the web tier (this call must occur before the session is closed) or retrieves the collection eagerly using a Hibernate query with a <literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</literal>. This is usually easier if you adopt the <emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:454
+#: performance.xml:459
 #, no-c-format
-msgid "You may also attach a previously loaded object to a new <literal>Session</literal> with <literal>merge()</literal> or <literal>lock()</literal> before accessing uninitialized collections (or other proxies). No, Hibernate does not, and certainly <emphasis>should</emphasis> not do this automatically, since it would introduce ad hoc transaction semantics!"
+msgid "You can also attach a previously loaded object to a new <literal>Session</literal> with <literal>merge()</literal> or <literal>lock()</literal> before accessing uninitialized collections or other proxies. Hibernate does not, and certainly <emphasis>should</emphasis> not, do this automatically since it would introduce impromptu transaction semantics."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:464
+#: performance.xml:469
 #, no-c-format
-msgid "Sometimes you don't want to initialize a large collection, but still need some information about it (like its size) or a subset of the data."
+msgid "Sometimes you do not want to initialize a large collection, but still need some information about it, like its size, for example, or a subset of the data."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:469
+#: performance.xml:474
 #, no-c-format
 msgid "You can use a collection filter to get the size of a collection without initializing it:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:473
+#: performance.xml:478
 #, no-c-format
 msgid "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list().get(0) ).intValue()]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:475
+#: performance.xml:480
 #, no-c-format
 msgid "The <literal>createFilter()</literal> method is also used to efficiently retrieve subsets of a collection without needing to initialize the whole collection:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:480
+#: performance.xml:485
 #, no-c-format
 msgid "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0).setMaxResults(10).list();]]>"
 msgstr ""
 
 #. Tag: title
-#: performance.xml:485
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:487
+#: performance.xml:492
 #, no-c-format
-msgid "Hibernate can make efficient use of batch fetching, that is, Hibernate can load several uninitialized proxies if one proxy is accessed (or collections. Batch fetching is an optimization of the lazy select fetching strategy. There are two ways you can tune batch fetching: on the class and the collection level."
+msgid "Using batch fetching, Hibernate can load several uninitialized proxies if one proxy is accessed. Batch fetching is an optimization of the lazy select fetching strategy. There are two ways you can configure batch fetching: on the class level and the collection level."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:493
+#: performance.xml:498
 #, no-c-format
-msgid "Batch fetching for classes/entities is easier to understand. Imagine you have the following situation at runtime: You have 25 <literal>Cat</literal> instances loaded in a <literal>Session</literal>, each <literal>Cat</literal> has a reference to its <literal>owner</literal>, a <literal>Person</literal>. The <literal>Person</literal> class is mapped with a proxy, <literal>lazy=\"true\"</literal>. If you now iterate through all cats and call <literal>getOwner()</literal> on each, Hibernate will by default execute 25 <literal>SELECT</literal> statements, to retrieve the proxied owners. You can tune this behavior by specifying a <literal>batch-size</literal> in the mapping of <literal>Person</literal>:"
+msgid "Batch fetching for classes/entities is easier to understand. Consider the following example: at runtime you have 25 <literal>Cat</literal> instances loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has a reference to its <literal>owner</literal>, a <literal>Person</literal>. The <literal>Person</literal> class is mapped with a proxy, <literal>lazy=\"true\"</literal>. If you now iterate through all cats and call <literal>getOwner()</literal> on each, Hibernate will, by default, execute 25 <literal>SELECT</literal> statements to retrieve the proxied owners. You can tune this behavior by specifying a <literal>batch-size</literal> in the mapping of <literal>Person</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:503
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:505
+#: performance.xml:510
 #, no-c-format
-msgid "Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+msgid "Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:509
+#: performance.xml:514
 #, no-c-format
-msgid "You may also enable batch fetching of collections. For example, if each <literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, and 10 persons are currently loaded in the <literal>Session</literal>, iterating through all persons will generate 10 <literal>SELECT</literal>s, one for every call to <literal>getCats()</literal>. If you enable batch fetching for the <literal>cats</literal> collection in the mapping of <literal>Person</literal>, Hibernate can pre-fetch collections:"
+msgid "You can also enable batch fetching of collections. For example, if each <literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, and 10 persons are currently loaded in the <literal>Session</literal>, iterating through all persons will generate 10 <literal>SELECT</literal>s, one for every call to <literal>getCats()</literal>. If you enable batch fetching for the <literal>cats</literal> collection in the mapping of <literal>Person</literal>, Hibernate can pre-fetch collections:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:518
+#: performance.xml:523
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -570,49 +582,49 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:520
+#: performance.xml:525
 #, no-c-format
 msgid "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 collections in four <literal>SELECT</literal>s. Again, the value of the attribute depends on the expected number of uninitialized collections in a particular <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:526
+#: performance.xml:531
 #, no-c-format
-msgid "Batch fetching of collections is particularly useful if you have a nested tree of items, ie. the typical bill-of-materials pattern. (Although a <emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> might be a better option for read-mostly trees.)"
+msgid "Batch fetching of collections is particularly useful if you have a nested tree of items, i.e. the typical bill-of-materials pattern. However, a <emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> might be a better option for read-mostly trees."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:535
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:537
+#: performance.xml:542
 #, no-c-format
-msgid "If one lazy collection or single-valued proxy has to be fetched, Hibernate loads all of them, re-running the original query in a subselect. This works in the same way as batch-fetching, without the piecemeal loading."
+msgid "If one lazy collection or single-valued proxy has to be fetched, Hibernate will load all of them, re-running the original query in a subselect. This works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:548
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:550
+#: performance.xml:555
 #, no-c-format
-msgid "Hibernate3 supports the lazy fetching of individual properties. This optimization technique is also known as <emphasis>fetch groups</emphasis>. Please note that this is mostly a marketing feature, as in practice, optimizing row reads is much more important than optimization of column reads. However, only loading some properties of a class might be useful in extreme cases, when legacy tables have hundreds of columns and the data model can not be improved."
+msgid "Hibernate3 supports the lazy fetching of individual properties. This optimization technique is also known as <emphasis>fetch groups</emphasis>. Please note that this is mostly a marketing feature; optimizing row reads is much more important than optimization of column reads. However, only loading some properties of a class could be useful in extreme cases. For example, when legacy tables have hundreds of columns and the data model cannot be improved."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:559
+#: performance.xml:564
 #, no-c-format
 msgid "To enable lazy property loading, set the <literal>lazy</literal> attribute on your particular property mappings:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:564
+#: performance.xml:569
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Document\">\n"
@@ -626,19 +638,19 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:566
+#: performance.xml:571
 #, no-c-format
-msgid "Lazy property loading requires buildtime bytecode instrumentation! If your persistent classes are not enhanced, Hibernate will silently ignore lazy property settings and fall back to immediate fetching."
+msgid "Lazy property loading requires buildtime bytecode instrumentation. If your persistent classes are not enhanced, Hibernate will ignore lazy property settings and return to immediate fetching."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:572
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:576
+#: performance.xml:581
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -657,211 +669,211 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:578
+#: performance.xml:583
 #, no-c-format
-msgid "A different (better?) way to avoid unnecessary column reads, at least for read-only transactions is to use the projection features of HQL or Criteria queries. This avoids the need for buildtime bytecode processing and is certainly a preferred solution."
+msgid "A different way of avoiding unnecessary column reads, at least for read-only transactions, is to use the projection features of HQL or Criteria queries. This avoids the need for buildtime bytecode processing and is certainly a preferred solution."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:585
+#: performance.xml:590
 #, no-c-format
-msgid "You may force the usual eager fetching of properties using <literal>fetch all properties</literal> in HQL."
+msgid "You can force the usual eager fetching of properties using <literal>fetch all properties</literal> in HQL."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:595
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:597
+#: performance.xml:602
 #, no-c-format
-msgid "A Hibernate <literal>Session</literal> is a transaction-level cache of persistent data. It is possible to configure a cluster or JVM-level (<literal>SessionFactory</literal>-level) cache on a class-by-class and collection-by-collection basis. You may even plug in a clustered cache. Be careful. Caches are never aware of changes made to the persistent store by another application (though they may be configured to regularly expire cached data)."
+msgid "A Hibernate <literal>Session</literal> is a transaction-level cache of persistent data. It is possible to configure a cluster or JVM-level (<literal>SessionFactory</literal>-level) cache on a class-by-class and collection-by-collection basis. You can even plug in a clustered cache. Be aware that caches are not aware of changes made to the persistent store by another application. They can, however, be configured to regularly expire cached data."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:605
+#: performance.xml:610
 #, no-c-format
-msgid "You have the option to tell Hibernate which caching implementation to use by specifying the name of a class that implements <literal>org.hibernate.cache.CacheProvider</literal> using the property <literal>hibernate.cache.provider_class</literal>. Hibernate comes bundled with a number of built-in integrations with open-source cache providers (listed below); additionally, you could implement your own and plug it in as outlined above. Note that versions prior to 3.2 defaulted to use EhCache as the default cache provider; that is no longer the case as of 3.2."
+msgid "You have the option to tell Hibernate which caching implementation to use by specifying the name of a class that implements <literal>org.hibernate.cache.CacheProvider</literal> using the property <literal>hibernate.cache.provider_class</literal>. Hibernate is bundled with a number of built-in integrations with the open-source cache providers that are listed below. You can also implement your own and plug it in as outlined above. Note that versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:616
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:625 performance.xml:813
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:626
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:627
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:628
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:629
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:634 performance.xml:822
+#: performance.xml:639 performance.xml:827
 #, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:635
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:636
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:645 performance.xml:652 performance.xml:823 performance.xml:824 performance.xml:825 performance.xml:830 performance.xml:831 performance.xml:832 performance.xml:837 performance.xml:838 performance.xml:839 performance.xml:844 performance.xml:845 performance.xml:851 performance.xml:854 performance.xml:858 performance.xml:861
+#: performance.xml:643 performance.xml:650 performance.xml:657 performance.xml:828 performance.xml:829 performance.xml:830 performance.xml:835 performance.xml:836 performance.xml:837 performance.xml:842 performance.xml:843 performance.xml:844 performance.xml:849 performance.xml:850 performance.xml:856 performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:641 performance.xml:829
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:642
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:643 performance.xml:650
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:648 performance.xml:836
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:649
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:655 performance.xml:843
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:656
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:657
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:658
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:662 performance.xml:850
+#: performance.xml:667 performance.xml:855
 #, no-c-format
 msgid "JBoss Cache 1.x"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:663
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:664 performance.xml:671
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:665
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:666 performance.xml:673
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:669 performance.xml:857
+#: performance.xml:674 performance.xml:862
 #, no-c-format
 msgid "JBoss Cache 2"
 msgstr ""
 
 #. Tag: literal
-#: performance.xml:670
+#: performance.xml:675
 #, no-c-format
-msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:672
+#: performance.xml:677
 #, no-c-format
 msgid "yes (replication or invalidation)"
 msgstr ""
 
 #. Tag: title
-#: performance.xml:680
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:682
+#: performance.xml:687
 #, no-c-format
 msgid "The <literal>&lt;cache&gt;</literal> element of a class or collection mapping has the following form:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:693
+#: performance.xml:698
 #, no-c-format
 msgid ""
       "<![CDATA[<cache \n"
@@ -872,49 +884,49 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:701
 #, no-c-format
 msgid "<literal>usage</literal> (required) specifies the caching strategy: <literal>transactional</literal>, <literal>read-write</literal>, <literal>nonstrict-read-write</literal> or <literal>read-only</literal>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:705
+#: performance.xml:710
 #, no-c-format
-msgid "<literal>region</literal> (optional, defaults to the class or collection role name) specifies the name of the second level cache region"
+msgid "<literal>region</literal> (optional: defaults to the class or collection role name): specifies the name of the second level cache region"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:712
+#: performance.xml:717
 #, no-c-format
-msgid "<literal>include</literal> (optional, defaults to <literal>all</literal>) <literal>non-lazy</literal> specifies that properties of the entity mapped with <literal>lazy=\"true\"</literal> may not be cached when attribute-level lazy fetching is enabled"
+msgid "<literal>include</literal> (optional: defaults to <literal>all</literal>) <literal>non-lazy</literal>: specifies that properties of the entity mapped with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level lazy fetching is enabled"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:722
+#: performance.xml:727
 #, no-c-format
-msgid "Alternatively (preferably?), you may specify <literal>&lt;class-cache&gt;</literal> and <literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate.cfg.xml</literal>."
+msgid "Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and <literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:727
+#: performance.xml:732
 #, no-c-format
 msgid "The <literal>usage</literal> attribute specifies a <emphasis>cache concurrency strategy</emphasis>."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:734
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:736
+#: performance.xml:741
 #, no-c-format
-msgid "If your application needs to read but never modify instances of a persistent class, a <literal>read-only</literal> cache may be used. This is the simplest and best performing strategy. It's even perfectly safe for use in a cluster."
+msgid "If your application needs to read, but not modify, instances of a persistent class, a <literal>read-only</literal> cache can be used. This is the simplest and optimal performing strategy. It is even safe for use in a cluster."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:742
+#: performance.xml:747
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -924,19 +936,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:748
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:750
+#: performance.xml:755
 #, no-c-format
-msgid "If the application needs to update data, a <literal>read-write</literal> cache might be appropriate. This cache strategy should never be used if serializable transaction isolation level is required. If the cache is used in a JTA environment, you must specify the property <literal>hibernate.transaction.manager_lookup_class</literal>, naming a strategy for obtaining the JTA <literal>TransactionManager</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called. If you wish to use this strategy in a cluster, you should ensure that the underlying cache implementation supports locking. The built-in cache providers do <emphasis>not</emphasis>."
+msgid "If the application needs to update data, a <literal>read-write</literal> cache might be appropriate. This cache strategy should never be used if serializable transaction isolation level is required. If the cache is used in a JTA environment, you must specify the property <literal>hibernate.transaction.manager_lookup_class</literal> and naming a strategy for obtaining the JTA <literal>TransactionManager</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called. If you want to use this strategy in a cluster, you should ensure that the underlying cache implementation supports locking. The built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:761
+#: performance.xml:766
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -950,97 +962,97 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:766
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:768
+#: performance.xml:773
 #, no-c-format
-msgid "If the application only occasionally needs to update data (ie. if it is extremely unlikely that two transactions would try to update the same item simultaneously) and strict transaction isolation is not required, a <literal>nonstrict-read-write</literal> cache might be appropriate. If the cache is used in a JTA environment, you must specify <literal>hibernate.transaction.manager_lookup_class</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called."
+msgid "If the application only occasionally needs to update data (i.e. if it is extremely unlikely that two transactions would try to update the same item simultaneously), and strict transaction isolation is not required, a <literal>nonstrict-read-write</literal> cache might be appropriate. If the cache is used in a JTA environment, you must specify <literal>hibernate.transaction.manager_lookup_class</literal>. In other environments, you should ensure that the transaction is completed when <literal>Session.close()</literal> or <literal>Session.disconnect()</literal> is called."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:780
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:782
+#: performance.xml:787
 #, no-c-format
-msgid "The <literal>transactional</literal> cache strategy provides support for fully transactional cache providers such as JBoss TreeCache. Such a cache may only be used in a JTA environment and you must specify <literal>hibernate.transaction.manager_lookup_class</literal>."
+msgid "The <literal>transactional</literal> cache strategy provides support for fully transactional cache providers such as JBoss TreeCache. Such a cache can only be used in a JTA environment and you must specify <literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:791
+#: performance.xml:796
 #, no-c-format
 msgid "Cache-provider/concurrency-strategy compatibility"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:794
+#: performance.xml:799
 #, no-c-format
 msgid "None of the cache providers support all of the cache concurrency strategies."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:799
+#: performance.xml:804
 #, no-c-format
 msgid "The following table shows which providers are compatible with which concurrency strategies."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:804
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:814
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:815
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:816
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:817
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr ""
 
 #. Tag: title
-#: performance.xml:872
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:874
+#: performance.xml:879
 #, no-c-format
-msgid "Whenever you pass an object to <literal>save()</literal>, <literal>update()</literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an object using <literal>load()</literal>, <literal>get()</literal>, <literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()</literal>, that object is added to the internal cache of the <literal>Session</literal>."
+msgid "Whenever you pass an object to <literal>save()</literal>, <literal>update()</literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an object using <literal>load()</literal>, <literal>get()</literal>, <literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()</literal>, that object is added to the internal cache of the <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:881
+#: performance.xml:886
 #, no-c-format
-msgid "When <literal>flush()</literal> is subsequently called, the state of that object will be synchronized with the database. If you do not want this synchronization to occur or if you are processing a huge number of objects and need to manage memory efficiently, the <literal>evict()</literal> method may be used to remove the object and its collections from the first-level cache."
+msgid "When <literal>flush()</literal> is subsequently called, the state of that object will be synchronized with the database. If you do not want this synchronization to occur, or if you are processing a huge number of objects and need to manage memory efficiently, the <literal>evict()</literal> method can be used to remove the object and its collections from the first-level cache."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:889
+#: performance.xml:894
 #, no-c-format
 msgid ""
       "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll(); //a huge result set\n"
@@ -1052,25 +1064,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:891
+#: performance.xml:896
 #, no-c-format
 msgid "The <literal>Session</literal> also provides a <literal>contains()</literal> method to determine if an instance belongs to the session cache."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:896
+#: performance.xml:901
 #, no-c-format
-msgid "To completely evict all objects from the session cache, call <literal>Session.clear()</literal>"
+msgid "To evict all objects from the session cache, call <literal>Session.clear()</literal>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:900
+#: performance.xml:905
 #, no-c-format
 msgid "For the second-level cache, there are methods defined on <literal>SessionFactory</literal> for evicting the cached state of an instance, entire class, collection instance or entire collection role."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:906
+#: performance.xml:911
 #, no-c-format
 msgid ""
       "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1080,43 +1092,43 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:908
+#: performance.xml:913
 #, no-c-format
-msgid "The <literal>CacheMode</literal> controls how a particular session interacts with the second-level cache."
+msgid "The <literal>CacheMode</literal> controls how a particular session interacts with the second-level cache:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:915
+#: performance.xml:920
 #, no-c-format
-msgid "<literal>CacheMode.NORMAL</literal> - read items from and write items to the second-level cache"
+msgid "<literal>CacheMode.NORMAL</literal>: will read items from and write items to the second-level cache"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:920
+#: performance.xml:925
 #, no-c-format
-msgid "<literal>CacheMode.GET</literal> - read items from the second-level cache, but don't write to the second-level cache except when updating data"
+msgid "<literal>CacheMode.GET</literal>: will read items from the second-level cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:926
+#: performance.xml:931
 #, no-c-format
-msgid "<literal>CacheMode.PUT</literal> - write items to the second-level cache, but don't read from the second-level cache"
+msgid "<literal>CacheMode.PUT</literal>: will write items to the second-level cache. Do not read from the second-level cache"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:932
+#: performance.xml:937
 #, no-c-format
-msgid "<literal>CacheMode.REFRESH</literal> - write items to the second-level cache, but don't read from the second-level cache, bypass the effect of <literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of the second-level cache for all items read from the database"
+msgid "<literal>CacheMode.REFRESH</literal>: will write items to the second-level cache. Do not read from the second-level cache. Bypass the effect of <literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the second-level cache for all items read from the database"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:940
+#: performance.xml:945
 #, no-c-format
 msgid "To browse the contents of a second-level or query cache region, use the <literal>Statistics</literal> API:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:945
+#: performance.xml:950
 #, no-c-format
 msgid ""
       "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1125,13 +1137,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:947
+#: performance.xml:952
 #, no-c-format
-msgid "You'll need to enable statistics, and, optionally, force Hibernate to keep the cache entries in a more human-understandable format:"
+msgid "You will need to enable statistics and, optionally, force Hibernate to keep the cache entries in a more readable format:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:952
+#: performance.xml:957
 #, no-c-format
 msgid ""
       "<![CDATA[hibernate.generate_statistics true\n"
@@ -1139,43 +1151,43 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:957
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:959
+#: performance.xml:964
 #, no-c-format
-msgid "Query result sets may also be cached. This is only useful for queries that are run frequently with the same parameters. To use the query cache you must first enable it:"
+msgid "Query result sets can also be cached. This is only useful for queries that are run frequently with the same parameters. You will first need to enable the query cache:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:964
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:971
 #, no-c-format
-msgid "This setting causes the creation of two new cache regions - one holding cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other holding timestamps of the most recent updates to queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that the query cache does not cache the state of the actual entities in the result set; it caches only identifier values and results of value type. So the query cache should always be used in conjunction with the second-level cache."
+msgid "This setting creates two new cache regions: one holding cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other holding timestamps of the most recent updates to queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that the query cache does not cache the state of the actual entities in the result set; it caches only identifier values and results of value type. The query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:976
+#: performance.xml:981
 #, no-c-format
-msgid "Most queries do not benefit from caching, so by default queries are not cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. This call allows the query to look for existing cache results or add its results to the cache when it is executed."
+msgid "Most queries do not benefit from caching, so by default, queries are not cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. This call allows the query to look for existing cache results or add its results to the cache when it is executed."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:983
+#: performance.xml:988
 #, no-c-format
-msgid "If you require fine-grained control over query cache expiration policies, you may specify a named cache region for a particular query by calling <literal>Query.setCacheRegion()</literal>."
+msgid "If you require fine-grained control over query cache expiration policies, you can specify a named cache region for a particular query by calling <literal>Query.setCacheRegion()</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:989
+#: performance.xml:994
 #, no-c-format
 msgid ""
       "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger = :blogger\")\n"
@@ -1187,151 +1199,151 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:996
 #, no-c-format
 msgid "If the query should force a refresh of its query cache region, you should call <literal>Query.setCacheMode(CacheMode.REFRESH)</literal>. This is particularly useful in cases where underlying data may have been updated via a separate process (i.e., not modified through Hibernate) and allows the application to selectively refresh particular query result sets. This is a more efficient alternative to eviction of a query cache region via <literal>SessionFactory.evictQueries()</literal>."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1003
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1005
+#: performance.xml:1010
 #, no-c-format
-msgid "We've already spent quite some time talking about collections. In this section we will highlight a couple more issues about how collections behave at runtime."
+msgid "In the previous sections we have covered collections and their applications. In this section we explore some more issues in relation to collections at runtime."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1012
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1014
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1018
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1021
+#: performance.xml:1026
 #, no-c-format
-msgid "one to many associations"
+msgid "one-to-many associations"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1024
+#: performance.xml:1029
 #, no-c-format
-msgid "many to many associations"
+msgid "many-to-many associations"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1028
+#: performance.xml:1033
 #, no-c-format
 msgid "This classification distinguishes the various table and foreign key relationships but does not tell us quite everything we need to know about the relational model. To fully understand the relational structure and performance characteristics, we must also consider the structure of the primary key that is used by Hibernate to update or delete collection rows. This suggests the following classification:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1039
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1042
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1045
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1049
+#: performance.xml:1054
 #, no-c-format
-msgid "All indexed collections (maps, lists, arrays) have a primary key consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> columns. In this case collection updates are usually extremely efficient - the primary key may be efficiently indexed and a particular row may be efficiently located when Hibernate tries to update or delete it."
+msgid "All indexed collections (maps, lists, and arrays) have a primary key consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> columns. In this case, collection updates are extremely efficient. The primary key can be efficiently indexed and a particular row can be efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1057
+#: performance.xml:1062
 #, no-c-format
-msgid "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and element columns. This may be less efficient for some types of collection element, particularly composite elements or large text or binary fields; the database may not be able to index a complex primary key as efficiently. On the other hand, for one to many or many to many associations, particularly in the case of synthetic identifiers, it is likely to be just as efficient. (Side-note: if you want <literal>SchemaExport</literal> to actually create the primary key of a <literal>&lt;set&gt;</literal> for you, you must declare all columns as <literal>not-null=\"true\"</literal>.)"
+msgid "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and element columns. This can be less efficient for some types of collection element, particularly composite elements or large text or binary fields, as the database may not be able to index a complex primary key as efficiently. However, for one-to-many or many-to-many associations, particularly in the case of synthetic identifiers, it is likely to be just as efficient. If you want <literal>SchemaExport</literal> to actually create the primary key of a <literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-null=\"true\"</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1068
+#: performance.xml:1073
 #, no-c-format
-msgid "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they are always very efficient to update. In fact, they are the best case."
+msgid "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they are efficient to update. In fact, they are the best case."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1073
+#: performance.xml:1078
 #, no-c-format
-msgid "Bags are the worst case. Since a bag permits duplicate element values and has no index column, no primary key may be defined. Hibernate has no way of distinguishing between duplicate rows. Hibernate resolves this problem by completely removing (in a single <literal>DELETE</literal>) and recreating the collection whenever it changes. This might be very inefficient."
+msgid "Bags are the worst case since they permit duplicate element values and, as they have no index column, no primary key can be defined. Hibernate has no way of distinguishing between duplicate rows. Hibernate resolves this problem by completely removing in a single <literal>DELETE</literal> and recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1081
+#: performance.xml:1086
 #, no-c-format
-msgid "Note that for a one-to-many association, the \"primary key\" may not be the physical primary key of the database table - but even in this case, the above classification is still useful. (It still reflects how Hibernate \"locates\" individual rows of the collection.)"
+msgid "For a one-to-many association, the \"primary key\" may not be the physical primary key of the database table. Even in this case, the above classification is still useful. It reflects how Hibernate \"locates\" individual rows of the collection."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1091
+#: performance.xml:1096
 #, no-c-format
 msgid "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1093
+#: performance.xml:1098
 #, no-c-format
-msgid "From the discussion above, it should be clear that indexed collections and (usually) sets allow the most efficient operation in terms of adding, removing and updating elements."
+msgid "From the discussion above, it should be clear that indexed collections and sets allow the most efficient operation in terms of adding, removing and updating elements."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1099
+#: performance.xml:1104
 #, no-c-format
-msgid "There is, arguably, one more advantage that indexed collections have over sets for many to many associations or collections of values. Because of the structure of a <literal>Set</literal>, Hibernate doesn't ever <literal>UPDATE</literal> a row when an element is \"changed\". Changes to a <literal>Set</literal> always work via <literal>INSERT</literal> and <literal>DELETE</literal> (of individual rows). Once again, this consideration does not apply to one to many associations."
+msgid "There is, arguably, one more advantage that indexed collections have over sets for many-to-many associations or collections of values. Because of the structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</literal> a row when an element is \"changed\". Changes to a <literal>Set</literal> always work via <literal>INSERT</literal> and <literal>DELETE</literal> of individual rows. Once again, this consideration does not apply to one-to-many associations."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1108
+#: performance.xml:1113
 #, no-c-format
-msgid "After observing that arrays cannot be lazy, we would conclude that lists, maps and idbags are the most performant (non-inverse) collection types, with sets not far behind. Sets are expected to be the most common kind of collection in Hibernate applications. This is because the \"set\" semantics are most natural in the relational model."
+msgid "After observing that arrays cannot be lazy, you can conclude that lists, maps and idbags are the most performant (non-inverse) collection types, with sets not far behind. You can expect sets to be the most common kind of collection in Hibernate applications. This is because the \"set\" semantics are most natural in the relational model."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1116
+#: performance.xml:1121
 #, no-c-format
-msgid "However, in well-designed Hibernate domain models, we usually see that most collections are in fact one-to-many associations with <literal>inverse=\"true\"</literal>. For these associations, the update is handled by the many-to-one end of the association, and so considerations of collection update performance simply do not apply."
+msgid "However, in well-designed Hibernate domain models, most collections are in fact one-to-many associations with <literal>inverse=\"true\"</literal>. For these associations, the update is handled by the many-to-one end of the association, and so considerations of collection update performance simply do not apply."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1126
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1128
+#: performance.xml:1133
 #, no-c-format
-msgid "Just before you ditch bags forever, there is a particular case in which bags (and also lists) are much more performant than sets. For a collection with <literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many relationship idiom, for example) we can add elements to a bag or list without needing to initialize (fetch) the bag elements! This is because <literal>Collection.add()</literal> or <literal>Collection.addAll()</literal> must always return true for a bag or <literal>List</literal> (unlike a <literal>Set</literal>). This can make the following common code much faster."
+msgid "There is a particular case, however, in which bags, and also lists, are much more performant than sets. For a collection with <literal>inverse=\"true\"</literal>, the standard bidirectional one-to-many relationship idiom, for example, we can add elements to a bag or list without needing to initialize (fetch) the bag elements. This is because, unlike a <literal>set</literal>, <literal>Collection.add()</literal> or <literal>Collection.addAll()</literal> must always return true for a bag or <literal>List</literal>. This can make the following common code much faster:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1138
+#: performance.xml:1143
 #, no-c-format
 msgid ""
       "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -1342,91 +1354,91 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1143
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1145
+#: performance.xml:1150
 #, no-c-format
-msgid "Occasionally, deleting collection elements one by one can be extremely inefficient. Hibernate isn't completely stupid, so it knows not to do that in the case of an newly-empty collection (if you called <literal>list.clear()</literal>, for example). In this case, Hibernate will issue a single <literal>DELETE</literal> and we are done!"
+msgid "Deleting collection elements one by one can sometimes be extremely inefficient. Hibernate knows not to do that in the case of an newly-empty collection (if you called <literal>list.clear()</literal>, for example). In this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1152
+#: performance.xml:1157
 #, no-c-format
-msgid "Suppose we add a single element to a collection of size twenty and then remove two elements. Hibernate will issue one <literal>INSERT</literal> statement and two <literal>DELETE</literal> statements (unless the collection is a bag). This is certainly desirable."
+msgid "Suppose you added a single element to a collection of size twenty and then remove two elements. Hibernate will issue one <literal>INSERT</literal> statement and two <literal>DELETE</literal> statements, unless the collection is a bag. This is certainly desirable."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1158
+#: performance.xml:1163
 #, no-c-format
 msgid "However, suppose that we remove eighteen elements, leaving two and then add thee new elements. There are two possible ways to proceed"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1165
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1168
+#: performance.xml:1173
 #, no-c-format
-msgid "remove the whole collection (in one SQL <literal>DELETE</literal>) and insert all five current elements (one by one)"
+msgid "remove the whole collection in one SQL <literal>DELETE</literal> and insert all five current elements one by one"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1173
+#: performance.xml:1178
 #, no-c-format
-msgid "Hibernate isn't smart enough to know that the second option is probably quicker in this case. (And it would probably be undesirable for Hibernate to be that smart; such behaviour might confuse database triggers, etc.)"
+msgid "Hibernate cannot know that the second option is probably quicker. It would probably be undesirable for Hibernate to be that intuitive as such behavior might confuse database triggers, etc."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1179
+#: performance.xml:1184
 #, no-c-format
-msgid "Fortunately, you can force this behaviour (ie. the second strategy) at any time by discarding (ie. dereferencing) the original collection and returning a newly instantiated collection with all the current elements. This can be very useful and powerful from time to time."
+msgid "Fortunately, you can force this behavior (i.e. the second strategy) at any time by discarding (i.e. dereferencing) the original collection and returning a newly instantiated collection with all the current elements."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1190
 #, no-c-format
-msgid "Of course, one-shot-delete does not apply to collections mapped <literal>inverse=\"true\"</literal>."
+msgid "One-shot-delete does not apply to collections mapped <literal>inverse=\"true\"</literal>."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1194
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1196
+#: performance.xml:1201
 #, no-c-format
 msgid "Optimization is not much use without monitoring and access to performance numbers. Hibernate provides a full range of figures about its internal operations. Statistics in Hibernate are available per <literal>SessionFactory</literal>."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1203
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1205
+#: performance.xml:1210
 #, no-c-format
 msgid "You can access <literal>SessionFactory</literal> metrics in two ways. Your first option is to call <literal>sessionFactory.getStatistics()</literal> and read or display the <literal>Statistics</literal> yourself."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1211
+#: performance.xml:1216
 #, no-c-format
-msgid "Hibernate can also use JMX to publish metrics if you enable the <literal>StatisticsService</literal> MBean. You may enable a single MBean for all your <literal>SessionFactory</literal> or one per factory. See the following code for minimalistic configuration examples:"
+msgid "Hibernate can also use JMX to publish metrics if you enable the <literal>StatisticsService</literal> MBean. You can enable a single MBean for all your <literal>SessionFactory</literal> or one per factory. See the following code for minimalistic configuration examples:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1218
+#: performance.xml:1223
 #, no-c-format
 msgid ""
       "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -1441,7 +1453,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1221
+#: performance.xml:1226
 #, no-c-format
 msgid ""
       "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -1455,79 +1467,73 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1223
+#: performance.xml:1233
 #, no-c-format
-msgid "TODO: This doesn't make sense: In the first case, we retrieve and use the MBean directly. In the second one, we must give the JNDI name in which the session factory is held before using it. Use <literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+msgid "You can activate and deactivate the monitoring for a <literal>SessionFactory</literal>:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1228
+#: performance.xml:1238
 #, no-c-format
-msgid "You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
-
-#. Tag: para
-#: performance.xml:1233
-#, no-c-format
 msgid "at configuration time, set <literal>hibernate.generate_statistics</literal> to <literal>false</literal>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1240
+#: performance.xml:1245
 #, no-c-format
 msgid "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> or <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1247
+#: performance.xml:1252
 #, no-c-format
 msgid "Statistics can be reset programmatically using the <literal>clear()</literal> method. A summary can be sent to a logger (info level) using the <literal>logSummary()</literal> method."
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1256
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1258
+#: performance.xml:1263
 #, no-c-format
-msgid "Hibernate provides a number of metrics, from very basic to the specialized information only relevant in certain scenarios. All available counters are described in the <literal>Statistics</literal> interface API, in three categories:"
+msgid "Hibernate provides a number of metrics, from basic information to more specialized information that is only relevant in certain scenarios. All available counters are described in the <literal>Statistics</literal> interface API, in three categories:"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1265
+#: performance.xml:1270
 #, no-c-format
 msgid "Metrics related to the general <literal>Session</literal> usage, such as number of open sessions, retrieved JDBC connections, etc."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1271
+#: performance.xml:1276
 #, no-c-format
-msgid "Metrics related to he entities, collections, queries, and caches as a whole (aka global metrics),"
+msgid "Metrics related to the entities, collections, queries, and caches as a whole (aka global metrics)."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1277
+#: performance.xml:1282
 #, no-c-format
 msgid "Detailed metrics related to a particular entity, collection, query or cache region."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1284
+#: performance.xml:1289
 #, no-c-format
-msgid "For example, you can check the cache hit, miss, and put ratio of entities, collections and queries, and the average time a query needs. Beware that the number of milliseconds is subject to approximation in Java. Hibernate is tied to the JVM precision, on some platforms this might even only be accurate to 10 seconds."
+msgid "For example, you can check the cache hit, miss, and put ratio of entities, collections and queries, and the average time a query needs. Be aware that the number of milliseconds is subject to approximation in Java. Hibernate is tied to the JVM precision and on some platforms this might only be accurate to 10 seconds."
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1291
+#: performance.xml:1296
 #, no-c-format
-msgid "Simple getters are used to access the global metrics (i.e. not tied to a particular entity, collection, cache region, etc.). You can access the metrics of a particular entity, collection or cache region through its name, and through its HQL or SQL representation for queries. Please refer to the <literal>Statistics</literal>, <literal>EntityStatistics</literal>, <literal>CollectionStatistics</literal>, <literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</literal> API Javadoc for more information. The following code shows a simple example:"
+msgid "Simple getters are used to access the global metrics (i.e. not tied to a particular entity, collection, cache region, etc.). You can access the metrics of a particular entity, collection or cache region through its name, and through its HQL or SQL representation for queries. Please refer to the <literal>Statistics</literal>, <literal>EntityStatistics</literal>, <literal>CollectionStatistics</literal>, <literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</literal> API Javadoc for more information. The following code is a simple example:"
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1301
+#: performance.xml:1306
 #, no-c-format
 msgid ""
       "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -1549,8 +1555,8 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1303
+#: performance.xml:1308
 #, no-c-format
-msgid "To work on all entities, collections, queries and region caches, you can retrieve the list of names of entities, collections, queries and region caches with the following methods: <literal>getQueries()</literal>, <literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
+msgid "You can work on all entities, collections, queries and region caches, by retrieving the list of names of entities, collections, queries and region caches using the following methods: <literal>getQueries()</literal>, <literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,13 +23,13 @@
 #. Tag: para
 #: persistent_classes.xml:31
 #, no-c-format
-msgid "Persistent classes are classes in an application that implement the entities of the business problem (e.g. Customer and Order in an E-commerce application). Not all instances of a persistent class are considered to be in the persistent state - an instance may instead be transient or detached."
+msgid "Persistent classes are classes in an application that implement the entities of the business problem (e.g. Customer and Order in an E-commerce application). Not all instances of a persistent class are considered to be in the persistent state. For example, an instance can instead be transient or detached."
 msgstr ""
 
 #. Tag: para
 #: persistent_classes.xml:38
 #, no-c-format
-msgid "Hibernate works best if these classes follow some simple rules, also known as the Plain Old Java Object (POJO) programming model. However, none of these rules are hard requirements. Indeed, Hibernate3 assumes very little about the nature of your persistent objects. You may express a domain model in other ways: using trees of <literal>Map</literal> instances, for example."
+msgid "Hibernate works best if these classes follow some simple rules, also known as the Plain Old Java Object (POJO) programming model. However, none of these rules are hard requirements. Indeed, Hibernate3 assumes very little about the nature of your persistent objects. You can express a domain model in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 
 #. Tag: title
@@ -41,7 +41,7 @@
 #. Tag: para
 #: persistent_classes.xml:49
 #, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+msgid "Most Java applications require a persistent class representing felines. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -131,7 +131,7 @@
 #. Tag: para
 #: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
+msgid "The four main rules of persistent classes are explored in more detail in the following sections."
 msgstr ""
 
 #. Tag: title
@@ -143,7 +143,7 @@
 #. Tag: para
 #: persistent_classes.xml:63
 #, no-c-format
-msgid "<literal>Cat</literal> has a no-argument constructor. All persistent classes must have a default constructor (which may be non-public) so that Hibernate can instantiate them using <literal>Constructor.newInstance()</literal>. We strongly recommend having a default constructor with at least <emphasis>package</emphasis> visibility for runtime proxy generation in Hibernate."
+msgid "<literal>Cat</literal> has a no-argument constructor. All persistent classes must have a default constructor (which can be non-public) so that Hibernate can instantiate them using <literal>Constructor.newInstance()</literal>. It is recommended that you have a default constructor with at least <emphasis>package</emphasis> visibility for runtime proxy generation in Hibernate."
 msgstr ""
 
 #. Tag: title
@@ -155,7 +155,7 @@
 #. Tag: para
 #: persistent_classes.xml:75
 #, no-c-format
-msgid "<literal>Cat</literal> has a property called <literal>id</literal>. This property maps to the primary key column of a database table. The property might have been called anything, and its type might have been any primitive type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or <literal>java.util.Date</literal>. (If your legacy database table has composite keys, you can even use a user-defined class with properties of these types - see the section on composite identifiers later.)"
+msgid "<literal>Cat</literal> has a property called <literal>id</literal>. This property maps to the primary key column of a database table. The property might have been called anything, and its type might have been any primitive type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or <literal>java.util.Date</literal>. If your legacy database table has composite keys, you can use a user-defined class with properties of these types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 
 #. Tag: para
@@ -167,7 +167,7 @@
 #. Tag: para
 #: persistent_classes.xml:89
 #, no-c-format
-msgid "In fact, some functionality is available only to classes which declare an identifier property:"
+msgid "In fact, some functionality is available only to classes that declare an identifier property:"
 msgstr ""
 
 #. Tag: para
@@ -191,7 +191,7 @@
 #. Tag: para
 #: persistent_classes.xml:113
 #, no-c-format
-msgid "We recommend you declare consistently-named identifier properties on persistent classes. We further recommend that you use a nullable (ie. non-primitive) type."
+msgid "We recommend that you declare consistently-named identifier properties on persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 
 #. Tag: title
@@ -209,7 +209,7 @@
 #. Tag: para
 #: persistent_classes.xml:126
 #, no-c-format
-msgid "You can persist <literal>final</literal> classes that do not implement an interface with Hibernate, but you won't be able to use proxies for lazy association fetching - which will limit your options for performance tuning."
+msgid "You can persist <literal>final</literal> classes that do not implement an interface with Hibernate. You will not, however, be able to use proxies for lazy association fetching which will ultimately limit your options for performance tuning."
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #: persistent_classes.xml:141
 #, no-c-format
-msgid "<literal>Cat</literal> declares accessor methods for all its persistent fields. Many other ORM tools directly persist instance variables. We believe it is better to provide an indirection between the relational schema and internal data structures of the class. By default, Hibernate persists JavaBeans style properties, and recognizes method names of the form <literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. You may switch to direct field access for particular properties, if needed."
+msgid "<literal>Cat</literal> declares accessor methods for all its persistent fields. Many other ORM tools directly persist instance variables. It is better to provide an indirection between the relational schema and internal data structures of the class. By default, Hibernate persists JavaBeans style properties and recognizes method names of the form <literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If required, you can switch to direct field access for particular properties."
 msgstr ""
 
 #. Tag: para
@@ -245,7 +245,7 @@
 #. Tag: para
 #: persistent_classes.xml:164
 #, no-c-format
-msgid "A subclass must also observe the first and second rules. It inherits its identifier property from the superclass, <literal>Cat</literal>."
+msgid "A subclass must also observe the first and second rules. It inherits its identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -275,13 +275,13 @@
 #. Tag: para
 #: persistent_classes.xml:175
 #, no-c-format
-msgid "You have to override the <literal>equals()</literal> and <literal>hashCode()</literal> methods if you"
+msgid "You have to override the <literal>equals()</literal> and <literal>hashCode()</literal> methods if you:"
 msgstr ""
 
 #. Tag: para
 #: persistent_classes.xml:181
 #, no-c-format
-msgid "intend to put instances of persistent classes in a <literal>Set</literal> (the recommended way to represent many-valued associations) <emphasis>and</emphasis>"
+msgid "intend to put instances of persistent classes in a <literal>Set</literal> (the recommended way to represent many-valued associations); <emphasis>and</emphasis>"
 msgstr ""
 
 #. Tag: para
@@ -293,19 +293,19 @@
 #. Tag: para
 #: persistent_classes.xml:194
 #, no-c-format
-msgid "Hibernate guarantees equivalence of persistent identity (database row) and Java identity only inside a particular session scope. So as soon as we mix instances retrieved in different sessions, we must implement <literal>equals()</literal> and <literal>hashCode()</literal> if we wish to have meaningful semantics for <literal>Set</literal>s."
+msgid "Hibernate guarantees equivalence of persistent identity (database row) and Java identity only inside a particular session scope. When you mix instances retrieved in different sessions, you must implement <literal>equals()</literal> and <literal>hashCode()</literal> if you wish to have meaningful semantics for <literal>Set</literal>s."
 msgstr ""
 
 #. Tag: para
 #: persistent_classes.xml:202
 #, no-c-format
-msgid "The most obvious way is to implement <literal>equals()</literal>/<literal>hashCode()</literal> by comparing the identifier value of both objects. If the value is the same, both must be the same database row, they are therefore equal (if both are added to a <literal>Set</literal>, we will only have one element in the <literal>Set</literal>). Unfortunately, we can't use that approach with generated identifiers! Hibernate will only assign identifier values to objects that are persistent, a newly created instance will not have any identifier value! Furthermore, if an instance is unsaved and currently in a <literal>Set</literal>, saving it will assign an identifier value to the object. If <literal>equals()</literal> and <literal>hashCode()</literal> are based on the identifier value, the hash code would change, breaking the contract of the <literal>Set</literal>. See the Hibernate website for a full discussion of this problem. Note that this is not a Hibernate issue, but !
 normal Java semantics of object identity and equality."
+msgid "The most obvious way is to implement <literal>equals()</literal>/<literal>hashCode()</literal> by comparing the identifier value of both objects. If the value is the same, both must be the same database row, because they are equal. If both are added to a <literal>Set</literal>, you will only have one element in the <literal>Set</literal>). Unfortunately, you cannot use that approach with generated identifiers. Hibernate will only assign identifier values to objects that are persistent; a newly created instance will not have any identifier value. Furthermore, if an instance is unsaved and currently in a <literal>Set</literal>, saving it will assign an identifier value to the object. If <literal>equals()</literal> and <literal>hashCode()</literal> are based on the identifier value, the hash code would change, breaking the contract of the <literal>Set</literal>. See the Hibernate website for a full discussion of this problem. This is not a Hibernate issue, but normal Ja!
 va semantics of object identity and equality."
 msgstr ""
 
 #. Tag: para
 #: persistent_classes.xml:216
 #, no-c-format
-msgid "We recommend implementing <literal>equals()</literal> and <literal>hashCode()</literal> using <emphasis>Business key equality</emphasis>. Business key equality means that the <literal>equals()</literal> method compares only the properties that form the business key, a key that would identify our instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+msgid "It is recommended that you implement <literal>equals()</literal> and <literal>hashCode()</literal> using <emphasis>Business key equality</emphasis>. Business key equality means that the <literal>equals()</literal> method compares only the properties that form the business key. It is a key that would identify our instance in the real world (a <emphasis>natural</emphasis> candidate key):"
 msgstr ""
 
 #. Tag: programlisting
@@ -340,7 +340,7 @@
 #. Tag: para
 #: persistent_classes.xml:226
 #, no-c-format
-msgid "Note that a business key does not have to be as solid as a database primary key candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable or unique properties are usually good candidates for a business key."
+msgid "A business key does not have to be as solid as a database primary key candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable or unique properties are usually good candidates for a business key."
 msgstr ""
 
 #. Tag: title
@@ -349,32 +349,38 @@
 msgid "Dynamic models"
 msgstr ""
 
-#. Tag: emphasis
+#. Tag: title
 #: persistent_classes.xml:239
 #, no-c-format
-msgid "Note that the following features are currently considered experimental and may change in the near future."
+msgid "Note"
 msgstr ""
 
+#. Tag: emphasis
+#: persistent_classes.xml:241
+#, no-c-format
+msgid "The following features are currently considered experimental and may change in the near future."
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:243
+#: persistent_classes.xml:246
 #, no-c-format
-msgid "Persistent entities don't necessarily have to be represented as POJO classes or as JavaBean objects at runtime. Hibernate also supports dynamic models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and the representation of entities as DOM4J trees. With this approach, you don't write persistent classes, only mapping files."
+msgid "Persistent entities do not necessarily have to be represented as POJO classes or as JavaBean objects at runtime. Hibernate also supports dynamic models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and the representation of entities as DOM4J trees. With this approach, you do not write persistent classes, only mapping files."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:251
+#: persistent_classes.xml:254
 #, no-c-format
-msgid "By default, Hibernate works in normal POJO mode. You may set a default entity representation mode for a particular <literal>SessionFactory</literal> using the <literal>default_entity_mode</literal> configuration option (see <xref linkend=\"configuration-optional-properties\"/>."
+msgid "By default, Hibernate works in normal POJO mode. You can set a default entity representation mode for a particular <literal>SessionFactory</literal> using the <literal>default_entity_mode</literal> configuration option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:258
+#: persistent_classes.xml:261
 #, no-c-format
-msgid "The following examples demonstrates the representation using <literal>Map</literal>s. First, in the mapping file, an <literal>entity-name</literal> has to be declared instead of (or in addition to) a class name:"
+msgid "The following examples demonstrate the representation using <literal>Map</literal>s. First, in the mapping file an <literal>entity-name</literal> has to be declared instead of, or in addition to, a class name:"
 msgstr ""
 
 #. Tag: programlisting
-#: persistent_classes.xml:264
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -413,19 +419,19 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:266
+#: persistent_classes.xml:269
 #, no-c-format
-msgid "Note that even though associations are declared using target class names, the target type of an associations may also be a dynamic entity instead of a POJO."
+msgid "Even though associations are declared using target class names, the target type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
+#: persistent_classes.xml:276
 #, no-c-format
-msgid "After setting the default entity mode to <literal>dynamic-map</literal> for the <literal>SessionFactory</literal>, we can at runtime work with <literal>Map</literal>s of <literal>Map</literal>s:"
+msgid "After setting the default entity mode to <literal>dynamic-map</literal> for the <literal>SessionFactory</literal>, you can, at runtime, work with <literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 
 #. Tag: programlisting
-#: persistent_classes.xml:279
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
       "<![CDATA[Session s = openSession();\n"
@@ -452,19 +458,19 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:281
+#: persistent_classes.xml:284
 #, no-c-format
-msgid "The advantages of a dynamic mapping are quick turnaround time for prototyping without the need for entity class implementation. However, you lose compile-time type checking and will very likely deal with many exceptions at runtime. Thanks to the Hibernate mapping, the database schema can easily be normalized and sound, allowing to add a proper domain model implementation on top later on."
+msgid "One of the main advantages of dynamic mapping is quick turnaround time for prototyping, without the need for entity class implementation. However, you lose compile-time type checking and will likely deal with many exceptions at runtime. As a result of the Hibernate mapping, the database schema can easily be normalized and sound, allowing to add a proper domain model implementation on top later on."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:289
+#: persistent_classes.xml:292
 #, no-c-format
 msgid "Entity representation modes can also be set on a per <literal>Session</literal> basis:"
 msgstr ""
 
 #. Tag: programlisting
-#: persistent_classes.xml:294
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
       "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -482,37 +488,43 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:297
+#: persistent_classes.xml:300
 #, no-c-format
-msgid "Please note that the call to <literal>getSession()</literal> using an <literal>EntityMode</literal> is on the <literal>Session</literal> API, not the <literal>SessionFactory</literal>. That way, the new <literal>Session</literal> shares the underlying JDBC connection, transaction, and other context information. This means you don't have tocall <literal>flush()</literal> and <literal>close()</literal> on the secondary <literal>Session</literal>, and also leave the transaction and connection handling to the primary unit of work."
+msgid "Please note that the call to <literal>getSession()</literal> using an <literal>EntityMode</literal> is on the <literal>Session</literal> API, not the <literal>SessionFactory</literal>. That way, the new <literal>Session</literal> shares the underlying JDBC connection, transaction, and other context information. This means you do not have to call <literal>flush()</literal> and <literal>close()</literal> on the secondary <literal>Session</literal>, and also leave the transaction and connection handling to the primary unit of work."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:307
+#: persistent_classes.xml:310
 #, no-c-format
 msgid "More information about the XML representation capabilities can be found in <xref linkend=\"xml\"/>."
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:315
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:317
+#: persistent_classes.xml:320
 #, no-c-format
-msgid "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are responsible for managing a particular representation of a piece of data, given that representation's <literal>org.hibernate.EntityMode</literal>. If a given piece of data is thought of as a data structure, then a tuplizer is the thing which knows how to create such a data structure and how to extract values from and inject values into such a data structure. For example, for the POJO entity mode, the correpsonding tuplizer knows how create the POJO through its constructor and how to access the POJO properties using the defined property accessors. There are two high-level types of Tuplizers, represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for managing the above mentioned contracts in regards to entities, while <literal>ComponentTu!
 plizer</literal>s do the same for components."
+msgid "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are responsible for managing a particular representation of a piece of data given that representation's <literal>org.hibernate.EntityMode</literal>. If a given piece of data is thought of as a data structure, then a tuplizer is the thing that knows how to create such a data structure and how to extract values from and inject values into such a data structure. For example, for the POJO entity mode, the corresponding tuplizer knows how create the POJO through its constructor. It also knows how to access the POJO properties using the defined property accessors."
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:332
+#: persistent_classes.xml:330
 #, no-c-format
-msgid "Users may also plug in their own tuplizers. Perhaps you require that a <literal>java.util.Map</literal> implementation other than <literal>java.util.HashMap</literal> be used while in the dynamic-map entity-mode; or perhaps you need to define a different proxy generation strategy than the one used by default. Both would be achieved by defining a custom tuplizer implementation. Tuplizers definitions are attached to the entity or component mapping they are meant to manage. Going back to the example of our customer entity:"
+msgid "There are two high-level types of Tuplizers, represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for managing the above mentioned contracts in regards to entities, while <literal>ComponentTuplizer</literal>s do the same for components."
 msgstr ""
 
+#. Tag: para
+#: persistent_classes.xml:338
+#, no-c-format
+msgid "Users can also plug in their own tuplizers. Perhaps you require that a <literal>java.util.Map</literal> implementation other than <literal>java.util.HashMap</literal> be used while in the dynamic-map entity-mode. Or perhaps you need to define a different proxy generation strategy than the one used by default. Both would be achieved by defining a custom tuplizer implementation. Tuplizer definitions are attached to the entity or component mapping they are meant to manage. Going back to the example of our customer entity:"
+msgstr ""
+
 #. Tag: programlisting
-#: persistent_classes.xml:341
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -553,14 +565,146 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:347
+#: persistent_classes.xml:354
 #, no-c-format
-msgid "Extentsions"
+msgid "EntityNameResolvers"
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:348
+#: persistent_classes.xml:356
 #, no-c-format
-msgid "TODO: Document user-extension framework in the property and proxy packages"
+msgid "The <interfacename>org.hibernate.EntityNameResolver</interfacename> interface is a contract for resolving the entity name of a given entity instance. The interface defines a single method <methodname>resolveEntityName</methodname> which is passed the entity instance and is expected to return the appropriate entity name (null is allowed and would indicate that the resolver does not know how to resolve the entity name of the given entity instance). Generally speaking, an <interfacename>org.hibernate.EntityNameResolver</interfacename> is going to be most useful in the case of dynamic models. One example might be using proxied interfaces as your domain model. The hibernate test suite has an example of this exact style of usage under the <package>org.hibernate.test.dynamicentity.tuplizer2</package>. Here is some of the code from that package for illustration."
 msgstr ""
 
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+      "/**\n"
+      " * A very trivial JDK Proxy InvocationHandler implementation where we proxy an interface as\n"
+      " * the domain model and simply store persistent state in an internal Map.  This is an extremely\n"
+      " * trivial example meant only for illustration.\n"
+      " */\n"
+      "public final class DataProxyHandler implements InvocationHandler {\n"
+      "        private String entityName;\n"
+      "        private HashMap data = new HashMap();\n"
+      "\n"
+      "        public DataProxyHandler(String entityName, Serializable id) {\n"
+      "                this.entityName = entityName;\n"
+      "                data.put( \"Id\", id );\n"
+      "        }\n"
+      "\n"
+      "        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {\n"
+      "                String methodName = method.getName();\n"
+      "                if ( methodName.startsWith( \"set\" ) ) {\n"
+      "                        String propertyName = methodName.substring( 3 );\n"
+      "                        data.put( propertyName, args[0] );\n"
+      "                }\n"
+      "                else if ( methodName.startsWith( \"get\" ) ) {\n"
+      "                        String propertyName = methodName.substring( 3 );\n"
+      "                        return data.get( propertyName );\n"
+      "                }\n"
+      "                else if ( \"toString\".equals( methodName ) ) {\n"
+      "                        return entityName + \"#\" + data.get( \"Id\" );\n"
+      "                }\n"
+      "                else if ( \"hashCode\".equals( methodName ) ) {\n"
+      "                        return new Integer( this.hashCode() );\n"
+      "                }\n"
+      "                return null;\n"
+      "        }\n"
+      "\n"
+      "        public String getEntityName() {\n"
+      "                return entityName;\n"
+      "        }\n"
+      "\n"
+      "        public HashMap getData() {\n"
+      "                return data;\n"
+      "        }\n"
+      "}\n"
+      "\n"
+      "/**\n"
+      " *\n"
+      " */\n"
+      "public class ProxyHelper {\n"
+      "    public static String extractEntityName(Object object) {\n"
+      "        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+      "        // their appropriate entity name, so we simply extract it from there\n"
+      "        // if this represents one of our proxies; otherwise, we return null\n"
+      "        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+      "            InvocationHandler handler = Proxy.getInvocationHandler( object );\n"
+      "            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass() ) ) {\n"
+      "                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+      "                return myHandler.getEntityName();\n"
+      "            }\n"
+      "        }\n"
+      "        return null;\n"
+      "    }\n"
+      "\n"
+      "    // various other utility methods ....\n"
+      "\n"
+      "}\n"
+      "\n"
+      "/**\n"
+      " * The EntityNameResolver implementation.\n"
+      " * IMPL NOTE : An EntityNameResolver really defines a strategy for how entity names should be\n"
+      " * resolved.  Since this particular impl can handle resolution for all of our entities we want to\n"
+      " * take advantage of the fact that SessionFactoryImpl keeps these in a Set so that we only ever\n"
+      " * have one instance registered.  Why?  Well, when it comes time to resolve an entity name,\n"
+      " * Hibernate must iterate over all the registered resolvers.  So keeping that number down\n"
+      " * helps that process be as speedy as possible.  Hence the equals and hashCode impls\n"
+      " */\n"
+      "public class MyEntityNameResolver implements EntityNameResolver {\n"
+      "    public static final MyEntityNameResolver INSTANCE = new MyEntityNameResolver();\n"
+      "\n"
+      "    public String resolveEntityName(Object entity) {\n"
+      "        return ProxyHelper.extractEntityName( entity );\n"
+      "    }\n"
+      "\n"
+      "    public boolean equals(Object obj) {\n"
+      "        return getClass().equals( obj.getClass() );\n"
+      "    }\n"
+      "\n"
+      "    public int hashCode() {\n"
+      "        return getClass().hashCode();\n"
+      "    }\n"
+      "}\n"
+      "\n"
+      "public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+      "        public MyEntityTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappedEntity) {\n"
+      "                super( entityMetamodel, mappedEntity );\n"
+      "        }\n"
+      "\n"
+      "        public EntityNameResolver[] getEntityNameResolvers() {\n"
+      "                return new EntityNameResolver[] { MyEntityNameResolver.INSTANCE };\n"
+      "        }\n"
+      "\n"
+      "    public String determineConcreteSubclassEntityName(Object entityInstance, SessionFactoryImplementor factory) {\n"
+      "        String entityName = ProxyHelper.extractEntityName( entityInstance );\n"
+      "        if ( entityName == null ) {\n"
+      "            entityName = super.determineConcreteSubclassEntityName( entityInstance, factory );\n"
+      "        }\n"
+      "        return entityName;\n"
+      "    }\n"
+      "\n"
+      "    ...\n"
+      "}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid "In order to register an <interfacename>org.hibernate.EntityNameResolver</interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid "Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</link>, implementing the <methodname>getEntityNameResolvers</methodname> method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid "Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</classname> (which is the implementation class for <interfacename>org.hibernate.SessionFactory</interfacename>) using the <methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,19 +23,19 @@
 #. Tag: para
 #: preface.xml:31
 #, no-c-format
-msgid "Working with object-oriented software and a relational database can be cumbersome and time consuming in today's enterprise environments. Hibernate is an object/relational mapping tool for Java environments. The term object/relational mapping (ORM) refers to the technique of mapping a data representation from an object model to a relational data model with a SQL-based schema."
+msgid "Working with object-oriented software and a relational database can be cumbersome and time consuming in today's enterprise environments. Hibernate is an Object/Relational Mapping tool for Java environments. The term Object/Relational Mapping (ORM) refers to the technique of mapping a data representation from an object model to a relational data model with a SQL-based schema."
 msgstr ""
 
 #. Tag: para
 #: preface.xml:39
 #, no-c-format
-msgid "Hibernate not only takes care of the mapping from Java classes to database tables (and from Java data types to SQL data types), but also provides data query and retrieval facilities and can significantly reduce development time otherwise spent with manual data handling in SQL and JDBC."
+msgid "Hibernate not only takes care of the mapping from Java classes to database tables (and from Java data types to SQL data types), but also provides data query and retrieval facilities. It can also significantly reduce development time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 
 #. Tag: para
 #: preface.xml:46
 #, no-c-format
-msgid "Hibernates goal is to relieve the developer from 95 percent of common data persistence related programming tasks. Hibernate may not be the best solution for data-centric applications that only use stored-procedures to implement the business logic in the database, it is most useful with object-oriented domain models and business logic in the Java-based middle-tier. However, Hibernate can certainly help you to remove or encapsulate vendor-specific SQL code and will help with the common task of result set translation from a tabular representation to a graph of objects."
+msgid "Hibernate's goal is to relieve the developer from 95 percent of common data persistence related programming tasks. Hibernate may not be the best solution for data-centric applications that only use stored-procedures to implement the business logic in the database, it is most useful with object-oriented domain models and business logic in the Java-based middle-tier. However, Hibernate can certainly help you to remove or encapsulate vendor-specific SQL code and will help with the common task of result set translation from a tabular representation to a graph of objects."
 msgstr ""
 
 #. Tag: para
@@ -59,13 +59,13 @@
 #. Tag: para
 #: preface.xml:77
 #, no-c-format
-msgid "Have a look at the <literal>eg/</literal> directory in the Hibernate distribution, it contains a simple standalone application. Copy your JDBC driver to the <literal>lib/</literal> directory and edit <literal>etc/hibernate.properties</literal>, specifying correct values for your database. From a command prompt in the distribution directory, type <literal>ant eg</literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+msgid "View the <literal>eg/</literal> directory in the Hibernate distribution. It contains a simple standalone application. Copy your JDBC driver to the <literal>lib/</literal> directory and edit <literal>etc/hibernate.properties</literal>, specifying correct values for your database. From a command prompt in the distribution directory, type <literal>ant eg</literal> (using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 
 #. Tag: para
 #: preface.xml:88
 #, no-c-format
-msgid "Use this reference documentation as your primary source of information. Consider reading <emphasis>Java Persistence with Hibernate</emphasis> (http://www.manning.com/bauer2) if you need more help with application design or if you prefer a step-by-step tutorial. Also visit http://caveatemptor.hibernate.org and download the example application for Java Persistence with Hibernate."
+msgid "Use this reference documentation as your primary source of information. Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need more help with application design, or if you prefer a step-by-step tutorial. Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and download the example application from <biblioref linkend=\"biblio-JPwH\"></biblioref>."
 msgstr ""
 
 #. Tag: para
@@ -77,7 +77,7 @@
 #. Tag: para
 #: preface.xml:103
 #, no-c-format
-msgid "Third party demos, examples, and tutorials are linked on the Hibernate website."
+msgid "Links to third party demos, examples, and tutorials are maintained on the Hibernate website."
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 #. Tag: para
 #: preface.xml:117
 #, no-c-format
-msgid "If you have questions, use the user forum linked on the Hibernate website. We also provide a JIRA issue trackings system for bug reports and feature requests. If you are interested in the development of Hibernate, join the developer mailing list. If you are interested in translating this documentation into your language, contact us on the developer mailing list."
+msgid "If you have questions, use the user forum linked on the Hibernate website. We also provide a JIRA issue tracking system for bug reports and feature requests. If you are interested in the development of Hibernate, join the developer mailing list. If you are interested in translating this documentation into your language, contact us on the developer mailing list."
 msgstr ""
 
 #. Tag: para

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -72,7 +72,7 @@
 #. Tag: para
 #: query_criteria.xml:61
 #, no-c-format
-msgid "Restrictions may be grouped logically."
+msgid "Restrictions can be grouped logically."
 msgstr ""
 
 #. Tag: programlisting
@@ -106,7 +106,7 @@
 #. Tag: para
 #: query_criteria.xml:69
 #, no-c-format
-msgid "There are quite a range of built-in criterion types (<literal>Restrictions</literal> subclasses), but one that is especially useful lets you specify SQL directly."
+msgid "There are a range of built-in criterion types (<literal>Restrictions</literal> subclasses). One of the most useful allows you to specify SQL directly."
 msgstr ""
 
 #. Tag: programlisting
@@ -127,7 +127,7 @@
 #. Tag: para
 #: query_criteria.xml:81
 #, no-c-format
-msgid "An alternative approach to obtaining a criterion is to get it from a <literal>Property</literal> instance. You can create a <literal>Property</literal> by calling <literal>Property.forName()</literal>."
+msgid "You can also obtain a criterion from a <literal>Property</literal> instance. You can create a <literal>Property</literal> by calling <literal>Property.forName()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -156,7 +156,7 @@
 #. Tag: para
 #: query_criteria.xml:94
 #, no-c-format
-msgid "You may order the results using <literal>org.hibernate.criterion.Order</literal>."
+msgid "You can order the results using <literal>org.hibernate.criterion.Order</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -192,7 +192,7 @@
 #. Tag: para
 #: query_criteria.xml:107
 #, no-c-format
-msgid "You may easily specify constraints upon related entities by navigating associations using <literal>createCriteria()</literal>."
+msgid "By navigating associations using <literal>createCriteria()</literal> you can specify constraints upon related entities:"
 msgstr ""
 
 #. Tag: programlisting
@@ -209,13 +209,13 @@
 #. Tag: para
 #: query_criteria.xml:114
 #, no-c-format
-msgid "note that the second <literal>createCriteria()</literal> returns a new instance of <literal>Criteria</literal>, which refers to the elements of the <literal>kittens</literal> collection."
+msgid "The second <literal>createCriteria()</literal> returns a new instance of <literal>Criteria</literal> that refers to the elements of the <literal>kittens</literal> collection."
 msgstr ""
 
 #. Tag: para
 #: query_criteria.xml:120
 #, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+msgid "There is also an alternate form that is useful in certain circumstances:"
 msgstr ""
 
 #. Tag: programlisting
@@ -238,7 +238,7 @@
 #. Tag: para
 #: query_criteria.xml:131
 #, no-c-format
-msgid "Note that the kittens collections held by the <literal>Cat</literal> instances returned by the previous two queries are <emphasis>not</emphasis> pre-filtered by the criteria! If you wish to retrieve just the kittens that match the criteria, you must use a <literal>ResultTransformer</literal>."
+msgid "The kittens collections held by the <literal>Cat</literal> instances returned by the previous two queries are <emphasis>not</emphasis> pre-filtered by the criteria. If you want to retrieve just the kittens that match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -267,7 +267,7 @@
 #. Tag: para
 #: query_criteria.xml:145
 #, no-c-format
-msgid "You may specify association fetching semantics at runtime using <literal>setFetchMode()</literal>."
+msgid "You can specify association fetching semantics at runtime using <literal>setFetchMode()</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -363,7 +363,7 @@
 #. Tag: para
 #: query_criteria.xml:190
 #, no-c-format
-msgid "The class <literal>org.hibernate.criterion.Projections</literal> is a factory for <literal>Projection</literal> instances. We apply a projection to a query by calling <literal>setProjection()</literal>."
+msgid "The class <literal>org.hibernate.criterion.Projections</literal> is a factory for <literal>Projection</literal> instances. You can apply a projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -399,7 +399,7 @@
 #. Tag: para
 #: query_criteria.xml:206
 #, no-c-format
-msgid "An alias may optionally be assigned to a projection, so that the projected value may be referred to in restrictions or orderings. Here are two different ways to do this:"
+msgid "An alias can be assigned to a projection so that the projected value can be referred to in restrictions or orderings. Here are two different ways to do this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -500,7 +500,7 @@
 #. Tag: para
 #: query_criteria.xml:239
 #, no-c-format
-msgid "The <literal>DetachedCriteria</literal> class lets you create a query outside the scope of a session, and then later execute it using some arbitrary <literal>Session</literal>."
+msgid "The <literal>DetachedCriteria</literal> class allows you to create a query outside the scope of a session and then execute it using an arbitrary <literal>Session</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -520,7 +520,7 @@
 #. Tag: para
 #: query_criteria.xml:246
 #, no-c-format
-msgid "A <literal>DetachedCriteria</literal> may also be used to express a subquery. Criterion instances involving subqueries may be obtained via <literal>Subqueries</literal> or <literal>Property</literal>."
+msgid "A <literal>DetachedCriteria</literal> can also be used to express a subquery. Criterion instances involving subqueries can be obtained via <literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -548,7 +548,7 @@
 #. Tag: para
 #: query_criteria.xml:256
 #, no-c-format
-msgid "Even correlated subqueries are possible:"
+msgid "Correlated subqueries are also possible:"
 msgstr ""
 
 #. Tag: programlisting
@@ -572,13 +572,13 @@
 #. Tag: para
 #: query_criteria.xml:271
 #, no-c-format
-msgid "For most queries, including criteria queries, the query cache is not very efficient, because query cache invalidation occurs too frequently. However, there is one special kind of query where we can optimize the cache invalidation algorithm: lookups by a constant natural key. In some applications, this kind of query occurs frequently. The criteria API provides special provision for this use case."
+msgid "For most queries, including criteria queries, the query cache is not efficient because query cache invalidation occurs too frequently. However, there is a special kind of query where you can optimize the cache invalidation algorithm: lookups by a constant natural key. In some applications, this kind of query occurs frequently. The criteria API provides special provision for this use case."
 msgstr ""
 
 #. Tag: para
 #: query_criteria.xml:279
 #, no-c-format
-msgid "First, you should map the natural key of your entity using <literal>&lt;natural-id&gt;</literal>, and enable use of the second-level cache."
+msgid "First, map the natural key of your entity using <literal>&lt;natural-id&gt;</literal> and enable use of the second-level cache."
 msgstr ""
 
 #. Tag: programlisting
@@ -601,23 +601,17 @@
 #. Tag: para
 #: query_criteria.xml:286
 #, no-c-format
-msgid "Note that this functionality is not intended for use with entities with <emphasis>mutable</emphasis> natural keys."
+msgid "This functionality is not intended for use with entities with <emphasis>mutable</emphasis> natural keys."
 msgstr ""
 
 #. Tag: para
 #: query_criteria.xml:291
 #, no-c-format
-msgid "Next, enable the Hibernate query cache."
+msgid "Once you have enabled the Hibernate query cache, the <literal>Restrictions.naturalId()</literal> allows you to make use of the more efficient cache algorithm."
 msgstr ""
 
-#. Tag: para
-#: query_criteria.xml:295
-#, no-c-format
-msgid "Now, <literal>Restrictions.naturalId()</literal> allows us to make use of the more efficient cache algorithm."
-msgstr ""
-
 #. Tag: programlisting
-#: query_criteria.xml:300
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
       "<![CDATA[session.createCriteria(User.class)\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: query_hql.xml:31
 #, no-c-format
-msgid "Hibernate is equipped with an extremely powerful query language that (quite intentionally) looks very much like SQL. But don't be fooled by the syntax; HQL is fully object-oriented, understanding notions like inheritence, polymorphism and association."
+msgid "Hibernate uses a powerful query language (HQL) that is similar in appearance to SQL. Compared with SQL, however, HQL is fully object-oriented and understands notions like inheritance, polymorphism and association."
 msgstr ""
 
 #. Tag: title
@@ -35,13 +35,13 @@
 #. Tag: para
 #: query_hql.xml:40
 #, no-c-format
-msgid "Queries are case-insensitive, except for names of Java classes and properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+msgid "With the exception of names of Java classes and properties, queries are case-insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</literal> is the same as <literal>SELECT</literal>, but <literal>org.hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:51
 #, no-c-format
-msgid "This manual uses lowercase HQL keywords. Some users find queries with uppercase keywords more readable, but we find this convention ugly when embedded in Java code."
+msgid "This manual uses lowercase HQL keywords. Some users find queries with uppercase keywords more readable, but this convention is unsuitable for queries embedded in Java code."
 msgstr ""
 
 #. Tag: title
@@ -65,7 +65,7 @@
 #. Tag: para
 #: query_hql.xml:67
 #, no-c-format
-msgid "which simply returns all instances of the class <literal>eg.Cat</literal>. We don't usually need to qualify the class name, since <literal>auto-import</literal> is the default. So we almost always just write:"
+msgid "This returns all instances of the class <literal>eg.Cat</literal>. You do not usually need to qualify the class name, since <literal>auto-import</literal> is the default. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -77,7 +77,7 @@
 #. Tag: para
 #: query_hql.xml:75
 #, no-c-format
-msgid "Most of the time, you will need to assign an <emphasis>alias</emphasis>, since you will want to refer to the <literal>Cat</literal> in other parts of the query."
+msgid "In order to refer to the <literal>Cat</literal> in other parts of the query, you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -89,7 +89,7 @@
 #. Tag: para
 #: query_hql.xml:83
 #, no-c-format
-msgid "This query assigns the alias <literal>cat</literal> to <literal>Cat</literal> instances, so we could use that alias later in the query. The <literal>as</literal> keyword is optional; we could also write:"
+msgid "This query assigns the alias <literal>cat</literal> to <literal>Cat</literal> instances, so you can use that alias later in the query. The <literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 
 #. Tag: programlisting
@@ -101,7 +101,7 @@
 #. Tag: para
 #: query_hql.xml:91
 #, no-c-format
-msgid "Multiple classes may appear, resulting in a cartesian product or \"cross\" join."
+msgid "Multiple classes can appear, resulting in a cartesian product or \"cross\" join."
 msgstr ""
 
 #. Tag: programlisting
@@ -119,7 +119,7 @@
 #. Tag: para
 #: query_hql.xml:98
 #, no-c-format
-msgid "It is considered good practice to name query aliases using an initial lowercase, consistent with Java naming standards for local variables (eg. <literal>domesticCat</literal>)."
+msgid "It is good practice to name query aliases using an initial lowercase as this is consistent with Java naming standards for local variables (e.g. <literal>domesticCat</literal>)."
 msgstr ""
 
 #. Tag: title
@@ -131,7 +131,7 @@
 #. Tag: para
 #: query_hql.xml:109
 #, no-c-format
-msgid "We may also assign aliases to associated entities, or even to elements of a collection of values, using a <literal>join</literal>."
+msgid "You can also assign aliases to associated entities or to elements of a collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 
 #. Tag: programlisting
@@ -158,7 +158,7 @@
 #. Tag: para
 #: query_hql.xml:120
 #, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr ""
 
 #. Tag: literal
@@ -218,7 +218,7 @@
 #. Tag: para
 #: query_hql.xml:161
 #, no-c-format
-msgid "In addition, a \"fetch\" join allows associations or collections of values to be initialized along with their parent objects, using a single select. This is particularly useful in the case of a collection. It effectively overrides the outer join and lazy declarations of the mapping file for associations and collections. See <xref linkend=\"performance-fetching\"/> for more information."
+msgid "A \"fetch\" join allows associations or collections of values to be initialized along with their parent objects using a single select. This is particularly useful in the case of a collection. It effectively overrides the outer join and lazy declarations of the mapping file for associations and collections. See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr ""
 
 #. Tag: programlisting
@@ -233,7 +233,7 @@
 #. Tag: para
 #: query_hql.xml:171
 #, no-c-format
-msgid "A fetch join does not usually need to assign an alias, because the associated objects should not be used in the <literal>where</literal> clause (or any other clause). Also, the associated objects are not returned directly in the query results. Instead, they may be accessed via the parent object. The only reason we might need an alias is if we are recursively join fetching a further collection:"
+msgid "A fetch join does not usually need to assign an alias, because the associated objects should not be used in the <literal>where</literal> clause (or any other clause). The associated objects are also not returned directly in the query results. Instead, they may be accessed via the parent object. The only reason you might need an alias is if you are recursively join fetching a further collection:"
 msgstr ""
 
 #. Tag: programlisting
@@ -249,13 +249,13 @@
 #. Tag: para
 #: query_hql.xml:181
 #, no-c-format
-msgid "Note that the <literal>fetch</literal> construct may not be used in queries called using <literal>iterate()</literal> (though <literal>scroll()</literal> can be used). Nor should <literal>fetch</literal> be used together with <literal>setMaxResults()</literal> or <literal>setFirstResult()</literal> as these operations are based on the result rows, which usually contain duplicates for eager collection fetching, hence, the number of rows is not what you'd expect. Nor may <literal>fetch</literal> be used together with an ad hoc <literal>with</literal> condition. It is possible to create a cartesian product by join fetching more than one collection in a query, so take care in this case. Join fetching multiple collection roles also sometimes gives unexpected results for bag mappings, so be careful about how you formulate your queries in this case. Finally, note that <literal>full join fetch</literal> and <literal>right join fetch</literal> are not meaningful."
+msgid "The <literal>fetch</literal> construct cannot be used in queries called using <literal>iterate()</literal> (though <literal>scroll()</literal> can be used). <literal>Fetch</literal> should be used together with <literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, as these operations are based on the result rows which usually contain duplicates for eager collection fetching, hence, the number of rows is not what you would expect. <literal>Fetch</literal> should also not be used together with impromptu <literal>with</literal> condition. It is possible to create a cartesian product by join fetching more than one collection in a query, so take care in this case. Join fetching multiple collection roles can produce unexpected results for bag mappings, so user discretion is advised when formulating queries in this case. Finally, note that <literal>full join fetch</literal> and <literal>right join fetch</literal> are not meaningful."
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:196
 #, no-c-format
-msgid "If you are using property-level lazy fetching (with bytecode instrumentation), it is possible to force Hibernate to fetch the lazy properties immediately (in the first query) using <literal>fetch all properties</literal>."
+msgid "If you are using property-level lazy fetching (with bytecode instrumentation), it is possible to force Hibernate to fetch the lazy properties in the first query immediately using <literal>fetch all properties</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -285,7 +285,7 @@
 #. Tag: para
 #: query_hql.xml:214
 #, no-c-format
-msgid "The queries shown in the previous section all use the <literal>explicit</literal> form where the join keyword is explicitly used in the from clause. This is the recommended form."
+msgid "The queries shown in the previous section all use the <literal>explicit</literal> form, that is, where the join keyword is explicitly used in the from clause. This is the recommended form."
 msgstr ""
 
 #. Tag: para
@@ -303,53 +303,53 @@
 #. Tag: title
 #: query_hql.xml:230
 #, no-c-format
-msgid "Refering to identifier property"
+msgid "Referring to identifier property"
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:232
 #, no-c-format
-msgid "There are, generally speaking, 2 ways to refer to an entity's identifier property:"
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:237
 #, no-c-format
-msgid "The special property (lowercase) <literal>id</literal> may be used to reference the identifier property of an entity <emphasis>provided that entity does not define a non-identifier property named id</emphasis>."
+msgid "The special property (lowercase) <literal>id</literal> may be used to reference the identifier property of an entity <emphasis>provided that the entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:244
 #, no-c-format
-msgid "If the entity defines a named identifier property, you may use that property name."
+msgid "If the entity defines a named identifier property, you can use that property name."
 msgstr ""
 
 #. Tag: para
 #: query_hql.xml:250
 #, no-c-format
-msgid "References to composite identifier properties follow the same naming rules. If the entity has a non-identifier property named id, the composite identifier property can only be referenced by its defined named; otherwise, the special <literal>id</literal> property can be used to rerference the identifier property."
+msgid "References to composite identifier properties follow the same naming rules. If the entity has a non-identifier property named id, the composite identifier property can only be referenced by its defined named. Otherwise, the special <literal>id</literal> property can be used to reference the identifier property."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:257
+#: query_hql.xml:258
 #, no-c-format
-msgid "Note: this has changed significantly starting in version 3.2.2. In previous versions, <literal>id</literal> <emphasis>always</emphasis> referred to the identifier property no matter what its actual name. A ramification of that decision was that non-identifier properties named <literal>id</literal> could never be referenced in Hibernate queries."
+msgid "Please note that, starting in version 3.2.2, this has changed significantly. In previous versions, <literal>id</literal> <emphasis>always</emphasis> referred to the identifier property regardless of its actual name. A ramification of that decision was that non-identifier properties named <literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:266
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:268
+#: query_hql.xml:271
 #, no-c-format
-msgid "The <literal>select</literal> clause picks which objects and properties to return in the query result set. Consider:"
+msgid "The <literal>select</literal> clause picks which objects and properties to return in the query result set. Consider the following:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:273
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
       "<![CDATA[select mate\n"
@@ -358,25 +358,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:275
+#: query_hql.xml:278
 #, no-c-format
-msgid "The query will select <literal>mate</literal>s of other <literal>Cat</literal>s. Actually, you may express this query more compactly as:"
+msgid "The query will select <literal>mate</literal>s of other <literal>Cat</literal>s. You can express this query more compactly as:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:280
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:282
+#: query_hql.xml:285
 #, no-c-format
-msgid "Queries may return properties of any value type including properties of component type:"
+msgid "Queries can return properties of any value type including properties of component type:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:286
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
       "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -384,19 +384,19 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:288
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:290
+#: query_hql.xml:293
 #, no-c-format
-msgid "Queries may return multiple objects and/or properties as an array of type <literal>Object[]</literal>,"
+msgid "Queries can return multiple objects and/or properties as an array of type <literal>Object[]</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:295
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
       "<![CDATA[select mother, offspr, mate.name\n"
@@ -406,13 +406,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:297
+#: query_hql.xml:300
 #, no-c-format
-msgid "or as a <literal>List</literal>,"
+msgid "Or as a <literal>List</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:301
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
       "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -422,13 +422,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:303
+#: query_hql.xml:306
 #, no-c-format
-msgid "or as an actual typesafe Java object,"
+msgid "Or - assuming that the class <literal>Family</literal> has an appropriate constructor - as an actual typesafe Java object:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:307
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
       "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -438,15 +438,9 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:309
-#, no-c-format
-msgid "assuming that the class <literal>Family</literal> has an appropriate constructor."
-msgstr ""
-
-#. Tag: para
 #: query_hql.xml:313
 #, no-c-format
-msgid "You may assign aliases to selected expressions using <literal>as</literal>:"
+msgid "You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -486,7 +480,7 @@
 #. Tag: para
 #: query_hql.xml:334
 #, no-c-format
-msgid "HQL queries may even return the results of aggregate functions on properties:"
+msgid "HQL queries can even return the results of aggregate functions on properties:"
 msgstr ""
 
 #. Tag: programlisting
@@ -500,7 +494,7 @@
 #. Tag: para
 #: query_hql.xml:349
 #, no-c-format
-msgid "The supported aggregate functions are"
+msgid "The supported aggregate functions are:"
 msgstr ""
 
 #. Tag: literal
@@ -524,7 +518,7 @@
 #. Tag: para
 #: query_hql.xml:371
 #, no-c-format
-msgid "You may use arithmetic operators, concatenation, and recognized SQL functions in the select clause:"
+msgid "You can use arithmetic operators, concatenation, and recognized SQL functions in the select clause:"
 msgstr ""
 
 #. Tag: programlisting
@@ -546,7 +540,7 @@
 #. Tag: para
 #: query_hql.xml:380
 #, no-c-format
-msgid "The <literal>distinct</literal> and <literal>all</literal> keywords may be used and have the same semantics as in SQL."
+msgid "The <literal>distinct</literal> and <literal>all</literal> keywords can be used and have the same semantics as in SQL."
 msgstr ""
 
 #. Tag: programlisting
@@ -573,7 +567,7 @@
 #. Tag: para
 #: query_hql.xml:398
 #, no-c-format
-msgid "returns instances not only of <literal>Cat</literal>, but also of subclasses like <literal>DomesticCat</literal>. Hibernate queries may name <emphasis>any</emphasis> Java class or interface in the <literal>from</literal> clause. The query will return instances of all persistent classes that extend that class or implement the interface. The following query would return all persistent objects:"
+msgid "returns instances not only of <literal>Cat</literal>, but also of subclasses like <literal>DomesticCat</literal>. Hibernate queries can name <emphasis>any</emphasis> Java class or interface in the <literal>from</literal> clause. The query will return instances of all persistent classes that extend that class or implement the interface. The following query would return all persistent objects:"
 msgstr ""
 
 #. Tag: programlisting
@@ -597,7 +591,7 @@
 #. Tag: para
 #: query_hql.xml:415
 #, no-c-format
-msgid "Note that these last two queries will require more than one SQL <literal>SELECT</literal>. This means that the <literal>order by</literal> clause does not correctly order the whole result set. (It also means you can't call these queries using <literal>Query.scroll()</literal>.)"
+msgid "These last two queries will require more than one SQL <literal>SELECT</literal>. This means that the <literal>order by</literal> clause does not correctly order the whole result set. It also means you cannot call these queries using <literal>Query.scroll()</literal>."
 msgstr ""
 
 #. Tag: title
@@ -609,7 +603,7 @@
 #. Tag: para
 #: query_hql.xml:426
 #, no-c-format
-msgid "The <literal>where</literal> clause allows you to narrow the list of instances returned. If no alias exists, you may refer to properties by name:"
+msgid "The <literal>where</literal> clause allows you to refine the list of instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 
 #. Tag: programlisting
@@ -633,12 +627,18 @@
 #. Tag: para
 #: query_hql.xml:439
 #, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr ""
 
-#. Tag: programlisting
+#. Tag: para
 #: query_hql.xml:443
 #, no-c-format
+msgid "The following query:"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:446
+#, no-c-format
 msgid ""
       "<![CDATA[select foo\n"
       "from Foo foo, Bar bar\n"
@@ -646,25 +646,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:445
+#: query_hql.xml:448
 #, no-c-format
-msgid "will return all instances of <literal>Foo</literal> for which there exists an instance of <literal>bar</literal> with a <literal>date</literal> property equal to the <literal>startDate</literal> property of the <literal>Foo</literal>. Compound path expressions make the <literal>where</literal> clause extremely powerful. Consider:"
+msgid "returns all instances of <literal>Foo</literal> with an instance of <literal>bar</literal> with a <literal>date</literal> property equal to the <literal>startDate</literal> property of the <literal>Foo</literal>. Compound path expressions make the <literal>where</literal> clause extremely powerful. Consider the following:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:454
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:456
+#: query_hql.xml:459
 #, no-c-format
-msgid "This query translates to an SQL query with a table (inner) join. If you were to write something like"
+msgid "This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:461
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
       "<![CDATA[from Foo foo\n"
@@ -672,25 +672,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:463
+#: query_hql.xml:466
 #, no-c-format
-msgid "you would end up with a query that would require four table joins in SQL."
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:467
+#: query_hql.xml:470
 #, no-c-format
-msgid "The <literal>=</literal> operator may be used to compare not only properties, but also instances:"
+msgid "The <literal>=</literal> operator can be used to compare not only properties, but also instances:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:472
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:474
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
       "<![CDATA[select cat, mate\n"
@@ -699,13 +699,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:476
+#: query_hql.xml:479
 #, no-c-format
-msgid "The special property (lowercase) <literal>id</literal> may be used to reference the unique identifier of an object. See <xref linkend=\"queryhql-identifier-property\"/> for more information."
+msgid "The special property (lowercase) <literal>id</literal> can be used to reference the unique identifier of an object. See <xref linkend=\"queryhql-identifier-property\"/> for more information."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:482
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
       "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -714,19 +714,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:484
+#: query_hql.xml:487
 #, no-c-format
-msgid "The second query is efficient. No table join is required!"
+msgid "The second query is efficient and does not require a table join."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:488
+#: query_hql.xml:491
 #, no-c-format
-msgid "Properties of composite identifiers may also be used. Suppose <literal>Person</literal> has a composite identifier consisting of <literal>country</literal> and <literal>medicareNumber</literal>. Again, see <xref linkend=\"queryhql-identifier-property\"/> for more information regarding referencing identifier properties."
+msgid "Properties of composite identifiers can also be used. Consider the following example where <literal>Person</literal> has composite identifiers consisting of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:495
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
       "<![CDATA[from bank.Person person\n"
@@ -735,7 +735,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:497
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
       "<![CDATA[from bank.Account account\n"
@@ -744,37 +744,43 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:499
+#: query_hql.xml:501
 #, no-c-format
-msgid "Once again, the second query requires no table join."
+msgid "Once again, the second query does not require a table join."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:503
+#: query_hql.xml:505
 #, no-c-format
-msgid "Likewise, the special property <literal>class</literal> accesses the discriminator value of an instance in the case of polymorphic persistence. A Java class name embedded in the where clause will be translated to its discriminator value."
+msgid "See <xref linkend=\"queryhql-identifier-property\"/> for more information regarding referencing identifier properties)"
 msgstr ""
 
+#. Tag: para
+#: query_hql.xml:510
+#, no-c-format
+msgid "The special property <literal>class</literal> accesses the discriminator value of an instance in the case of polymorphic persistence. A Java class name embedded in the where clause will be translated to its discriminator value."
+msgstr ""
+
 #. Tag: programlisting
-#: query_hql.xml:509
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:511
+#: query_hql.xml:518
 #, no-c-format
-msgid "You may also use components or composite user types, or properties of said component types. See <xref linkend=\"queryhql-components\"/> for more details."
+msgid "You can also use components or composite user types, or properties of said component types. See <xref linkend=\"queryhql-components\"/> for more information."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:516
+#: query_hql.xml:523
 #, no-c-format
-msgid "An \"any\" type has the special properties <literal>id</literal> and <literal>class</literal>, allowing us to express a join in the following way (where <literal>AuditLog.item</literal> is a property mapped with <literal>&lt;any&gt;</literal>)."
+msgid "An \"any\" type has the special properties <literal>id</literal> and <literal>class</literal> that allows you to express a join in the following way (where <literal>AuditLog.item</literal> is a property mapped with <literal>&lt;any&gt;</literal>):"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:522
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
       "<![CDATA[from AuditLog log, Payment payment\n"
@@ -782,259 +788,259 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:524
+#: query_hql.xml:531
 #, no-c-format
-msgid "Notice that <literal>log.item.class</literal> and <literal>payment.class</literal> would refer to the values of completely different database columns in the above query."
+msgid "The <literal>log.item.class</literal> and <literal>payment.class</literal> would refer to the values of completely different database columns in the above query."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:532
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:534
+#: query_hql.xml:541
 #, no-c-format
-msgid "Expressions allowed in the <literal>where</literal> clause include most of the kind of things you could write in SQL:"
+msgid "Expressions used in the <literal>where</literal> clause include the following:"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:541
+#: query_hql.xml:548
 #, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:546
+#: query_hql.xml:553
 #, no-c-format
-msgid "binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
+msgid "binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:551
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:563
 #, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:561
+#: query_hql.xml:568
 #, no-c-format
 msgid "<literal>in</literal>, <literal>not in</literal>, <literal>between</literal>, <literal>is null</literal>, <literal>is not null</literal>, <literal>is empty</literal>, <literal>is not empty</literal>, <literal>member of</literal> and <literal>not member of</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:581
 #, no-c-format
 msgid "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, and \"searched\" case, <literal>case when ... then ... else ... end</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:587
 #, no-c-format
 msgid "string concatenation <literal>...||...</literal> or <literal>concat(...,...)</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:585
+#: query_hql.xml:592
 #, no-c-format
-msgid "<literal>current_date()</literal>, <literal>current_time()</literal>, <literal>current_timestamp()</literal>"
+msgid "<literal>current_date()</literal>, <literal>current_time()</literal>, and <literal>current_timestamp()</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:598
 #, no-c-format
-msgid "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, <literal>year(...)</literal>,"
+msgid "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, and <literal>year(...)</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:598
+#: query_hql.xml:605
 #, no-c-format
 msgid "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim(), lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(), mod()</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:604
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:609
+#: query_hql.xml:616
 #, no-c-format
 msgid "<literal>str()</literal> for converting numeric or temporal values to a readable string"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:615
+#: query_hql.xml:622
 #, no-c-format
 msgid "<literal>cast(... as ...)</literal>, where the second argument is the name of a Hibernate type, and <literal>extract(... from ...)</literal> if ANSI <literal>cast()</literal> and <literal>extract()</literal> is supported by the underlying database"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:623
+#: query_hql.xml:630
 #, no-c-format
 msgid "the HQL <literal>index()</literal> function, that applies to aliases of a joined indexed collection"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:636
 #, no-c-format
-msgid "HQL functions that take collection-valued path expressions: <literal>size(), minelement(), maxelement(), minindex(), maxindex()</literal>, along with the special <literal>elements()</literal> and <literal>indices</literal> functions which may be quantified using <literal>some, all, exists, any, in</literal>."
+msgid "HQL functions that take collection-valued path expressions: <literal>size(), minelement(), maxelement(), minindex(), maxindex()</literal>, along with the special <literal>elements()</literal> and <literal>indices</literal> functions that can be quantified using <literal>some, all, exists, any, in</literal>."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:637
+#: query_hql.xml:644
 #, no-c-format
-msgid "Any database-supported SQL scalar function like <literal>sign()</literal>, <literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</literal>"
+msgid "Any database-supported SQL scalar function like <literal>sign()</literal>, <literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:643
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:648
+#: query_hql.xml:655
 #, no-c-format
-msgid "named parameters <literal>:name</literal>, <literal>:start_date</literal>, <literal>:x1</literal>"
+msgid "named parameters <literal>:name</literal>, <literal>:start_date</literal>, and <literal>:x1</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:653
+#: query_hql.xml:660
 #, no-c-format
 msgid "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:659
+#: query_hql.xml:666
 #, no-c-format
 msgid "Java <literal>public static final</literal> constants <literal>eg.Color.TABBY</literal>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:665
+#: query_hql.xml:672
 #, no-c-format
-msgid "<literal>in</literal> and <literal>between</literal> may be used as follows:"
+msgid "<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:669
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:671
+#: query_hql.xml:678
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:673
+#: query_hql.xml:680
 #, no-c-format
-msgid "and the negated forms may be written"
+msgid "The negated forms can be written as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:677
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:679
+#: query_hql.xml:686
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:681
+#: query_hql.xml:688
 #, no-c-format
-msgid "Likewise, <literal>is null</literal> and <literal>is not null</literal> may be used to test for null values."
+msgid "Similarly, <literal>is null</literal> and <literal>is not null</literal> can be used to test for null values."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:686
+#: query_hql.xml:693
 #, no-c-format
-msgid "Booleans may be easily used in expressions by declaring HQL query substitutions in Hibernate configuration:"
+msgid "Booleans can be easily used in expressions by declaring HQL query substitutions in Hibernate configuration:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:691
+#: query_hql.xml:698
 #, no-c-format
 msgid "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</property>]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:693
+#: query_hql.xml:700
 #, no-c-format
 msgid "This will replace the keywords <literal>true</literal> and <literal>false</literal> with the literals <literal>1</literal> and <literal>0</literal> in the translated SQL from this HQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:698
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:700
+#: query_hql.xml:707
 #, no-c-format
-msgid "You may test the size of a collection with the special property <literal>size</literal>, or the special <literal>size()</literal> function."
+msgid "You can test the size of a collection with the special property <literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:709
+#: query_hql.xml:716
 #, no-c-format
-msgid "For indexed collections, you may refer to the minimum and maximum indices using <literal>minindex</literal> and <literal>maxindex</literal> functions. Similarly, you may refer to the minimum and maximum elements of a collection of basic type using the <literal>minelement</literal> and <literal>maxelement</literal> functions."
+msgid "For indexed collections, you can refer to the minimum and maximum indices using <literal>minindex</literal> and <literal>maxindex</literal> functions. Similarly, you can refer to the minimum and maximum elements of a collection of basic type using the <literal>minelement</literal> and <literal>maxelement</literal> functions. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:717
+#: query_hql.xml:724
 #, no-c-format
 msgid "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:719
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:721
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:723
+#: query_hql.xml:730
 #, no-c-format
-msgid "The SQL functions <literal>any, some, all, exists, in</literal> are supported when passed the element or index set of a collection (<literal>elements</literal> and <literal>indices</literal> functions) or the result of a subquery (see below)."
+msgid "The SQL functions <literal>any, some, all, exists, in</literal> are supported when passed the element or index set of a collection (<literal>elements</literal> and <literal>indices</literal> functions) or the result of a subquery (see below):"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
       "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1042,7 +1048,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
       "<![CDATA[select p from NameList list, Person p\n"
@@ -1050,43 +1056,43 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:735
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:737
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:739
+#: query_hql.xml:746
 #, no-c-format
-msgid "Note that these constructs - <literal>size</literal>, <literal>elements</literal>, <literal>indices</literal>, <literal>minindex</literal>, <literal>maxindex</literal>, <literal>minelement</literal>, <literal>maxelement</literal> - may only be used in the where clause in Hibernate3."
+msgid "Note that these constructs - <literal>size</literal>, <literal>elements</literal>, <literal>indices</literal>, <literal>minindex</literal>, <literal>maxindex</literal>, <literal>minelement</literal>, <literal>maxelement</literal> - can only be used in the where clause in Hibernate3."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:746
+#: query_hql.xml:753
 #, no-c-format
-msgid "Elements of indexed collections (arrays, lists, maps) may be referred to by index (in a where clause only):"
+msgid "Elements of indexed collections (arrays, lists, and maps) can be referred to by index in a where clause only:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:751
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:753
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
       "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1095,7 +1101,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:755
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
       "<![CDATA[select item from Item item, Order order\n"
@@ -1103,7 +1109,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:757
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
       "<![CDATA[select item from Item item, Order order\n"
@@ -1111,13 +1117,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:759
+#: query_hql.xml:766
 #, no-c-format
-msgid "The expression inside <literal>[]</literal> may even be an arithmetic expression."
+msgid "The expression inside <literal>[]</literal> can even be an arithmetic expression:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:763
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
       "<![CDATA[select item from Item item, Order order\n"
@@ -1125,13 +1131,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:765
+#: query_hql.xml:772
 #, no-c-format
-msgid "HQL also provides the built-in <literal>index()</literal> function, for elements of a one-to-many association or collection of values."
+msgid "HQL also provides the built-in <literal>index()</literal> function for elements of a one-to-many association or collection of values."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:770
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
       "<![CDATA[select item, index(item) from Order order\n"
@@ -1140,25 +1146,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:772
+#: query_hql.xml:779
 #, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:785
 #, no-c-format
-msgid "If you are not yet convinced by all this, think how much longer and less readable the following query would be in SQL:"
+msgid "Consider how much longer and less readable the following query would be in SQL:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:783
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
       "<![CDATA[select cust\n"
@@ -1171,13 +1177,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:785
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:789
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
       "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust.current_order\n"
@@ -1200,19 +1206,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:794
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:796
+#: query_hql.xml:803
 #, no-c-format
-msgid "The list returned by a query may be ordered by any property of a returned class or components:"
+msgid "The list returned by a query can be ordered by any property of a returned class or components:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:800
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
       "<![CDATA[from DomesticCat cat\n"
@@ -1220,25 +1226,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:802
+#: query_hql.xml:809
 #, no-c-format
 msgid "The optional <literal>asc</literal> or <literal>desc</literal> indicate ascending or descending order respectively."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:809
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:811
+#: query_hql.xml:818
 #, no-c-format
-msgid "A query that returns aggregate values may be grouped by any property of a returned class or components:"
+msgid "A query that returns aggregate values can be grouped by any property of a returned class or components:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:815
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
       "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1247,7 +1253,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:817
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
       "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1256,13 +1262,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:819
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:823
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
       "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1272,13 +1278,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:825
+#: query_hql.xml:832
 #, no-c-format
-msgid "SQL functions and aggregate functions are allowed in the <literal>having</literal> and <literal>order by</literal> clauses, if supported by the underlying database (eg. not in MySQL)."
+msgid "SQL functions and aggregate functions are allowed in the <literal>having</literal> and <literal>order by</literal> clauses if they are supported by the underlying database (i.e., not in MySQL)."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
       "<![CDATA[select cat\n"
@@ -1290,25 +1296,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:833
+#: query_hql.xml:840
 #, no-c-format
-msgid "Note that neither the <literal>group by</literal> clause nor the <literal>order by</literal> clause may contain arithmetic expressions. Also note that Hibernate currently does not expand a grouped entity, so you can't write <literal>group by cat</literal> if all properties of <literal>cat</literal> are non-aggregated. You have to list all non-aggregated properties explicitly."
+msgid "Neither the <literal>group by</literal> clause nor the <literal>order by</literal> clause can contain arithmetic expressions. Hibernate also does not currently expand a grouped entity, so you cannot write <literal>group by cat</literal> if all properties of <literal>cat</literal> are non-aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:845
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:847
+#: query_hql.xml:854
 #, no-c-format
 msgid "For databases that support subselects, Hibernate supports subqueries within queries. A subquery must be surrounded by parentheses (often by an SQL aggregate function call). Even correlated subqueries (subqueries that refer to an alias in the outer query) are allowed."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:853
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
       "<![CDATA[from Cat as fatcat\n"
@@ -1318,7 +1324,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:855
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
       "<![CDATA[from DomesticCat as cat\n"
@@ -1328,7 +1334,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:857
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
       "<![CDATA[from Cat as cat\n"
@@ -1338,7 +1344,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:859
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
       "<![CDATA[from DomesticCat as cat\n"
@@ -1348,7 +1354,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:861
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
       "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1356,37 +1362,37 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:863
+#: query_hql.xml:870
 #, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:867
+#: query_hql.xml:874
 #, no-c-format
-msgid "Note that subqueries can also utilize <literal>row value constructor</literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+msgid "Note that subqueries can also utilize <literal>row value constructor</literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:875
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:884
 #, no-c-format
-msgid "Hibernate queries can be quite powerful and complex. In fact, the power of the query language is one of Hibernate's main selling points. Here are some example queries very similar to queries that I used on a recent project. Note that most queries you will write are much simpler than these!"
+msgid "Hibernate queries can be quite powerful and complex. In fact, the power of the query language is one of Hibernate's main strengths. The following example queries are similar to queries that have been used on recent projects. Please note that most queries you will write will be much simpler than the following examples."
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:883
+#: query_hql.xml:890
 #, no-c-format
-msgid "The following query returns the order id, number of items and total value of the order for all unpaid orders for a particular customer and given minimum total value, ordering the results by total value. In determining the prices, it uses the current catalog. The resulting SQL query, against the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has four inner joins and an (uncorrelated) subselect."
+msgid "The following query returns the order id, number of items, the given minimum total value and the total value of the order for all unpaid orders for a particular customer. The results are ordered by total value. In determining the prices, it uses the current catalog. The resulting SQL query, against the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
       "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1410,13 +1416,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:901
 #, no-c-format
 msgid "What a monster! Actually, in real life, I'm not very keen on subqueries, so my query was really more like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:899
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
       "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1435,13 +1441,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:901
+#: query_hql.xml:908
 #, no-c-format
 msgid "The next query counts the number of payments in each status, excluding all payments in the <literal>AWAITING_APPROVAL</literal> status where the most recent status change was made by the current user. It translates to an SQL query with two inner joins and a correlated subselect against the <literal>PAYMENT</literal>, <literal>PAYMENT_STATUS</literal> and <literal>PAYMENT_STATUS_CHANGE</literal> tables."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
       "<![CDATA[select count(payment), status.name\n"
@@ -1462,13 +1468,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:911
+#: query_hql.xml:918
 #, no-c-format
-msgid "If I would have mapped the <literal>statusChanges</literal> collection as a list, instead of a set, the query would have been much simpler to write."
+msgid "If the <literal>statusChanges</literal> collection was mapped as a list, instead of a set, the query would have been much simpler to write."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:916
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
       "<![CDATA[select count(payment), status.name\n"
@@ -1481,13 +1487,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:918
+#: query_hql.xml:925
 #, no-c-format
 msgid "The next query uses the MS SQL Server <literal>isNull()</literal> function to return all the accounts and unpaid payments for the organization to which the current user belongs. It translates to an SQL query with three inner joins, an outer join and a subselect against the <literal>ACCOUNT</literal>, <literal>PAYMENT</literal>, <literal>PAYMENT_STATUS</literal>, <literal>ACCOUNT_TYPE</literal>, <literal>ORGANIZATION</literal> and <literal>ORG_USER</literal> tables."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:927
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
       "<![CDATA[select account, payment\n"
@@ -1499,13 +1505,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:929
+#: query_hql.xml:936
 #, no-c-format
 msgid "For some databases, we would need to do away with the (correlated) subselect."
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:933
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
       "<![CDATA[select account, payment\n"
@@ -1518,43 +1524,43 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:938
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:940
+#: query_hql.xml:947
 #, no-c-format
-msgid "HQL now supports <literal>update</literal>, <literal>delete</literal> and <literal>insert ... select ...</literal> statements. See <xref linkend=\"batch-direct\"/> for details."
+msgid "HQL now supports <literal>update</literal>, <literal>delete</literal> and <literal>insert ... select ...</literal> statements. See <xref linkend=\"batch-direct\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:948
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:950
+#: query_hql.xml:957
 #, no-c-format
-msgid "You can count the number of query results without actually returning them:"
+msgid "You can count the number of query results without returning them:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:954
+#: query_hql.xml:961
 #, no-c-format
 msgid "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\").iterate().next() ).intValue()]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:956
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:960
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
       "<![CDATA[select usr.id, usr.name\n"
@@ -1565,25 +1571,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:962
+#: query_hql.xml:969
 #, no-c-format
 msgid "If your database supports subselects, you can place a condition upon selection size in the where clause of your query:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:967
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:969
+#: query_hql.xml:976
 #, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+msgid "If your database does not support subselects, use the following query:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:973
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
       "<![CDATA[select usr.id, usr.name\n"
@@ -1594,13 +1600,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:975
+#: query_hql.xml:983
 #, no-c-format
-msgid "As this solution can't return a <literal>User</literal> with zero messages because of the inner join, the following form is also useful:"
+msgid "As this solution cannot return a <literal>User</literal> with zero messages because of the inner join, the following form is also useful:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
       "<![CDATA[select usr.id, usr.name\n"
@@ -1611,13 +1617,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:982
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:986
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
       "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name and foo.size=:size\");\n"
@@ -1626,13 +1632,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:988
+#: query_hql.xml:996
 #, no-c-format
 msgid "Collections are pageable by using the <literal>Query</literal> interface with a filter:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:992
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
       "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial filter\n"
@@ -1642,13 +1648,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:994
+#: query_hql.xml:1002
 #, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:998
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
       "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by this.amount\" );\n"
@@ -1656,127 +1662,127 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1000
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1004
+#: query_hql.xml:1012
 #, no-c-format
 msgid "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\").iterate().next() ).intValue();]]>"
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1009
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1011
+#: query_hql.xml:1019
 #, no-c-format
-msgid "Components might be used in just about every way that simple value types can be used in HQL queries. They can appear in the <literal>select</literal> clause:"
+msgid "Components can be used similarly to the simple value types that are used in HQL queries. They can appear in the <literal>select</literal> clause as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1016 query_hql.xml:1062
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1017
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1019
+#: query_hql.xml:1027
 #, no-c-format
 msgid "where the Person's name property is a component. Components can also be used in the <literal>where</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1024
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1031
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1042
 #, no-c-format
 msgid "Another common use of components is in <link linkend=\"queryhql-tuple\">row value constructors</link>."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1040
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1042
+#: query_hql.xml:1050
 #, no-c-format
-msgid "HQL supports the use of ANSI SQL <literal>row value constructor</literal> syntax (sometimes called <literal>tuple</literal> syntax), even though the underlying database may not support that notion. Here we are generally referring to multi-valued comparisons, typically associated with components. Consider an entity Person which defines a name component:"
+msgid "HQL supports the use of ANSI SQL <literal>row value constructor</literal> syntax, sometimes referred to AS <literal>tuple</literal> syntax, even though the underlying database may not support that notion. Here, we are generally referring to multi-valued comparisons, typically associated with components. Consider an entity Person which defines a name component:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1049
+#: query_hql.xml:1057
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first='John' and p.name.last='Jingleheimer-Schmidt']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1051
+#: query_hql.xml:1059
 #, no-c-format
-msgid "That's valid syntax, although a little verbose. It be nice to make this a bit more concise and use <literal>row value constructor</literal> syntax:"
+msgid "That is valid syntax although it is a little verbose. You can make this more concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1056
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1058
+#: query_hql.xml:1066
 #, no-c-format
 msgid "It can also be useful to specify this in the <literal>select</literal> clause:"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1064
+#: query_hql.xml:1072
 #, no-c-format
-msgid "Another time using <literal>row value constructor</literal> syntax can be beneficial is when using subqueries needing to compare against multiple values:"
+msgid "Using <literal>row value constructor</literal> syntax can also be beneficial when using subqueries that need to compare against multiple values:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1069
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
       "<![CDATA[from Cat as cat\n"
@@ -1786,8 +1792,8 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1071
+#: query_hql.xml:1079
 #, no-c-format
-msgid "One thing to consider when deciding if you want to use this syntax is that the query will be dependent upon the ordering of the component sub-properties in the metadata."
+msgid "One thing to consider when deciding if you want to use this syntax, is that the query will be dependent upon the ordering of the component sub-properties in the metadata."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,13 +23,13 @@
 #. Tag: para
 #: query_sql.xml:31
 #, no-c-format
-msgid "You may also express queries in the native SQL dialect of your database. This is useful if you want to utilize database specific features such as query hints or the <literal>CONNECT</literal> keyword in Oracle. It also provides a clean migration path from a direct SQL/JDBC based application to Hibernate."
+msgid "You can also express queries in the native SQL dialect of your database. This is useful if you want to utilize database-specific features such as query hints or the <literal>CONNECT</literal> keyword in Oracle. It also provides a clean migration path from a direct SQL/JDBC based application to Hibernate."
 msgstr ""
 
 #. Tag: para
 #: query_sql.xml:37
 #, no-c-format
-msgid "Hibernate3 allows you to specify handwritten SQL (including stored procedures) for all create, update, delete, and load operations."
+msgid "Hibernate3 allows you to specify handwritten SQL, including stored procedures, for all create, update, delete, and load operations."
 msgstr ""
 
 #. Tag: title
@@ -41,7 +41,7 @@
 #. Tag: para
 #: query_sql.xml:43
 #, no-c-format
-msgid "Execution of native SQL queries is controlled via the <literal>SQLQuery</literal> interface, which is obtained by calling <literal>Session.createSQLQuery()</literal>. The following describes how to use this API for querying."
+msgid "Execution of native SQL queries is controlled via the <literal>SQLQuery</literal> interface, which is obtained by calling <literal>Session.createSQLQuery()</literal>. The following sections describe how to use this API for querying."
 msgstr ""
 
 #. Tag: title
@@ -68,13 +68,13 @@
 #. Tag: para
 #: query_sql.xml:56
 #, no-c-format
-msgid "These will both return a List of Object arrays (Object[]) with scalar values for each column in the CATS table. Hibernate will use ResultSetMetadata to deduce the actual order and types of the returned scalar values."
+msgid "These will return a List of Object arrays (Object[]) with scalar values for each column in the CATS table. Hibernate will use ResultSetMetadata to deduce the actual order and types of the returned scalar values."
 msgstr ""
 
 #. Tag: para
 #: query_sql.xml:61
 #, no-c-format
-msgid "To avoid the overhead of using <literal>ResultSetMetadata</literal> or simply to be more explicit in what is returned one can use <literal>addScalar()</literal>."
+msgid "To avoid the overhead of using <literal>ResultSetMetadata</literal>, or simply to be more explicit in what is returned, one can use <literal>addScalar()</literal>:"
 msgstr ""
 
 #. Tag: programlisting
@@ -89,13 +89,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:194 query_sql.xml:345
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, no-c-format
 msgid "This query specified:"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:349
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr ""
@@ -109,7 +109,7 @@
 #. Tag: para
 #: query_sql.xml:79
 #, no-c-format
-msgid "This will still return Object arrays, but now it will not use <literal>ResultSetMetadata</literal> but will instead explicitly get the ID, NAME and BIRTHDATE column as respectively a Long, String and a Short from the underlying resultset. This also means that only these three columns will be returned, even though the query is using <literal>*</literal> and could return more than the three listed columns."
+msgid "This will return Object arrays, but now it will not use <literal>ResultSetMetadata</literal> but will instead explicitly get the ID, NAME and BIRTHDATE column as respectively a Long, String and a Short from the underlying resultset. This also means that only these three columns will be returned, even though the query is using <literal>*</literal> and could return more than the three listed columns."
 msgstr ""
 
 #. Tag: para
@@ -132,13 +132,13 @@
 #. Tag: para
 #: query_sql.xml:92
 #, no-c-format
-msgid "This is essentially the same query as before, but now <literal>ResultSetMetaData</literal> is used to decide the type of NAME and BIRTHDATE where as the type of ID is explicitly specified."
+msgid "This is essentially the same query as before, but now <literal>ResultSetMetaData</literal> is used to determine the type of NAME and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 
 #. Tag: para
 #: query_sql.xml:96
 #, no-c-format
-msgid "How the java.sql.Types returned from ResultSetMetaData is mapped to Hibernate types is controlled by the Dialect. If a specific type is not mapped or does not result in the expected type it is possible to customize it via calls to <literal>registerHibernateType</literal> in the Dialect."
+msgid "How the java.sql.Types returned from ResultSetMetaData is mapped to Hibernate types is controlled by the Dialect. If a specific type is not mapped, or does not result in the expected type, it is possible to customize it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 
 #. Tag: title
@@ -219,7 +219,7 @@
 #. Tag: para
 #: query_sql.xml:152
 #, no-c-format
-msgid "In this example the returned <literal>Cat</literal>'s will have their <literal>dog</literal> property fully initialized without any extra roundtrip to the database. Notice that we added a alias name (\"cat\") to be able to specify the target property path of the join. It is possible to do the same eager joining for collections, e.g. if the <literal>Cat</literal> had a one-to-many to <literal>Dog</literal> instead."
+msgid "In this example, the returned <literal>Cat</literal>'s will have their <literal>dog</literal> property fully initialized without any extra roundtrip to the database. Notice that you added an alias name (\"cat\") to be able to specify the target property path of the join. It is possible to do the same eager joining for collections, e.g. if the <literal>Cat</literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 
 #. Tag: programlisting
@@ -235,7 +235,7 @@
 #. Tag: para
 #: query_sql.xml:162
 #, no-c-format
-msgid "At this stage we are reaching the limits of what is possible with native queries without starting to enhance the sql queries to make them usable in Hibernate; the problems starts to arise when returning multiple entities of the same type or when the default alias/column names are not enough."
+msgid "At this stage you are reaching the limits of what is possible with native queries, without starting to enhance the sql queries to make them usable in Hibernate. Problems can arise when returning multiple entities of the same type or when the default alias/column names are not enough."
 msgstr ""
 
 #. Tag: title
@@ -247,7 +247,7 @@
 #. Tag: para
 #: query_sql.xml:172
 #, no-c-format
-msgid "Until now the result set column names are assumed to be the same as the column names specified in the mapping document. This can be problematic for SQL queries which join multiple tables, since the same column names may appear in more than one table."
+msgid "Until now, the result set column names are assumed to be the same as the column names specified in the mapping document. This can be problematic for SQL queries that join multiple tables, since the same column names can appear in more than one table."
 msgstr ""
 
 #. Tag: para
@@ -267,19 +267,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:182
+#: query_sql.xml:184
 #, no-c-format
-msgid "The intention for this query is to return two Cat instances per row, a cat and its mother. This will fail since there is a conflict of names since they are mapped to the same column names and on some databases the returned column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. which are not equal to the columns specified in the mappings (\"ID\" and \"NAME\")."
+msgid "The query was intended to return two Cat instances per row: a cat and its mother. The query will, however, fail because there is a conflict of names; the instances are mapped to the same column names. Also, on some databases the returned column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. which are not equal to the columns specified in the mappings (\"ID\" and \"NAME\")."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:189
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
       "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS m WHERE c.MOTHER_ID = c.ID\")\n"
@@ -289,25 +289,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:198
+#: query_sql.xml:202
 #, no-c-format
 msgid "the SQL query string, with placeholders for Hibernate to inject column aliases"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:203
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:207
+#: query_sql.xml:211
 #, no-c-format
-msgid "The {cat.*} and {mother.*} notation used above is a shorthand for \"all properties\". Alternatively, you may list the columns explicitly, but even in this case we let Hibernate inject the SQL column aliases for each property. The placeholder for a column alias is just the property name qualified by the table alias. In the following example, we retrieve Cats and their mothers from a different table (cat_log) to the one declared in the mapping metadata. Notice that we may even use the property aliases in the where clause if we like."
+msgid "The {cat.*} and {mother.*} notation used above is a shorthand for \"all properties\". Alternatively, you can list the columns explicitly, but even in this case Hibernate injects the SQL column aliases for each property. The placeholder for a column alias is just the property name qualified by the table alias. In the following example, you retrieve Cats and their mothers from a different table (cat_log) to the one declared in the mapping metadata. You can even use the property aliases in the where clause."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:216
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
       "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -321,235 +321,235 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:219
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:221
+#: query_sql.xml:225
 #, no-c-format
-msgid "For most cases the above alias injection is needed, but for queries relating to more complex mappings like composite properties, inheritance discriminators, collections etc. there are some specific aliases to use to allow Hibernate to inject the proper aliases."
+msgid "In most cases the above alias injection is needed. For queries relating to more complex mappings, like composite properties, inheritance discriminators, collections etc., you can use specific aliases that allow Hibernate to inject the proper aliases."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:226
+#: query_sql.xml:230
 #, no-c-format
-msgid "The following table shows the different possibilities of using the alias injection. Note: the alias names in the result are examples, each alias will have a unique and probably different name when used."
+msgid "The following table shows the different ways you can use the alias injection. Please note that the alias names in the result are simply examples; each alias will have a unique and probably different name when used."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:232
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:243
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:245
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:247
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:253
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:255
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:257
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:261
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:263
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:265
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:280 query_sql.xml:328
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:286
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:304
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:310
+#: query_sql.xml:314
 #, no-c-format
-msgid "roperty of the element in the collection"
+msgid "property of the element in the collection"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:312
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:314
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:318
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:320
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:322
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr ""
 
 #. Tag: entry
-#: query_sql.xml:326
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr ""
 
 #. Tag: literal
-#: query_sql.xml:330
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:339
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:341
+#: query_sql.xml:345
 #, no-c-format
-msgid "It is possible to apply a ResultTransformer to native sql queries. Allowing it to e.g. return non-managed entities."
+msgid "It is possible to apply a ResultTransformer to native SQL queries, allowing it to return non-managed entities."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:343
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
       "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -557,43 +557,43 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:353
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:357
+#: query_sql.xml:361
 #, no-c-format
 msgid "The above query will return a list of <literal>CatDTO</literal> which has been instantiated and injected the values of NAME and BIRTHNAME into its corresponding properties or fields."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:364
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:366
+#: query_sql.xml:370
 #, no-c-format
-msgid "Native sql queries which query for entities that is mapped as part of an inheritance must include all properties for the baseclass and all it subclasses."
+msgid "Native SQL queries which query for entities that are mapped as part of an inheritance must include all properties for the baseclass and all its subclasses."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:372
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:374
+#: query_sql.xml:378
 #, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
       "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME like ?\").addEntity(Cat.class);\n"
@@ -604,19 +604,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:385
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:387
+#: query_sql.xml:391
 #, no-c-format
-msgid "Named SQL queries may be defined in the mapping document and called in exactly the same way as a named HQL query. In this case, we do <emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
+msgid "Named SQL queries can be defined in the mapping document and called in exactly the same way as a named HQL query. In this case, you do <emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:392
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"persons\">\n"
@@ -630,7 +630,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:394
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
       "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -640,13 +640,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:396
+#: query_sql.xml:400
 #, no-c-format
-msgid "The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> elements are used to join associations and define queries which initialize collections, respectively."
+msgid "The <literal>&lt;return-join&gt;</literal> element is use to join associations and the <literal>&lt;load-collection&gt;</literal> element is used to define queries which initialize collections,"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:401
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -667,13 +667,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:403
+#: query_sql.xml:406
 #, no-c-format
 msgid "A named SQL query may return a scalar value. You must declare the column alias and Hibernate type using the <literal>&lt;return-scalar&gt;</literal> element:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:407
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -686,13 +686,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:409
+#: query_sql.xml:412
 #, no-c-format
-msgid "You can externalize the resultset mapping informations in a <literal>&lt;resultset&gt;</literal> element to either reuse them across several named queries or through the <literal>setResultSetMapping()</literal> API."
+msgid "You can externalize the resultset mapping information in a <literal>&lt;resultset&gt;</literal> element which will allow you to either reuse them across several named queries or through the <literal>setResultSetMapping()</literal> API."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:414
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
       "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -716,13 +716,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:416
+#: query_sql.xml:419
 #, no-c-format
-msgid "You can alternatively use the resultset mapping information in your hbm files directly in java code."
+msgid "You can, alternatively, use the resultset mapping information in your hbm files directly in java code."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:419
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
       "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -733,19 +733,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:422
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:425
+#: query_sql.xml:428
 #, no-c-format
-msgid "With <literal>&lt;return-property&gt;</literal> you can explicitly tell Hibernate what column aliases to use, instead of using the <literal>{}</literal>-syntax to let Hibernate inject its own aliases."
+msgid "You can explicitly tell Hibernate what column aliases to use with <literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:430
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -763,13 +763,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:432
+#: query_sql.xml:435
 #, no-c-format
-msgid "<literal>&lt;return-property&gt;</literal> also works with multiple columns. This solves a limitation with the <literal>{}</literal>-syntax which can not allow fine grained control of multi-column properties."
+msgid "<literal>&lt;return-property&gt;</literal> also works with multiple columns. This solves a limitation with the <literal>{}</literal>-syntax which cannot allow fine grained control of multi-column properties."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:437
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -790,31 +790,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:439
+#: query_sql.xml:442
 #, no-c-format
-msgid "Notice that in this example we used <literal>&lt;return-property&gt;</literal> in combination with the <literal>{}</literal>-syntax for injection. Allowing users to choose how they want to refer column and properties."
+msgid "In this example <literal>&lt;return-property&gt;</literal> was used in combination with the <literal>{}</literal>-syntax for injection. This allows users to choose how they want to refer column and properties."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:444
+#: query_sql.xml:447
 #, no-c-format
 msgid "If your mapping has a discriminator you must use <literal>&lt;return-discriminator&gt;</literal> to specify the discriminator column."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:450
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:452
+#: query_sql.xml:455
 #, no-c-format
-msgid "Hibernate 3 introduces support for queries via stored procedures and functions. Most of the following documentation is equivalent for both. The stored procedure/function must return a resultset as the first out-parameter to be able to work with Hibernate. An example of such a stored function in Oracle 9 and higher is as follows:"
+msgid "Hibernate3 provides support for queries via stored procedures and functions. Most of the following documentation is equivalent for both. The stored procedure/function must return a resultset as the first out-parameter to be able to work with Hibernate. An example of such a stored function in Oracle 9 and higher is as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:458
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
       "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -832,13 +832,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:460
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:463
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -859,79 +859,79 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:465
+#: query_sql.xml:468
 #, no-c-format
-msgid "Notice stored procedures currently only return scalars and entities. <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are not supported."
+msgid "Stored procedures currently only return scalars and entities. <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are not supported."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:470
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:472
+#: query_sql.xml:475
 #, no-c-format
-msgid "To use stored procedures with Hibernate the procedures/functions have to follow some rules. If they do not follow those rules they are not usable with Hibernate. If you still want to use these procedures you have to execute them via <literal>session.connection()</literal>. The rules are different for each database, since database vendors have different stored procedure semantics/syntax."
+msgid "You cannot use stored procedures with Hibernate unless you follow some procedure/function rules. If they do not follow those rules they are not usable with Hibernate. If you still want to use these procedures you have to execute them via <literal>session.connection()</literal>. The rules are different for each database, since database vendors have different stored procedure semantics/syntax."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:479
+#: query_sql.xml:482
 #, no-c-format
-msgid "Stored procedure queries can't be paged with <literal>setFirstResult()/setMaxResults()</literal>."
+msgid "Stored procedure queries cannot be paged with <literal>setFirstResult()/setMaxResults()</literal>."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:482
+#: query_sql.xml:485
 #, no-c-format
-msgid "Recommended call form is standard SQL92: <literal>{ ? = call functionName(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;parameters&gt;}</literal>. Native call syntax is not supported."
+msgid "The recommended call form is standard SQL92: <literal>{ ? = call functionName(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:487
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:491
+#: query_sql.xml:494
 #, no-c-format
-msgid "A function must return a result set. The first parameter of a procedure must be an <literal>OUT</literal> that returns a result set. This is done by using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle you need to define a <literal>REF CURSOR</literal> type, see Oracle literature."
+msgid "A function must return a result set. The first parameter of a procedure must be an <literal>OUT</literal> that returns a result set. This is done by using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle you need to define a <literal>REF CURSOR</literal> type. See Oracle literature for further information."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:504
+#: query_sql.xml:507
 #, no-c-format
-msgid "The procedure must return a result set. Note that since these servers can/will return multiple result sets and update counts, Hibernate will iterate the results and take the first result that is a result set as its return value. Everything else will be discarded."
+msgid "The procedure must return a result set. Note that since these servers can return multiple result sets and update counts, Hibernate will iterate the results and take the first result that is a result set as its return value. Everything else will be discarded."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:512
+#: query_sql.xml:515
 #, no-c-format
 msgid "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it will probably be more efficient, but this is not a requirement."
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:522
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:524
+#: query_sql.xml:527
 #, no-c-format
 msgid "Hibernate3 can use custom SQL statements for create, update, and delete operations. The class and collection persisters in Hibernate already contain a set of configuration time generated strings (insertsql, deletesql, updatesql etc.). The mapping tags <literal>&lt;sql-insert&gt;</literal>, <literal>&lt;sql-delete&gt;</literal>, and <literal>&lt;sql-update&gt;</literal> override these strings:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:532
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -946,19 +946,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:534
+#: query_sql.xml:537
 #, no-c-format
-msgid "The SQL is directly executed in your database, so you are free to use any dialect you like. This will of course reduce the portability of your mapping if you use database specific SQL."
+msgid "The SQL is directly executed in your database, so you can use any dialect you like. This will reduce the portability of your mapping if you use database specific SQL."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:538
+#: query_sql.xml:541
 #, no-c-format
 msgid "Stored procedures are supported if the <literal>callable</literal> attribute is set:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:541
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -973,25 +973,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:543
+#: query_sql.xml:546
 #, no-c-format
-msgid "The order of the positional parameters are currently vital, as they must be in the same sequence as Hibernate expects them."
+msgid "The order of the positional parameters is vital, as they must be in the same sequence as Hibernate expects them."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
+#: query_sql.xml:549
 #, no-c-format
-msgid "You can see the expected order by enabling debug logging for the <literal>org.hibernate.persister.entity</literal> level. With this level enabled Hibernate will print out the static SQL that is used to create, update, delete etc. entities. (To see the expected sequence, remember to not include your custom SQL in the mapping files as that will override the Hibernate generated static sql.)"
+msgid "You can view the expected order by enabling debug logging for the <literal>org.hibernate.persister.entity</literal> level. With this level enabled, Hibernate will print out the static SQL that is used to create, update, delete etc. entities. To view the expected sequence, do not include your custom SQL in the mapping files, as this will override the Hibernate generated static SQL."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:553
+#: query_sql.xml:556
 #, no-c-format
-msgid "The stored procedures are in most cases (read: better do it than not) required to return the number of rows inserted/updated/deleted, as Hibernate has some runtime checks for the success of the statement. Hibernate always registers the first statement parameter as a numeric output parameter for the CUD operations:"
+msgid "The stored procedures are in most cases required to return the number of rows inserted, updated and deleted, as Hibernate has some runtime checks for the success of the statement. Hibernate always registers the first statement parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:559
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
       "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN VARCHAR2)\n"
@@ -1010,19 +1010,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:563
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:565
+#: query_sql.xml:568
 #, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:568
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"person\">\n"
@@ -1035,13 +1035,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:570
+#: query_sql.xml:573
 #, no-c-format
-msgid "This is just a named query declaration, as discussed earlier. You may reference this named query in a class mapping:"
+msgid "This is just a named query declaration, as discussed earlier. You can reference this named query in a class mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:573
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Person\">\n"
@@ -1054,19 +1054,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:575
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:577
+#: query_sql.xml:580
 #, no-c-format
-msgid "You may even define a query for collection loading:"
+msgid "You can even define a query for collection loading:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:579
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1077,7 +1077,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:581
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1090,13 +1090,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:583
+#: query_sql.xml:586
 #, no-c-format
-msgid "You could even define an entity loader that loads a collection by join fetching:"
+msgid "You can also define an entity loader that loads a collection by join fetching:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:586
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
       "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #: session_api.xml:31
 #, no-c-format
-msgid "Hibernate is a full object/relational mapping solution that not only shields the developer from the details of the underlying database management system, but also offers <emphasis>state management</emphasis> of objects. This is, contrary to the management of SQL <literal>statements</literal> in common JDBC/SQL persistence layers, a very natural object-oriented view of persistence in Java applications."
+msgid "Hibernate is a full object/relational mapping solution that not only shields the developer from the details of the underlying database management system, but also offers <emphasis>state management</emphasis> of objects. This is, contrary to the management of SQL <literal>statements</literal> in common JDBC/SQL persistence layers, a natural object-oriented view of persistence in Java applications."
 msgstr ""
 
 #. Tag: para
@@ -47,25 +47,25 @@
 #. Tag: para
 #: session_api.xml:56
 #, no-c-format
-msgid "<emphasis>Transient</emphasis> - an object is transient if it has just been instantiated using the <literal>new</literal> operator, and it is not associated with a Hibernate <literal>Session</literal>. It has no persistent representation in the database and no identifier value has been assigned. Transient instances will be destroyed by the garbage collector if the application doesn't hold a reference anymore. Use the Hibernate <literal>Session</literal> to make an object persistent (and let Hibernate take care of the SQL statements that need to be executed for this transition)."
+msgid "<emphasis>Transient</emphasis> - an object is transient if it has just been instantiated using the <literal>new</literal> operator, and it is not associated with a Hibernate <literal>Session</literal>. It has no persistent representation in the database and no identifier value has been assigned. Transient instances will be destroyed by the garbage collector if the application does not hold a reference anymore. Use the Hibernate <literal>Session</literal> to make an object persistent (and let Hibernate take care of the SQL statements that need to be executed for this transition)."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:68
 #, no-c-format
-msgid "<emphasis>Persistent</emphasis> - a persistent instance has a representation in the database and an identifier value. It might just have been saved or loaded, however, it is by definition in the scope of a <literal>Session</literal>. Hibernate will detect any changes made to an object in persistent state and synchronize the state with the database when the unit of work completes. Developers don't execute manual <literal>UPDATE</literal> statements, or <literal>DELETE</literal> statements when an object should be made transient."
+msgid "<emphasis>Persistent</emphasis> - a persistent instance has a representation in the database and an identifier value. It might just have been saved or loaded, however, it is by definition in the scope of a <literal>Session</literal>. Hibernate will detect any changes made to an object in persistent state and synchronize the state with the database when the unit of work completes. Developers do not execute manual <literal>UPDATE</literal> statements, or <literal>DELETE</literal> statements when an object should be made transient."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:79
 #, no-c-format
-msgid "<emphasis>Detached</emphasis> - a detached instance is an object that has been persistent, but its <literal>Session</literal> has been closed. The reference to the object is still valid, of course, and the detached instance might even be modified in this state. A detached instance can be reattached to a new <literal>Session</literal> at a later point in time, making it (and all the modifications) persistent again. This feature enables a programming model for long running units of work that require user think-time. We call them <emphasis>application transactions</emphasis>, i.e. a unit of work from the point of view of the user."
+msgid "<emphasis>Detached</emphasis> - a detached instance is an object that has been persistent, but its <literal>Session</literal> has been closed. The reference to the object is still valid, of course, and the detached instance might even be modified in this state. A detached instance can be reattached to a new <literal>Session</literal> at a later point in time, making it (and all the modifications) persistent again. This feature enables a programming model for long running units of work that require user think-time. We call them <emphasis>application transactions</emphasis>, i.e., a unit of work from the point of view of the user."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:93
 #, no-c-format
-msgid "We'll now discuss the states and state transitions (and the Hibernate methods that trigger a transition) in more detail."
+msgid "We will now discuss the states and state transitions (and the Hibernate methods that trigger a transition) in more detail."
 msgstr ""
 
 #. Tag: title
@@ -94,13 +94,13 @@
 #. Tag: para
 #: session_api.xml:112
 #, no-c-format
-msgid "If <literal>Cat</literal> has a generated identifier, the identifier is generated and assigned to the <literal>cat</literal> when <literal>save()</literal> is called. If <literal>Cat</literal> has an <literal>assigned</literal> identifier, or a composite key, the identifier should be assigned to the <literal>cat</literal> instance before calling <literal>save()</literal>. You may also use <literal>persist()</literal> instead of <literal>save()</literal>, with the semantics defined in the EJB3 early draft."
+msgid "If <literal>Cat</literal> has a generated identifier, the identifier is generated and assigned to the <literal>cat</literal> when <literal>save()</literal> is called. If <literal>Cat</literal> has an <literal>assigned</literal> identifier, or a composite key, the identifier should be assigned to the <literal>cat</literal> instance before calling <literal>save()</literal>. You can also use <literal>persist()</literal> instead of <literal>save()</literal>, with the semantics defined in the EJB3 early draft."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:124
 #, no-c-format
-msgid "<literal>persist()</literal> makes a transient instance persistent. However, it doesn't guarantee that the identifier value will be assigned to the persistent instance immediately, the assignment might happen at flush time. <literal>persist()</literal> also guarantees that it will not execute an <literal>INSERT</literal> statement if it is called outside of transaction boundaries. This is useful in long-running conversations with an extended Session/persistence context."
+msgid "<literal>persist()</literal> makes a transient instance persistent. However, it does not guarantee that the identifier value will be assigned to the persistent instance immediately, the assignment might happen at flush time. <literal>persist()</literal> also guarantees that it will not execute an <literal>INSERT</literal> statement if it is called outside of transaction boundaries. This is useful in long-running conversations with an extended Session/persistence context."
 msgstr ""
 
 #. Tag: para
@@ -112,7 +112,7 @@
 #. Tag: para
 #: session_api.xml:145
 #, no-c-format
-msgid "Alternatively, you may assign the identifier using an overloaded version of <literal>save()</literal>."
+msgid "Alternatively, you can assign the identifier using an overloaded version of <literal>save()</literal>."
 msgstr ""
 
 #. Tag: programlisting
@@ -131,13 +131,13 @@
 #. Tag: para
 #: session_api.xml:152
 #, no-c-format
-msgid "If the object you make persistent has associated objects (e.g. the <literal>kittens</literal> collection in the previous example), these objects may be made persistent in any order you like unless you have a <literal>NOT NULL</literal> constraint upon a foreign key column. There is never a risk of violating foreign key constraints. However, you might violate a <literal>NOT NULL</literal> constraint if you <literal>save()</literal> the objects in the wrong order."
+msgid "If the object you make persistent has associated objects (e.g. the <literal>kittens</literal> collection in the previous example), these objects can be made persistent in any order you like unless you have a <literal>NOT NULL</literal> constraint upon a foreign key column. There is never a risk of violating foreign key constraints. However, you might violate a <literal>NOT NULL</literal> constraint if you <literal>save()</literal> the objects in the wrong order."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:162
 #, no-c-format
-msgid "Usually you don't bother with this detail, as you'll very likely use Hibernate's <emphasis>transitive persistence</emphasis> feature to save the associated objects automatically. Then, even <literal>NOT NULL</literal> constraint violations don't occur - Hibernate will take care of everything. Transitive persistence is discussed later in this chapter."
+msgid "Usually you do not bother with this detail, as you will normally use Hibernate's <emphasis>transitive persistence</emphasis> feature to save the associated objects automatically. Then, even <literal>NOT NULL</literal> constraint violations do not occur - Hibernate will take care of everything. Transitive persistence is discussed later in this chapter."
 msgstr ""
 
 #. Tag: title
@@ -149,7 +149,7 @@
 #. Tag: para
 #: session_api.xml:175
 #, no-c-format
-msgid "The <literal>load()</literal> methods of <literal>Session</literal> gives you a way to retrieve a persistent instance if you already know its identifier. <literal>load()</literal> takes a class object and will load the state into a newly instantiated instance of that class, in persistent state."
+msgid "The <literal>load()</literal> methods of <literal>Session</literal> provide a way of retrieving a persistent instance if you know its identifier. <literal>load()</literal> takes a class object and loads the state into a newly instantiated instance of that class in a persistent state."
 msgstr ""
 
 #. Tag: programlisting
@@ -186,13 +186,13 @@
 #. Tag: para
 #: session_api.xml:192
 #, no-c-format
-msgid "Note that <literal>load()</literal> will throw an unrecoverable exception if there is no matching database row. If the class is mapped with a proxy, <literal>load()</literal> just returns an uninitialized proxy and does not actually hit the database until you invoke a method of the proxy. This behaviour is very useful if you wish to create an association to an object without actually loading it from the database. It also allows multiple instances to be loaded as a batch if <literal>batch-size</literal> is defined for the class mapping."
+msgid "Be aware that <literal>load()</literal> will throw an unrecoverable exception if there is no matching database row. If the class is mapped with a proxy, <literal>load()</literal> just returns an uninitialized proxy and does not actually hit the database until you invoke a method of the proxy. This is useful if you wish to create an association to an object without actually loading it from the database. It also allows multiple instances to be loaded as a batch if <literal>batch-size</literal> is defined for the class mapping."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:203
 #, no-c-format
-msgid "If you are not certain that a matching row exists, you should use the <literal>get()</literal> method, which hits the database immediately and returns null if there is no matching row."
+msgid "If you are not certain that a matching row exists, you should use the <literal>get()</literal> method which hits the database immediately and returns null if there is no matching row."
 msgstr ""
 
 #. Tag: programlisting
@@ -210,7 +210,7 @@
 #. Tag: para
 #: session_api.xml:211
 #, no-c-format
-msgid "You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</literal>, using a <literal>LockMode</literal>. See the API documentation for more information."
+msgid "You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</literal>, using a <literal>LockMode</literal>. See the API documentation for more information."
 msgstr ""
 
 #. Tag: programlisting
@@ -222,7 +222,7 @@
 #. Tag: para
 #: session_api.xml:218
 #, no-c-format
-msgid "Note that any associated instances or contained collections are <emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you decide to specify <literal>lock</literal> or <literal>all</literal> as a cascade style for the association."
+msgid "Any associated instances or contained collections will <emphasis>not</emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to specify <literal>lock</literal> or <literal>all</literal> as a cascade style for the association."
 msgstr ""
 
 #. Tag: para
@@ -243,7 +243,7 @@
 #. Tag: para
 #: session_api.xml:233
 #, no-c-format
-msgid "An important question usually appears at this point: How much does Hibernate load from the database and how many SQL <literal>SELECT</literal>s will it use? This depends on the <emphasis>fetching strategy</emphasis> and is explained in <xref linkend=\"performance-fetching\"/>."
+msgid "How much does Hibernate load from the database and how many SQL <literal>SELECT</literal>s will it use? This depends on the <emphasis>fetching strategy</emphasis>. This is explained in <xref linkend=\"performance-fetching\"/>."
 msgstr ""
 
 #. Tag: title
@@ -255,7 +255,7 @@
 #. Tag: para
 #: session_api.xml:245
 #, no-c-format
-msgid "If you don't know the identifiers of the objects you are looking for, you need a query. Hibernate supports an easy-to-use but powerful object oriented query language (HQL). For programmatic query creation, Hibernate supports a sophisticated Criteria and Example query feature (QBC and QBE). You may also express your query in the native SQL of your database, with optional support from Hibernate for result set conversion into objects."
+msgid "If you do not know the identifiers of the objects you are looking for, you need a query. Hibernate supports an easy-to-use but powerful object oriented query language (HQL). For programmatic query creation, Hibernate supports a sophisticated Criteria and Example query feature (QBC and QBE). You can also express your query in the native SQL of your database, with optional support from Hibernate for result set conversion into objects."
 msgstr ""
 
 #. Tag: title
@@ -302,7 +302,7 @@
 #. Tag: para
 #: session_api.xml:266
 #, no-c-format
-msgid "A query is usually executed by invoking <literal>list()</literal>, the result of the query will be loaded completely into a collection in memory. Entity instances retrieved by a query are in persistent state. The <literal>uniqueResult()</literal> method offers a shortcut if you know your query will only return a single object. Note that queries that make use of eager fetching of collections usually return duplicates of the root objects (but with their collections initialized). You can filter these duplicates simply through a <literal>Set</literal>."
+msgid "A query is usually executed by invoking <literal>list()</literal>. The result of the query will be loaded completely into a collection in memory. Entity instances retrieved by a query are in a persistent state. The <literal>uniqueResult()</literal> method offers a shortcut if you know your query will only return a single object. Queries that make use of eager fetching of collections usually return duplicates of the root objects, but with their collections initialized. You can filter these duplicates through a <literal>Set</literal>."
 msgstr ""
 
 #. Tag: title
@@ -314,7 +314,7 @@
 #. Tag: para
 #: session_api.xml:280
 #, no-c-format
-msgid "Occasionally, you might be able to achieve better performance by executing the query using the <literal>iterate()</literal> method. This will only usually be the case if you expect that the actual entity instances returned by the query will already be in the session or second-level cache. If they are not already cached, <literal>iterate()</literal> will be slower than <literal>list()</literal> and might require many database hits for a simple query, usually <emphasis>1</emphasis> for the initial select which only returns identifiers, and <emphasis>n</emphasis> additional selects to initialize the actual instances."
+msgid "Occasionally, you might be able to achieve better performance by executing the query using the <literal>iterate()</literal> method. This will usually be the case if you expect that the actual entity instances returned by the query will already be in the session or second-level cache. If they are not already cached, <literal>iterate()</literal> will be slower than <literal>list()</literal> and might require many database hits for a simple query, usually <emphasis>1</emphasis> for the initial select which only returns identifiers, and <emphasis>n</emphasis> additional selects to initialize the actual instances."
 msgstr ""
 
 #. Tag: programlisting
@@ -344,7 +344,7 @@
 #. Tag: para
 #: session_api.xml:298
 #, no-c-format
-msgid "Hibernate queries sometimes return tuples of objects, in which case each tuple is returned as an array:"
+msgid "Hibernate queries sometimes return tuples of objects. Each tuple is returned as an array:"
 msgstr ""
 
 #. Tag: programlisting
@@ -373,7 +373,7 @@
 #. Tag: para
 #: session_api.xml:310
 #, no-c-format
-msgid "Queries may specify a property of a class in the <literal>select</literal> clause. They may even call SQL aggregate functions. Properties or aggregates are considered \"scalar\" results (and not entities in persistent state)."
+msgid "Queries can specify a property of a class in the <literal>select</literal> clause. They can even call SQL aggregate functions. Properties or aggregates are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 
 #. Tag: programlisting
@@ -404,7 +404,7 @@
 #. Tag: para
 #: session_api.xml:323
 #, no-c-format
-msgid "Methods on <literal>Query</literal> are provided for binding values to named parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters are identifiers of the form <literal>:name</literal> in the query string. The advantages of named parameters are:"
+msgid "Methods on <literal>Query</literal> are provided for binding values to named parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters are identifiers of the form <literal>:name</literal> in the query string. The advantages of named parameters are as follows:"
 msgstr ""
 
 #. Tag: para
@@ -416,7 +416,7 @@
 #. Tag: para
 #: session_api.xml:339
 #, no-c-format
-msgid "they may occur multiple times in the same query"
+msgid "they can occur multiple times in the same query"
 msgstr ""
 
 #. Tag: para
@@ -467,7 +467,7 @@
 #. Tag: para
 #: session_api.xml:361
 #, no-c-format
-msgid "If you need to specify bounds upon your result set (the maximum number of rows you want to retrieve and / or the first row you want to retrieve) you should use methods of the <literal>Query</literal> interface:"
+msgid "If you need to specify bounds upon your result set, that is, the maximum number of rows you want to retrieve and/or the first row you want to retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 
 #. Tag: programlisting
@@ -495,7 +495,7 @@
 #. Tag: para
 #: session_api.xml:379
 #, no-c-format
-msgid "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the <literal>Query</literal> interface may be used to obtain a <literal>ScrollableResults</literal> object, which allows flexible navigation of the query results."
+msgid "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the <literal>Query</literal> interface can be used to obtain a <literal>ScrollableResults</literal> object that allows flexible navigation of the query results."
 msgstr ""
 
 #. Tag: programlisting
@@ -528,7 +528,7 @@
 #. Tag: para
 #: session_api.xml:388
 #, no-c-format
-msgid "Note that an open database connection (and cursor) is required for this functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult()</literal> if you need offline pagination functionality."
+msgid "Note that an open database connection and cursor is required for this functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult()</literal> if you need offline pagination functionality."
 msgstr ""
 
 #. Tag: title
@@ -540,7 +540,7 @@
 #. Tag: para
 #: session_api.xml:399
 #, no-c-format
-msgid "You may also define named queries in the mapping document. (Remember to use a <literal>CDATA</literal> section if your query contains characters that could be interpreted as markup.)"
+msgid "You can also define named queries in the mapping document. Remember to use a <literal>CDATA</literal> section if your query contains characters that could be interpreted as markup."
 msgstr ""
 
 #. Tag: programlisting
@@ -573,13 +573,13 @@
 #. Tag: para
 #: session_api.xml:413
 #, no-c-format
-msgid "Note that the actual program code is independent of the query language that is used, you may also define native SQL queries in metadata, or migrate existing queries to Hibernate by placing them in mapping files."
+msgid "The actual program code is independent of the query language that is used. You can also define native SQL queries in metadata, or migrate existing queries to Hibernate by placing them in mapping files."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:419
 #, no-c-format
-msgid "Also note that a query declaration inside a <literal>&lt;hibernate-mapping&gt;</literal> element requires a global unique name for the query, while a query declaration inside a <literal>&lt;class&gt;</literal> element is made unique automatically by prepending the fully qualified name of the class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+msgid "Also note that a query declaration inside a <literal>&lt;hibernate-mapping&gt;</literal> element requires a global unique name for the query, while a query declaration inside a <literal>&lt;class&gt;</literal> element is made unique automatically by prepending the fully qualified name of the class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 
 #. Tag: title
@@ -591,7 +591,7 @@
 #. Tag: para
 #: session_api.xml:433
 #, no-c-format
-msgid "A collection <emphasis>filter</emphasis> is a special type of query that may be applied to a persistent collection or array. The query string may refer to <literal>this</literal>, meaning the current collection element."
+msgid "A collection <emphasis>filter</emphasis> is a special type of query that can be applied to a persistent collection or array. The query string can refer to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 
 #. Tag: programlisting
@@ -609,13 +609,13 @@
 #. Tag: para
 #: session_api.xml:441
 #, no-c-format
-msgid "The returned collection is considered a bag, and it's a copy of the given collection. The original collection is not modified (this is contrary to the implication of the name \"filter\", but consistent with expected behavior)."
+msgid "The returned collection is considered a bag that is a copy of the given collection. The original collection is not modified. This is contrary to the implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 
 #. Tag: para
 #: session_api.xml:447
 #, no-c-format
-msgid "Observe that filters do not require a <literal>from</literal> clause (though they may have one if required). Filters are not limited to returning the collection elements themselves."
+msgid "Observe that filters do not require a <literal>from</literal> clause, although they can have one if required. Filters are not limited to returning the collection elements themselves."
 msgstr ""
 
 #. Tag: programlisting
@@ -631,7 +631,7 @@
 #. Tag: para
 #: session_api.xml:454
 #, no-c-format
-msgid "Even an empty filter query is useful, e.g. to load a subset of elements in a huge collection:"
+msgid "Even an empty filter query is useful, e.g. to load a subset of elements in a large collection:"
 msgstr ""
 
 #. Tag: programlisting
@@ -653,7 +653,7 @@
 #. Tag: para
 #: session_api.xml:466
 #, no-c-format
-msgid "HQL is extremely powerful but some developers prefer to build queries dynamically, using an object-oriented API, rather than building query strings. Hibernate provides an intuitive <literal>Criteria</literal> query API for these cases:"
+msgid "HQL is extremely powerful, but some developers prefer to build queries dynamically using an object-oriented API, rather than building query strings. Hibernate provides an intuitive <literal>Criteria</literal> query API for these cases:"
 msgstr ""
 
 #. Tag: programlisting
@@ -681,7 +681,7 @@
 #. Tag: para
 #: session_api.xml:484
 #, no-c-format
-msgid "You may express a query in SQL, using <literal>createSQLQuery()</literal> and let Hibernate take care of the mapping from result sets to objects. Note that you may at any time call <literal>session.connection()</literal> and use the JDBC <literal>Connection</literal> directly. If you chose to use the Hibernate API, you must enclose SQL aliases in braces:"
+msgid "You can express a query in SQL, using <literal>createSQLQuery()</literal> and let Hibernate manage the mapping from result sets to objects. You can at any time call <literal>session.connection()</literal> and use the JDBC <literal>Connection</literal> directly. If you choose to use the Hibernate API, you must enclose SQL aliases in braces:"
 msgstr ""
 
 #. Tag: programlisting
@@ -708,7 +708,7 @@
 #. Tag: para
 #: session_api.xml:496
 #, no-c-format
-msgid "SQL queries may contain named and positional parameters, just like Hibernate queries. More information about native SQL queries in Hibernate can be found in <xref linkend=\"querysql\"/>."
+msgid "SQL queries can contain named and positional parameters, just like Hibernate queries. More information about native SQL queries in Hibernate can be found in <xref linkend=\"querysql\"/>."
 msgstr ""
 
 #. Tag: title
@@ -720,7 +720,7 @@
 #. Tag: para
 #: session_api.xml:509
 #, no-c-format
-msgid "<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, saved, created or queried by the <literal>Session</literal>) may be manipulated by the application and any changes to persistent state will be persisted when the <literal>Session</literal> is <emphasis>flushed</emphasis> (discussed later in this chapter). There is no need to call a particular method (like <literal>update()</literal>, which has a different purpose) to make your modifications persistent. So the most straightforward way to update the state of an object is to <literal>load()</literal> it, and then manipulate it directly, while the <literal>Session</literal> is open:"
+msgid "<emphasis>Transactional persistent instances</emphasis> (i.e. objects loaded, saved, created or queried by the <literal>Session</literal>) can be manipulated by the application, and any changes to persistent state will be persisted when the <literal>Session</literal> is <emphasis>flushed</emphasis>. This is discussed later in this chapter. There is no need to call a particular method (like <literal>update()</literal>, which has a different purpose) to make your modifications persistent. The most straightforward way to update the state of an object is to <literal>load()</literal> it and then manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 
 #. Tag: programlisting
@@ -735,35 +735,35 @@
 #. Tag: para
 #: session_api.xml:522
 #, no-c-format
-msgid "Sometimes this programming model is inefficient since it would require both an SQL <literal>SELECT</literal> (to load an object) and an SQL <literal>UPDATE</literal> (to persist its updated state) in the same session. Therefore Hibernate offers an alternate approach, using detached instances."
+msgid "Sometimes this programming model is inefficient, as it requires in the same session both an SQL <literal>SELECT</literal> to load an object and an SQL <literal>UPDATE</literal> to persist its updated state. Hibernate offers an alternate approach by using detached instances."
 msgstr ""
 
-#. Tag: emphasis
-#: session_api.xml:530
+#. Tag: para
+#: session_api.xml:529
 #, no-c-format
-msgid "Note that Hibernate does not offer its own API for direct execution of <literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate is a <emphasis>state management</emphasis> service, you don't have to think in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for executing SQL statements, you can get a JDBC <literal>Connection</literal> at any time by calling <literal>session.connection()</literal>. Furthermore, the notion of mass operations conflicts with object/relational mapping for online transaction processing-oriented applications. Future versions of Hibernate may however provide special mass operation functions. See <xref linkend=\"batch\"/> for some possible batch operation tricks."
+msgid "Hibernate does not offer its own API for direct execution of <literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate is a <emphasis>state management</emphasis> service, you do not have to think in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for executing SQL statements, you can get a JDBC <literal>Connection</literal> at any time by calling <literal>session.connection()</literal>. Furthermore, the notion of mass operations conflicts with object/relational mapping for online transaction processing-oriented applications. Future versions of Hibernate can, however, provide special mass operation functions. See <xref linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:545
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:547
+#: session_api.xml:548
 #, no-c-format
 msgid "Many applications need to retrieve an object in one transaction, send it to the UI layer for manipulation, then save the changes in a new transaction. Applications that use this kind of approach in a high-concurrency environment usually use versioned data to ensure isolation for the \"long\" unit of work."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:554
+#: session_api.xml:555
 #, no-c-format
 msgid "Hibernate supports this model by providing for reattachment of detached instances using the <literal>Session.update()</literal> or <literal>Session.merge()</literal> methods:"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:560
+#: session_api.xml:561
 #, no-c-format
 msgid ""
       "<![CDATA[// in the first session\n"
@@ -780,31 +780,31 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:562
+#: session_api.xml:563
 #, no-c-format
 msgid "If the <literal>Cat</literal> with identifier <literal>catId</literal> had already been loaded by <literal>secondSession</literal> when the application tried to reattach it, an exception would have been thrown."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:568
+#: session_api.xml:569
 #, no-c-format
-msgid "Use <literal>update()</literal> if you are sure that the session does not contain an already persistent instance with the same identifier, and <literal>merge()</literal> if you want to merge your modifications at any time without consideration of the state of the session. In other words, <literal>update()</literal> is usually the first method you would call in a fresh session, ensuring that reattachment of your detached instances is the first operation that is executed."
+msgid "Use <literal>update()</literal> if you are certain that the session does not contain an already persistent instance with the same identifier. Use <literal>merge()</literal> if you want to merge your modifications at any time without consideration of the state of the session. In other words, <literal>update()</literal> is usually the first method you would call in a fresh session, ensuring that the reattachment of your detached instances is the first operation that is executed."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:577
+#: session_api.xml:578
 #, no-c-format
-msgid "The application should individually <literal>update()</literal> detached instances reachable from the given detached instance if and <emphasis>only</emphasis> if it wants their state also updated. This can be automated of course, using <emphasis>transitive persistence</emphasis>, see <xref linkend=\"objectstate-transitive\"/>."
+msgid "The application should individually <literal>update()</literal> detached instances that are reachable from the given detached instance <emphasis>only</emphasis> if it wants their state to be updated. This can be automated using <emphasis>transitive persistence</emphasis>. See <xref linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:584
+#: session_api.xml:585
 #, no-c-format
-msgid "The <literal>lock()</literal> method also allows an application to reassociate an object with a new session. However, the detached instance has to be unmodified!"
+msgid "The <literal>lock()</literal> method also allows an application to reassociate an object with a new session. However, the detached instance has to be unmodified."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:589
+#: session_api.xml:590
 #, no-c-format
 msgid ""
       "<![CDATA[//just reassociate:\n"
@@ -816,31 +816,31 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:591
+#: session_api.xml:592
 #, no-c-format
-msgid "Note that <literal>lock()</literal> can be used with various <literal>LockMode</literal>s, see the API documentation and the chapter on transaction handling for more information. Reattachment is not the only usecase for <literal>lock()</literal>."
+msgid "Note that <literal>lock()</literal> can be used with various <literal>LockMode</literal>s. See the API documentation and the chapter on transaction handling for more information. Reattachment is not the only usecase for <literal>lock()</literal>."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:598
+#: session_api.xml:599
 #, no-c-format
 msgid "Other models for long units of work are discussed in <xref linkend=\"transactions-optimistic\"/>."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:605
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:608
 #, no-c-format
 msgid "Hibernate users have requested a general purpose method that either saves a transient instance by generating a new identifier or updates/reattaches the detached instances associated with its current identifier. The <literal>saveOrUpdate()</literal> method implements this functionality."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:614
+#: session_api.xml:615
 #, no-c-format
 msgid ""
       "<![CDATA[// in the first session\n"
@@ -856,157 +856,157 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:616
+#: session_api.xml:617
 #, no-c-format
 msgid "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be confusing for new users. Firstly, so long as you are not trying to use instances from one session in another new session, you should not need to use <literal>update()</literal>, <literal>saveOrUpdate()</literal>, or <literal>merge()</literal>. Some whole applications will never use either of these methods."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:624
+#: session_api.xml:625
 #, no-c-format
 msgid "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are used in the following scenario:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:631
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:636
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:641
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:646
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:652
 #, no-c-format
 msgid "the application persists these modifications by calling <literal>update()</literal> in a second session"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:658
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:664
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:669
+#: session_api.xml:670
 #, no-c-format
 msgid "if another object associated with the session has the same identifier, throw an exception"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:675
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:680
+#: session_api.xml:681
 #, no-c-format
 msgid "if the object's identifier has the value assigned to a newly instantiated object, <literal>save()</literal> it"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:686
+#: session_api.xml:687
 #, no-c-format
-msgid "if the object is versioned (by a <literal>&lt;version&gt;</literal> or <literal>&lt;timestamp&gt;</literal>), and the version property value is the same value assigned to a newly instantiated object, <literal>save()</literal> it"
+msgid "if the object is versioned by a <literal>&lt;version&gt;</literal> or <literal>&lt;timestamp&gt;</literal>, and the version property value is the same value assigned to a newly instantiated object, <literal>save()</literal> it"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:694
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:706
+#: session_api.xml:707
 #, no-c-format
 msgid "if there is a persistent instance with the same identifier currently associated with the session, copy the state of the given object onto the persistent instance"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:713
+#: session_api.xml:714
 #, no-c-format
 msgid "if there is no persistent instance currently associated with the session, try to load it from the database, or create a new persistent instance"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:719
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:724
+#: session_api.xml:725
 #, no-c-format
 msgid "the given instance does not become associated with the session, it remains detached"
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:734
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:736
+#: session_api.xml:737
 #, no-c-format
-msgid "<literal>Session.delete()</literal> will remove an object's state from the database. Of course, your application might still hold a reference to a deleted object. It's best to think of <literal>delete()</literal> as making a persistent instance transient."
+msgid "<literal>Session.delete()</literal> will remove an object's state from the database. Your application, however, can still hold a reference to a deleted object. It is best to think of <literal>delete()</literal> as making a persistent instance, transient."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:743
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:745
+#: session_api.xml:746
 #, no-c-format
-msgid "You may delete objects in any order you like, without risk of foreign key constraint violations. It is still possible to violate a <literal>NOT NULL</literal> constraint on a foreign key column by deleting objects in the wrong order, e.g. if you delete the parent, but forget to delete the children."
+msgid "You can delete objects in any order, without risk of foreign key constraint violations. It is still possible to violate a <literal>NOT NULL</literal> constraint on a foreign key column by deleting objects in the wrong order, e.g. if you delete the parent, but forget to delete the children."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:756
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:758
+#: session_api.xml:759
 #, no-c-format
-msgid "It is occasionally useful to be able to take a graph of persistent instances and make them persistent in a different datastore, without regenerating identifier values."
+msgid "It is sometimes useful to be able to take a graph of persistent instances and make them persistent in a different datastore, without regenerating identifier values."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:764
+#: session_api.xml:765
 #, no-c-format
 msgid ""
       "<![CDATA[//retrieve a cat from one database\n"
@@ -1025,133 +1025,133 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:766
+#: session_api.xml:767
 #, no-c-format
-msgid "The <literal>ReplicationMode</literal> determines how <literal>replicate()</literal> will deal with conflicts with existing rows in the database."
+msgid "The <literal>ReplicationMode</literal> determines how <literal>replicate()</literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:773
+#: session_api.xml:774
 #, no-c-format
-msgid "<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is an existing database row with the same identifier"
+msgid "<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is an existing database row with the same identifier"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:779
+#: session_api.xml:780
 #, no-c-format
-msgid "<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing database row with the same identifier"
+msgid "<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing database row with the same identifier"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:785
+#: session_api.xml:786
 #, no-c-format
-msgid "<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there is an existing database row with the same identifier"
+msgid "<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there is an existing database row with the same identifier"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:791
+#: session_api.xml:792
 #, no-c-format
-msgid "<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its version number is earlier than the version number of the object, or ignore the object otherwise"
+msgid "<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its version number is earlier than the version number of the object, or ignore the object otherwise"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:799
+#: session_api.xml:800
 #, no-c-format
 msgid "Usecases for this feature include reconciling data entered into different database instances, upgrading system configuration information during product upgrades, rolling back changes made during non-ACID transactions and more."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:808
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:810
+#: session_api.xml:811
 #, no-c-format
-msgid "From time to time the <literal>Session</literal> will execute the SQL statements needed to synchronize the JDBC connection's state with the state of objects held in memory. This process, <emphasis>flush</emphasis>, occurs by default at the following points"
+msgid "Sometimes the <literal>Session</literal> will execute the SQL statements needed to synchronize the JDBC connection's state with the state of objects held in memory. This process, called <emphasis>flush</emphasis>, occurs by default at the following points:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:819
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:824
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:829
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:835
+#: session_api.xml:836
 #, no-c-format
-msgid "The SQL statements are issued in the following order"
+msgid "The SQL statements are issued in the following order:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:841
+#: session_api.xml:842
 #, no-c-format
-msgid "all entity insertions, in the same order the corresponding objects were saved using <literal>Session.save()</literal>"
+msgid "all entity insertions in the same order the corresponding objects were saved using <literal>Session.save()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:847
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:852
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:857
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:862
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:867
+#: session_api.xml:868
 #, no-c-format
-msgid "all entity deletions, in the same order the corresponding objects were deleted using <literal>Session.delete()</literal>"
+msgid "all entity deletions in the same order the corresponding objects were deleted using <literal>Session.delete()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:874
+#: session_api.xml:875
 #, no-c-format
-msgid "(An exception is that objects using <literal>native</literal> ID generation are inserted when they are saved.)"
+msgid "An exception is that objects using <literal>native</literal> ID generation are inserted when they are saved."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:879
+#: session_api.xml:880
 #, no-c-format
-msgid "Except when you explicity <literal>flush()</literal>, there are absolutely no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> executes the JDBC calls, only the <emphasis>order</emphasis> in which they are executed. However, Hibernate does guarantee that the <literal>Query.list(..)</literal> will never return stale data; nor will they return the wrong data."
+msgid "Except when you explicitly <literal>flush()</literal>, there are absolutely no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> executes the JDBC calls, only the <emphasis>order</emphasis> in which they are executed. However, Hibernate does guarantee that the <literal>Query.list(..)</literal> will never return stale or incorrect data."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:887
+#: session_api.xml:888
 #, no-c-format
-msgid "It is possible to change the default behavior so that flush occurs less frequently. The <literal>FlushMode</literal> class defines three different modes: only flush at commit time (and only when the Hibernate <literal>Transaction</literal> API is used), flush automatically using the explained routine, or never flush unless <literal>flush()</literal> is called explicitly. The last mode is useful for long running units of work, where a <literal>Session</literal> is kept open and disconnected for a long time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+msgid "It is possible to change the default behavior so that flush occurs less frequently. The <literal>FlushMode</literal> class defines three different modes: only flush at commit time when the Hibernate <literal>Transaction</literal> API is used, flush automatically using the explained routine, or never flush unless <literal>flush()</literal> is called explicitly. The last mode is useful for long running units of work, where a <literal>Session</literal> is kept open and disconnected for a long time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:897
+#: session_api.xml:898
 #, no-c-format
 msgid ""
       "<![CDATA[sess = sf.openSession();\n"
@@ -1171,169 +1171,169 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:899
+#: session_api.xml:900
 #, no-c-format
 msgid "During flush, an exception might occur (e.g. if a DML operation violates a constraint). Since handling exceptions involves some understanding of Hibernate's transactional behavior, we discuss it in <xref linkend=\"transactions\"/>."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:908
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:910
+#: session_api.xml:911
 #, no-c-format
 msgid "It is quite cumbersome to save, delete, or reattach individual objects, especially if you deal with a graph of associated objects. A common case is a parent/child relationship. Consider the following example:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:916
+#: session_api.xml:917
 #, no-c-format
-msgid "If the children in a parent/child relationship would be value typed (e.g. a collection of addresses or strings), their life cycle would depend on the parent and no further action would be required for convenient \"cascading\" of state changes. When the parent is saved, the value-typed child objects are saved as well, when the parent is deleted, the children will be deleted, etc. This even works for operations such as the removal of a child from the collection; Hibernate will detect this and, since value-typed objects can't have shared references, delete the child from the database."
+msgid "If the children in a parent/child relationship would be value typed (e.g. a collection of addresses or strings), their life cycle would depend on the parent and no further action would be required for convenient \"cascading\" of state changes. When the parent is saved, the value-typed child objects are saved and when the parent is deleted, the children will be deleted, etc. This works for operations such as the removal of a child from the collection. Since value-typed objects cannot have shared references, Hibernate will detect this and delete the child from the database."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:927
+#: session_api.xml:928
 #, no-c-format
-msgid "Now consider the same scenario with parent and child objects being entities, not value-types (e.g. categories and items, or parent and child cats). Entities have their own life cycle, support shared references (so removing an entity from the collection does not mean it can be deleted), and there is by default no cascading of state from one entity to any other associated entities. Hibernate does not implement <emphasis>persistence by reachability</emphasis> by default."
+msgid "Now consider the same scenario with parent and child objects being entities, not value-types (e.g. categories and items, or parent and child cats). Entities have their own life cycle and support shared references. Removing an entity from the collection does not mean it can be deleted), and there is by default no cascading of state from one entity to any other associated entities. Hibernate does not implement <emphasis>persistence by reachability</emphasis> by default."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:936
+#: session_api.xml:937
 #, no-c-format
 msgid "For each basic operation of the Hibernate session - including <literal>persist(), merge(), saveOrUpdate(), delete(), lock(), refresh(), evict(), replicate()</literal> - there is a corresponding cascade style. Respectively, the cascade styles are named <literal>create, merge, save-update, delete, lock, refresh, evict, replicate</literal>. If you want an operation to be cascaded along an association, you must indicate that in the mapping document. For example:"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:945
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:947
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:951
+#: session_api.xml:952
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:953
+#: session_api.xml:954
 #, no-c-format
-msgid "You may even use <literal>cascade=\"all\"</literal> to specify that <emphasis>all</emphasis> operations should be cascaded along the association. The default <literal>cascade=\"none\"</literal> specifies that no operations are to be cascaded."
+msgid "You can even use <literal>cascade=\"all\"</literal> to specify that <emphasis>all</emphasis> operations should be cascaded along the association. The default <literal>cascade=\"none\"</literal> specifies that no operations are to be cascaded."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:959
+#: session_api.xml:960
 #, no-c-format
 msgid "A special cascade style, <literal>delete-orphan</literal>, applies only to one-to-many associations, and indicates that the <literal>delete()</literal> operation should be applied to any child object that is removed from the association."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:966
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:972
+#: session_api.xml:973
 #, no-c-format
-msgid "It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and <literal>&lt;one-to-many&gt;</literal> associations."
+msgid "It does not usually make sense to enable cascade on a <literal>&lt;many-to-one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and <literal>&lt;one-to-many&gt;</literal> associations."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:980
+#: session_api.xml:981
 #, no-c-format
 msgid "If the child object's lifespan is bounded by the lifespan of the parent object, make it a <emphasis>life cycle object</emphasis> by specifying <literal>cascade=\"all,delete-orphan\"</literal>."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:987
+#: session_api.xml:988
 #, no-c-format
 msgid "Otherwise, you might not need cascade at all. But if you think that you will often be working with the parent and children together in the same transaction, and you want to save yourself some typing, consider using <literal>cascade=\"persist,merge,save-update\"</literal>."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:995
+#: session_api.xml:996
 #, no-c-format
 msgid "Mapping an association (either a single valued association, or a collection) with <literal>cascade=\"all\"</literal> marks the association as a <emphasis>parent/child</emphasis> style relationship where save/update/delete of the parent results in save/update/delete of the child or children."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1001
+#: session_api.xml:1002
 #, no-c-format
-msgid "Futhermore, a mere reference to a child from a persistent parent will result in save/update of the child. This metaphor is incomplete, however. A child which becomes unreferenced by its parent is <emphasis>not</emphasis> automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</literal> association mapped with <literal>cascade=\"delete-orphan\"</literal>. The precise semantics of cascading operations for a parent/child relationship are as follows:"
+msgid "Furthermore, a mere reference to a child from a persistent parent will result in save/update of the child. This metaphor is incomplete, however. A child which becomes unreferenced by its parent is <emphasis>not</emphasis> automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</literal> association mapped with <literal>cascade=\"delete-orphan\"</literal>. The precise semantics of cascading operations for a parent/child relationship are as follows:"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1013
 #, no-c-format
 msgid "If a parent is passed to <literal>persist()</literal>, all children are passed to <literal>persist()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1018
+#: session_api.xml:1019
 #, no-c-format
 msgid "If a parent is passed to <literal>merge()</literal>, all children are passed to <literal>merge()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1024
+#: session_api.xml:1025
 #, no-c-format
 msgid "If a parent is passed to <literal>save()</literal>, <literal>update()</literal> or <literal>saveOrUpdate()</literal>, all children are passed to <literal>saveOrUpdate()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1030
+#: session_api.xml:1031
 #, no-c-format
 msgid "If a transient or detached child becomes referenced by a persistent parent, it is passed to <literal>saveOrUpdate()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1036
+#: session_api.xml:1037
 #, no-c-format
 msgid "If a parent is deleted, all children are passed to <literal>delete()</literal>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1041
+#: session_api.xml:1042
 #, no-c-format
 msgid "If a child is dereferenced by a persistent parent, <emphasis>nothing special happens</emphasis> - the application should explicitly delete the child if necessary - unless <literal>cascade=\"delete-orphan\"</literal>, in which case the \"orphaned\" child is deleted."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1050
+#: session_api.xml:1051
 #, no-c-format
-msgid "Finally, note that cascading of operations can be applied to an object graph at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All operations, if enabled, are cascaded to associated entities reachable when the operation is executed. However, <literal>save-upate</literal> and <literal>delete-orphan</literal> are transitive for all associated entities reachable during flush of the <literal>Session</literal>."
+msgid "Finally, note that cascading of operations can be applied to an object graph at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All operations, if enabled, are cascaded to associated entities reachable when the operation is executed. However, <literal>save-update</literal> and <literal>delete-orphan</literal> are transitive for all associated entities reachable during flush of the <literal>Session</literal>."
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:1062
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1064
+#: session_api.xml:1065
 #, no-c-format
-msgid "Hibernate requires a very rich meta-level model of all entity and value types. From time to time, this model is very useful to the application itself. For example, the application might use Hibernate's metadata to implement a \"smart\" deep-copy algorithm that understands which objects should be copied (eg. mutable value types) and which should not (eg. immutable value types and, possibly, associated entities)."
+msgid "Hibernate requires a rich meta-level model of all entity and value types. This model can be useful to the application itself. For example, the application might use Hibernate's metadata to implement a \"smart\" deep-copy algorithm that understands which objects should be copied (eg. mutable value types) and which objects that should not (e.g. immutable value types and, possibly, associated entities)."
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:1071
+#: session_api.xml:1072
 #, no-c-format
-msgid "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and <literal>CollectionMetadata</literal> interfaces and the <literal>Type</literal> hierarchy. Instances of the metadata interfaces may be obtained from the <literal>SessionFactory</literal>."
+msgid "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and <literal>CollectionMetadata</literal> interfaces and the <literal>Type</literal> hierarchy. Instances of the metadata interfaces can be obtained from the <literal>SessionFactory</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:1078
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
       "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,49 +23,43 @@
 #. Tag: para
 #: toolset_guide.xml:31
 #, no-c-format
-msgid "Roundtrip engineering with Hibernate is possible using a set of Eclipse plugins, commandline tools, as well as Ant tasks."
+msgid "Roundtrip engineering with Hibernate is possible using a set of Eclipse plugins, commandline tools, and Ant tasks."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:36
 #, no-c-format
-msgid "The <emphasis>Hibernate Tools</emphasis> currently include plugins for the Eclipse IDE as well as Ant tasks for reverse engineering of existing databases:"
+msgid "<emphasis>Hibernate Tools</emphasis> currently include plugins for the Eclipse IDE as well as Ant tasks for reverse engineering of existing databases:"
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:42
 #, no-c-format
-msgid "<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping files, supporting auto-completion and syntax highlighting. It also supports semantic auto-completion for class names and property/field names, making it much more versatile than a normal XML editor."
+msgid "<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping files that supports auto-completion and syntax highlighting. It also supports semantic auto-completion for class names and property/field names, making it more versatile than a normal XML editor."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:47
 #, no-c-format
-msgid "<emphasis>Console:</emphasis> The console is a new view in Eclipse. In addition to a tree overview of your console configurations, you also get an interactive view of your persistent classes and their relationships. The console allows you to execute HQL queries against your database and browse the result directly in Eclipse."
+msgid "<emphasis>Console:</emphasis> the console is a new view in Eclipse. In addition to a tree overview of your console configurations, you are also provided with an interactive view of your persistent classes and their relationships. The console allows you to execute HQL queries against your database and browse the result directly in Eclipse."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:54
 #, no-c-format
-msgid "<emphasis>Development Wizards:</emphasis> Several wizards are provided with the Hibernate Eclipse tools; you can use a wizard to quickly generate Hibernate configuration (cfg.xml) files, or you may even completely reverse engineer an existing database schema into POJO source files and Hibernate mapping files. The reverse engineering wizard supports customizable templates."
+msgid "<emphasis>Development Wizards:</emphasis> several wizards are provided with the Hibernate Eclipse tools. You can use a wizard to quickly generate Hibernate configuration (cfg.xml) files, or to reverse engineer an existing database schema into POJO source files and Hibernate mapping files. The reverse engineering wizard supports customizable templates."
 msgstr ""
 
-#. Tag: emphasis
-#: toolset_guide.xml:62
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr ""
-
 #. Tag: para
 #: toolset_guide.xml:67
 #, no-c-format
-msgid "Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's documentation for more information."
+msgid "Please refer to the <emphasis>Hibernate Tools</emphasis> package documentation for more information."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:72
 #, no-c-format
-msgid "However, the Hibernate main package comes bundled with an integrated tool (it can even be used from \"inside\" Hibernate on-the-fly): <emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+msgid "However, the Hibernate main package comes bundled with an integrated tool : <emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even be used from \"inside\" Hibernate."
 msgstr ""
 
 #. Tag: title
@@ -77,19 +71,19 @@
 #. Tag: para
 #: toolset_guide.xml:81
 #, no-c-format
-msgid "DDL may be generated from your mapping files by a Hibernate utility. The generated schema includes referential integrity constraints (primary and foreign keys) for entity and collection tables. Tables and sequences are also created for mapped identifier generators."
+msgid "DDL can be generated from your mapping files by a Hibernate utility. The generated schema includes referential integrity constraints, primary and foreign keys, for entity and collection tables. Tables and sequences are also created for mapped identifier generators."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:88
 #, no-c-format
-msgid "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via the <literal>hibernate.dialect</literal> property when using this tool, as DDL is highly vendor specific."
+msgid "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via the <literal>hibernate.dialect</literal> property when using this tool, as DDL is highly vendor-specific."
 msgstr ""
 
 #. Tag: para
 #: toolset_guide.xml:94
 #, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+msgid "First, you must customize your mapping files to improve the generated schema. The next section covers schema customization."
 msgstr ""
 
 #. Tag: title
@@ -101,7 +95,7 @@
 #. Tag: para
 #: toolset_guide.xml:101
 #, no-c-format
-msgid "Many Hibernate mapping elements define optional attributes named <literal>length</literal>, <literal>precision</literal> and <literal>scale</literal>. You may set the length, precision and scale of a column with this attribute."
+msgid "Many Hibernate mapping elements define optional attributes named <literal>length</literal>, <literal>precision</literal> and <literal>scale</literal>. You can set the length, precision and scale of a column with this attribute."
 msgstr ""
 
 #. Tag: programlisting
@@ -119,7 +113,7 @@
 #. Tag: para
 #: toolset_guide.xml:111
 #, no-c-format
-msgid "Some tags also accept a <literal>not-null</literal> attribute (for generating a <literal>NOT NULL</literal> constraint on table columns) and a <literal>unique</literal> attribute (for generating <literal>UNIQUE</literal> constraint on table columns)."
+msgid "Some tags also accept a <literal>not-null</literal> attribute for generating a <literal>NOT NULL</literal> constraint on table columns, and a <literal>unique</literal> attribute for generating <literal>UNIQUE</literal> constraint on table columns."
 msgstr ""
 
 #. Tag: programlisting
@@ -137,7 +131,7 @@
 #. Tag: para
 #: toolset_guide.xml:121
 #, no-c-format
-msgid "A <literal>unique-key</literal> attribute may be used to group columns in a single unique key constraint. Currently, the specified value of the <literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to name the constraint in the generated DDL, only to group the columns in the mapping file."
+msgid "A <literal>unique-key</literal> attribute can be used to group columns in a single, unique key constraint. Currently, the specified value of the <literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to name the constraint in the generated DDL. It is only used to group the columns in the mapping file."
 msgstr ""
 
 #. Tag: programlisting
@@ -151,7 +145,7 @@
 #. Tag: para
 #: toolset_guide.xml:131
 #, no-c-format
-msgid "An <literal>index</literal> attribute specifies the name of an index that will be created using the mapped column or columns. Multiple columns may be grouped into the same index, simply by specifying the same index name."
+msgid "An <literal>index</literal> attribute specifies the name of an index that will be created using the mapped column or columns. Multiple columns can be grouped into the same index by simply specifying the same index name."
 msgstr ""
 
 #. Tag: programlisting
@@ -165,7 +159,7 @@
 #. Tag: para
 #: toolset_guide.xml:139
 #, no-c-format
-msgid "A <literal>foreign-key</literal> attribute may be used to override the name of any generated foreign key constraint."
+msgid "A <literal>foreign-key</literal> attribute can be used to override the name of any generated foreign key constraint."
 msgstr ""
 
 #. Tag: programlisting
@@ -194,7 +188,7 @@
 #. Tag: para
 #: toolset_guide.xml:153
 #, no-c-format
-msgid "The <literal>default</literal> attribute lets you specify a default value for a column (you should assign the same value to the mapped property before saving a new instance of the mapped class)."
+msgid "The <literal>default</literal> attribute allows you to specify a default value for a column.You should assign the same value to the mapped property before saving a new instance of the mapped class."
 msgstr ""
 
 #. Tag: programlisting
@@ -255,212 +249,218 @@
       "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:180
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:187
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:188
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:189
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:194
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:196
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:199
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:201
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:204
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:206
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:209
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:210 toolset_guide.xml:215
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:211
+#: toolset_guide.xml:213
 #, no-c-format
-msgid "specfies that the column should be non-nullable"
+msgid "specifies that the column should be non-nullable"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:214
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:216
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:219
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:220
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:221
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:224
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:226
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:229
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:230
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:231
+#: toolset_guide.xml:233
 #, no-c-format
 msgid "specifies the name of the foreign key constraint generated for an association, for a <literal>&lt;one-to-one&gt;</literal>, <literal>&lt;many-to-one&gt;</literal>, <literal>&lt;key&gt;</literal>, or <literal>&lt;many-to-many&gt;</literal> mapping element. Note that <literal>inverse=\"true\"</literal> sides will not be considered by <literal>SchemaExport</literal>."
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:241
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:242
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:243
+#: toolset_guide.xml:245
 #, no-c-format
 msgid "overrides the default column type (attribute of <literal>&lt;column&gt;</literal> element only)"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:249
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:250 toolset_guide.xml:257
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, no-c-format
 msgid "SQL expression"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:251
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:256
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:258
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:266
+#: toolset_guide.xml:268
 #, no-c-format
 msgid "The <literal>&lt;comment&gt;</literal> element allows you to specify comments for the generated schema."
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:271
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -470,7 +470,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:273
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
       "<![CDATA[<property name=\"balance\">\n"
@@ -481,175 +481,181 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:275
+#: toolset_guide.xml:277
 #, no-c-format
-msgid "This results in a <literal>comment on table</literal> or <literal>comment on column</literal> statement in the generated DDL (where supported)."
+msgid "This results in a <literal>comment on table</literal> or <literal>comment on column</literal> statement in the generated DDL where supported."
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:284
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:286
+#: toolset_guide.xml:288
 #, no-c-format
 msgid "The <literal>SchemaExport</literal> tool writes a DDL script to standard out and/or executes the DDL statements."
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:291
+#: toolset_guide.xml:293
 #, no-c-format
+msgid "The following table displays the <literal>SchemaExport</literal> command line options"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:295
+#, no-c-format
 msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> <literal>org.hibernate.tool.hbm2ddl.SchemaExport</literal> <emphasis>options mapping_files</emphasis>"
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:297
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:303 toolset_guide.xml:453 toolset_guide.xml:522
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:304 toolset_guide.xml:391 toolset_guide.xml:454 toolset_guide.xml:523
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458 toolset_guide.xml:528
 #, no-c-format
 msgid "Description"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:459
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:310 toolset_guide.xml:460
+#: toolset_guide.xml:314 toolset_guide.xml:464
 #, no-c-format
-msgid "don't output the script to stdout"
+msgid "do not output the script to stdout"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:313
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:314
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:321 toolset_guide.xml:463
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:326
 #, no-c-format
-msgid "don't export to the database"
+msgid "do not export to the database"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:325
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:326
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:329 toolset_guide.xml:467 toolset_guide.xml:528
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:330 toolset_guide.xml:468 toolset_guide.xml:529
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:333 toolset_guide.xml:475 toolset_guide.xml:536
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:334
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:337 toolset_guide.xml:471 toolset_guide.xml:532
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:338 toolset_guide.xml:472 toolset_guide.xml:533
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, no-c-format
 msgid "read database properties from a file"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:341
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:342
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:345
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:346
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:352
+#: toolset_guide.xml:356
 #, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:356
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
       "<![CDATA[Configuration cfg = ....;\n"
@@ -657,127 +663,127 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:361
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:363
+#: toolset_guide.xml:367
 #, no-c-format
-msgid "Database properties may be specified"
+msgid "Database properties can be specified:"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:369
+#: toolset_guide.xml:373
 #, no-c-format
 msgid "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:372
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:375
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:379
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:384
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:390
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:396
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:397
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:400
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:401
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:404
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:405
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:408
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:409
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr ""
 
 #. Tag: literal
-#: toolset_guide.xml:412
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:413
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:422
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:424
+#: toolset_guide.xml:428
 #, no-c-format
 msgid "You can call <literal>SchemaExport</literal> from your Ant build script:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:428
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"schemaexport\">\n"
@@ -800,49 +806,49 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:433
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:435
+#: toolset_guide.xml:439
 #, no-c-format
-msgid "The <literal>SchemaUpdate</literal> tool will update an existing schema with \"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends heavily upon the JDBC metadata API, so it will not work with all JDBC drivers."
+msgid "The <literal>SchemaUpdate</literal> tool will update an existing schema with \"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:441
+#: toolset_guide.xml:445
 #, no-c-format
 msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> <literal>org.hibernate.tool.hbm2ddl.SchemaUpdate</literal> <emphasis>options mapping_files</emphasis>"
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:447
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:464
+#: toolset_guide.xml:468
 #, no-c-format
-msgid "don't export the script to the database"
+msgid "do not export the script to the database"
 msgstr ""
 
 #. Tag: entry
-#: toolset_guide.xml:476 toolset_guide.xml:537
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:482
+#: toolset_guide.xml:486
 #, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:486
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
       "<![CDATA[Configuration cfg = ....;\n"
@@ -850,19 +856,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:491
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:493
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:497
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -881,37 +887,43 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:502
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:504
+#: toolset_guide.xml:508
 #, no-c-format
-msgid "The <literal>SchemaValidator</literal> tool will validate that the existing database schema \"matches\" your mapping documents. Note that <literal>SchemaValidator</literal> depends heavily upon the JDBC metadata API, so it will not work with all JDBC drivers. This tool is extremely useful for testing."
+msgid "The <literal>SchemaValidator</literal> tool will validate that the existing database schema \"matches\" your mapping documents. The <literal>SchemaValidator</literal> depends heavily upon the JDBC metadata API and, as such, will not work with all JDBC drivers. This tool is extremely useful for testing."
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:510
+#: toolset_guide.xml:514
 #, no-c-format
 msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> <literal>org.hibernate.tool.hbm2ddl.SchemaValidator</literal> <emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, no-c-format
+msgid "The following table displays the <literal>SchemaValidator</literal> command line options:"
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:516
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:543
+#: toolset_guide.xml:548
 #, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:547
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
       "<![CDATA[Configuration cfg = ....;\n"
@@ -919,19 +931,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:552
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:554
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:558
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"schemavalidate\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -17,31 +17,31 @@
 #. Tag: title
 #: transactions.xml:29
 #, no-c-format
-msgid "Transactions And Concurrency"
+msgid "Transactions and Concurrency"
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:31
 #, no-c-format
-msgid "The most important point about Hibernate and concurrency control is that it is very easy to understand. Hibernate directly uses JDBC connections and JTA resources without adding any additional locking behavior. We highly recommend you spend some time with the JDBC, ANSI, and transaction isolation specification of your database management system."
+msgid "The most important point about Hibernate and concurrency control is that it is easy to understand. Hibernate directly uses JDBC connections and JTA resources without adding any additional locking behavior. It is recommended that you spend some time with the JDBC, ANSI, and transaction isolation specification of your database management system."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:38
 #, no-c-format
-msgid "Hibernate does not lock objects in memory. Your application can expect the behavior as defined by the isolation level of your database transactions. Note that thanks to the <literal>Session</literal>, which is also a transaction-scoped cache, Hibernate provides repeatable reads for lookup by identifier and entity queries (not reporting queries that return scalar values)."
+msgid "Hibernate does not lock objects in memory. Your application can expect the behavior as defined by the isolation level of your database transactions. Through <literal>Session</literal>, which is also a transaction-scoped cache, Hibernate provides repeatable reads for lookup by identifier and entity queries and not reporting queries that return scalar values."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:46
 #, no-c-format
-msgid "In addition to versioning for automatic optimistic concurrency control, Hibernate also offers a (minor) API for pessimistic locking of rows, using the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency control and this API are discussed later in this chapter."
+msgid "In addition to versioning for automatic optimistic concurrency control, Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> syntax, a (minor) API for pessimistic locking of rows. Optimistic concurrency control and this API are discussed later in this chapter."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:53
 #, no-c-format
-msgid "We start the discussion of concurrency control in Hibernate with the granularity of <literal>Configuration</literal>, <literal>SessionFactory</literal>, and <literal>Session</literal>, as well as database transactions and long conversations."
+msgid "The discussion of concurrency control in Hibernate begins with the granularity of <literal>Configuration</literal>, <literal>SessionFactory</literal>, and <literal>Session</literal>, as well as database transactions and long conversations."
 msgstr ""
 
 #. Tag: title
@@ -53,287 +53,293 @@
 #. Tag: para
 #: transactions.xml:62
 #, no-c-format
-msgid "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe object intended to be shared by all application threads. It is created once, usually on application startup, from a <literal>Configuration</literal> instance."
+msgid "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe object, intended to be shared by all application threads. It is created once, usually on application startup, from a <literal>Configuration</literal> instance."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:68
 #, no-c-format
-msgid "A <literal>Session</literal> is an inexpensive, non-threadsafe object that should be used once, for a single request, a conversation, single unit of work, and then discarded. A <literal>Session</literal> will not obtain a JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) unless it is needed, hence consume no resources until used."
+msgid "A <literal>Session</literal> is an inexpensive, non-threadsafe object that should be used once and then discarded for: a single request, a conversation or a single unit of work. A <literal>Session</literal> will not obtain a JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, unless it is needed. It will not consume any resources until used."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:76
 #, no-c-format
-msgid "To complete this picture you also have to think about database transactions. A database transaction has to be as short as possible, to reduce lock contention in the database. Long database transactions will prevent your application from scaling to highly concurrent load. Hence, it is almost never good design to hold a database transaction open during user think time, until the unit of work is complete."
+msgid "In order to reduce lock contention in the database, a database transaction has to be as short as possible. Long database transactions will prevent your application from scaling to a highly concurrent load. It is not recommended that you hold a database transaction open during user think time until the unit of work is complete."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:85
+#: transactions.xml:84
 #, no-c-format
-msgid "What is the scope of a unit of work? Can a single Hibernate <literal>Session</literal> span several database transactions or is this a one-to-one relationship of scopes? When should you open and close a <literal>Session</literal> and how do you demarcate the database transaction boundaries?"
+msgid "What is the scope of a unit of work? Can a single Hibernate <literal>Session</literal> span several database transactions, or is this a one-to-one relationship of scopes? When should you open and close a <literal>Session</literal> and how do you demarcate the database transaction boundaries? These questions are addressed in the following sections."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:93
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:95
+#: transactions.xml:94
 #, no-c-format
-msgid "First, don't use the <emphasis>session-per-operation</emphasis> antipattern, that is, don't open and close a <literal>Session</literal> for every simple database call in a single thread! Of course, the same is true for database transactions. Database calls in an application are made using a planned sequence, they are grouped into atomic units of work. (Note that this also means that auto-commit after every single SQL statement is useless in an application, this mode is intended for ad-hoc SQL console work. Hibernate disables, or expects the application server to do so, auto-commit mode immediately.) Database transactions are never optional, all communication with a database has to occur inside a transaction, no matter if you read or write data. As explained, auto-commit behavior for reading data should be avoided, as many small transactions are unlikely to perform better than one clearly defined unit of work. The latter is also much more maintainable and extensible."
+msgid "First, let's define a unit of work. A unit of work is a design pattern described by Martin Fowler as <quote> [maintaining] a list of objects affected by a business transaction and coordinates the writing out of changes and the resolution of concurrency problems. </quote><citation>PoEAA</citation> In other words, its a series of operations we wish to carry out against the database together. Basically, it is a transaction, though fulfilling a unit of work will often span multiple physical database transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really we are talking about a more abstract notion of a transaction. The term \"business transaction\" is also sometimes used in lieu of unit of work."
 msgstr ""
 
 #. Tag: para
 #: transactions.xml:111
 #, no-c-format
-msgid "The most common pattern in a multi-user client/server application is <emphasis>session-per-request</emphasis>. In this model, a request from the client is sent to the server (where the Hibernate persistence layer runs), a new Hibernate <literal>Session</literal> is opened, and all database operations are executed in this unit of work. Once the work has been completed (and the response for the client has been prepared), the session is flushed and closed. You would also use a single database transaction to serve the clients request, starting and committing it when you open and close the <literal>Session</literal>. The relationship between the two is one-to-one and this model is a perfect fit for many applications."
+msgid "Do not use the <emphasis>session-per-operation</emphasis> antipattern: do not open and close a <literal>Session</literal> for every simple database call in a single thread. The same is true for database transactions. Database calls in an application are made using a planned sequence; they are grouped into atomic units of work. This also means that auto-commit after every single SQL statement is useless in an application as this mode is intended for ad-hoc SQL console work. Hibernate disables, or expects the application server to disable, auto-commit mode immediately. Database transactions are never optional. All communication with a database has to occur inside a transaction. Auto-commit behavior for reading data should be avoided, as many small transactions are unlikely to perform better than one clearly defined unit of work. The latter is also more maintainable and extensible."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:123
+#: transactions.xml:126
 #, no-c-format
-msgid "The challenge lies in the implementation. Hibernate provides built-in management of the \"current session\" to simplify this pattern. All you have to do is start a transaction when a server request has to be processed, and end the transaction before the response is sent to the client. You can do this in any way you like, common solutions are <literal>ServletFilter</literal>, AOP interceptor with a pointcut on the service methods, or a proxy/interception container. An EJB container is a standardized way to implement cross-cutting aspects such as transaction demarcation on EJB session beans, declaratively with CMT. If you decide to use programmatic transaction demarcation, prefer the Hibernate <literal>Transaction</literal> API shown later in this chapter, for ease of use and code portability."
+msgid "The most common pattern in a multi-user client/server application is <emphasis>session-per-request</emphasis>. In this model, a request from the client is sent to the server, where the Hibernate persistence layer runs. A new Hibernate <literal>Session</literal> is opened, and all database operations are executed in this unit of work. On completion of the work, and once the response for the client has been prepared, the session is flushed and closed. Use a single database transaction to serve the clients request, starting and committing it when you open and close the <literal>Session</literal>. The relationship between the two is one-to-one and this model is a perfect fit for many applications."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:136
+#: transactions.xml:138
 #, no-c-format
-msgid "Your application code can access a \"current session\" to process the request by simply calling <literal>sessionFactory.getCurrentSession()</literal> anywhere and as often as needed. You will always get a <literal>Session</literal> scoped to the current database transaction. This has to be configured for either resource-local or JTA environments, see <xref linkend=\"architecture-current-session\"/>."
+msgid "The challenge lies in the implementation. Hibernate provides built-in management of the \"current session\" to simplify this pattern. Start a transaction when a server request has to be processed, and end the transaction before the response is sent to the client. Common solutions are <literal>ServletFilter</literal>, AOP interceptor with a pointcut on the service methods, or a proxy/interception container. An EJB container is a standardized way to implement cross-cutting aspects such as transaction demarcation on EJB session beans, declaratively with CMT. If you use programmatic transaction demarcation, for ease of use and code portability use the Hibernate <literal>Transaction</literal> API shown later in this chapter."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:144
+#: transactions.xml:150
 #, no-c-format
-msgid "Sometimes it is convenient to extend the scope of a <literal>Session</literal> and database transaction until the \"view has been rendered\". This is especially useful in servlet applications that utilize a separate rendering phase after the request has been processed. Extending the database transaction until view rendering is complete is easy to do if you implement your own interceptor. However, it is not easily doable if you rely on EJBs with container-managed transactions, as a transaction will be completed when an EJB method returns, before rendering of any view can start. See the Hibernate website and forum for tips and examples around this <emphasis>Open Session in View</emphasis> pattern."
+msgid "Your application code can access a \"current session\" to process the request by calling <literal>sessionFactory.getCurrentSession()</literal>. You will always get a <literal>Session</literal> scoped to the current database transaction. This has to be configured for either resource-local or JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 
+#. Tag: para
+#: transactions.xml:158
+#, no-c-format
+msgid "You can extend the scope of a <literal>Session</literal> and database transaction until the \"view has been rendered\". This is especially useful in servlet applications that utilize a separate rendering phase after the request has been processed. Extending the database transaction until view rendering, is achieved by implementing your own interceptor. However, this will be difficult if you rely on EJBs with container-managed transactions. A transaction will be completed when an EJB method returns, before rendering of any view can start. See the Hibernate website and forum for tips and examples relating to this <emphasis>Open Session in View</emphasis> pattern."
+msgstr ""
+
 #. Tag: title
-#: transactions.xml:159
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:161
+#: transactions.xml:175
 #, no-c-format
-msgid "The session-per-request pattern is not the only useful concept you can use to design units of work. Many business processes require a whole series of interactions with the user interleaved with database accesses. In web and enterprise applications it is not acceptable for a database transaction to span a user interaction. Consider the following example:"
+msgid "The session-per-request pattern is not the only way of designing units of work. Many business processes require a whole series of interactions with the user that are interleaved with database accesses. In web and enterprise applications, it is not acceptable for a database transaction to span a user interaction. Consider the following example:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:171
+#: transactions.xml:185
 #, no-c-format
-msgid "The first screen of a dialog opens, the data seen by the user has been loaded in a particular <literal>Session</literal> and database transaction. The user is free to modify the objects."
+msgid "The first screen of a dialog opens. The data seen by the user has been loaded in a particular <literal>Session</literal> and database transaction. The user is free to modify the objects."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:178
+#: transactions.xml:192
 #, no-c-format
-msgid "The user clicks \"Save\" after 5 minutes and expects his modifications to be made persistent; he also expects that he was the only person editing this information and that no conflicting modification can occur."
+msgid "The user clicks \"Save\" after 5 minutes and expects their modifications to be made persistent. The user also expects that they were the only person editing this information and that no conflicting modification has occurred."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:186
+#: transactions.xml:200
 #, no-c-format
-msgid "We call this unit of work, from the point of view of the user, a long running <emphasis>conversation</emphasis> (or <emphasis>application transaction</emphasis>). There are many ways how you can implement this in your application."
+msgid "From the point of view of the user, we call this unit of work a long-running <emphasis>conversation</emphasis> or <emphasis>application transaction</emphasis>. There are many ways to implement this in your application."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:192
+#: transactions.xml:206
 #, no-c-format
-msgid "A first naive implementation might keep the <literal>Session</literal> and database transaction open during user think time, with locks held in the database to prevent concurrent modification, and to guarantee isolation and atomicity. This is of course an anti-pattern, since lock contention would not allow the application to scale with the number of concurrent users."
+msgid "A first naive implementation might keep the <literal>Session</literal> and database transaction open during user think time, with locks held in the database to prevent concurrent modification and to guarantee isolation and atomicity. This is an anti-pattern, since lock contention would not allow the application to scale with the number of concurrent users."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:200
+#: transactions.xml:214
 #, no-c-format
-msgid "Clearly, we have to use several database transactions to implement the conversation. In this case, maintaining isolation of business processes becomes the partial responsibility of the application tier. A single conversation usually spans several database transactions. It will be atomic if only one of these database transactions (the last one) stores the updated data, all others simply read data (e.g. in a wizard-style dialog spanning several request/response cycles). This is easier to implement than it might sound, especially if you use Hibernate's features:"
+msgid "You have to use several database transactions to implement the conversation. In this case, maintaining isolation of business processes becomes the partial responsibility of the application tier. A single conversation usually spans several database transactions. It will be atomic if only one of these database transactions (the last one) stores the updated data. All others simply read data (for example, in a wizard-style dialog spanning several request/response cycles). This is easier to implement than it might sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:213
+#: transactions.xml:227
 #, no-c-format
-msgid "<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic optimistic concurrency control for you, it can automatically detect if a concurrent modification occurred during user think time. Usually we only check at the end of the conversation."
+msgid "<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic optimistic concurrency control for you. It can automatically detect if a concurrent modification occurred during user think time. Check for this at the end of the conversation."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:221
+#: transactions.xml:235
 #, no-c-format
-msgid "<emphasis>Detached Objects</emphasis> - If you decide to use the already discussed <emphasis>session-per-request</emphasis> pattern, all loaded instances will be in detached state during user think time. Hibernate allows you to reattach the objects and persist the modifications, the pattern is called <emphasis>session-per-request-with-detached-objects</emphasis>. Automatic versioning is used to isolate concurrent modifications."
+msgid "<emphasis>Detached Objects</emphasis>: if you decide to use the <emphasis>session-per-request</emphasis> pattern, all loaded instances will be in the detached state during user think time. Hibernate allows you to reattach the objects and persist the modifications. The pattern is called <emphasis>session-per-request-with-detached-objects</emphasis>. Automatic versioning is used to isolate concurrent modifications."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:245
 #, no-c-format
-msgid "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate <literal>Session</literal> may be disconnected from the underlying JDBC connection after the database transaction has been committed, and reconnected when a new client request occurs. This pattern is known as <emphasis>session-per-conversation</emphasis> and makes even reattachment unnecessary. Automatic versioning is used to isolate concurrent modifications and the <literal>Session</literal> is usually not allowed to be flushed automatically, but explicitly."
+msgid "<emphasis>Extended (or Long) Session</emphasis>: the Hibernate <literal>Session</literal> can be disconnected from the underlying JDBC connection after the database transaction has been committed and reconnected when a new client request occurs. This pattern is known as <emphasis>session-per-conversation</emphasis> and makes even reattachment unnecessary. Automatic versioning is used to isolate concurrent modifications and the <literal>Session</literal> will not be allowed to be flushed automatically, but explicitly."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:244
+#: transactions.xml:258
 #, no-c-format
-msgid "Both <emphasis>session-per-request-with-detached-objects</emphasis> and <emphasis>session-per-conversation</emphasis> have advantages and disadvantages, we discuss them later in this chapter in the context of optimistic concurrency control."
+msgid "Both <emphasis>session-per-request-with-detached-objects</emphasis> and <emphasis>session-per-conversation</emphasis> have advantages and disadvantages. These disadvantages are discussed later in this chapter in the context of optimistic concurrency control."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:253
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:255
+#: transactions.xml:269
 #, no-c-format
-msgid "An application may concurrently access the same persistent state in two different <literal>Session</literal>s. However, an instance of a persistent class is never shared between two <literal>Session</literal> instances. Hence there are two different notions of identity:"
+msgid "An application can concurrently access the same persistent state in two different <literal>Session</literal>s. However, an instance of a persistent class is never shared between two <literal>Session</literal> instances. It is for this reason that there are two different notions of identity:"
 msgstr ""
 
 #. Tag: term
-#: transactions.xml:264
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr ""
 
 #. Tag: literal
-#: transactions.xml:267
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr ""
 
 #. Tag: term
-#: transactions.xml:272
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr ""
 
 #. Tag: literal
-#: transactions.xml:275
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:281
+#: transactions.xml:295
 #, no-c-format
-msgid "Then for objects attached to a <emphasis>particular</emphasis> <literal>Session</literal> (i.e. in the scope of a <literal>Session</literal>) the two notions are equivalent, and JVM identity for database identity is guaranteed by Hibernate. However, while the application might concurrently access the \"same\" (persistent identity) business object in two different sessions, the two instances will actually be \"different\" (JVM identity). Conflicts are resolved using (automatic versioning) at flush/commit time, using an optimistic approach."
+msgid "For objects attached to a <emphasis>particular</emphasis> <literal>Session</literal> (i.e., in the scope of a <literal>Session</literal>), the two notions are equivalent and JVM identity for database identity is guaranteed by Hibernate. While the application might concurrently access the \"same\" (persistent identity) business object in two different sessions, the two instances will actually be \"different\" (JVM identity). Conflicts are resolved using an optimistic approach and automatic versioning at flush/commit time."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:290
+#: transactions.xml:304
 #, no-c-format
-msgid "This approach leaves Hibernate and the database to worry about concurrency; it also provides the best scalability, since guaranteeing identity in single-threaded units of work only doesn't need expensive locking or other means of synchronization. The application never needs to synchronize on any business object, as long as it sticks to a single thread per <literal>Session</literal>. Within a <literal>Session</literal> the application may safely use <literal>==</literal> to compare objects."
+msgid "This approach leaves Hibernate and the database to worry about concurrency. It also provides the best scalability, since guaranteeing identity in single-threaded units of work means that it does not need expensive locking or other means of synchronization. The application does not need to synchronize on any business object, as long as it maintains a single thread per <literal>Session</literal>. Within a <literal>Session</literal> the application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:299
+#: transactions.xml:313
 #, no-c-format
-msgid "However, an application that uses <literal>==</literal> outside of a <literal>Session</literal>, might see unexpected results. This might occur even in some unexpected places, for example, if you put two detached instances into the same <literal>Set</literal>. Both might have the same database identity (i.e. they represent the same row), but JVM identity is by definition not guaranteed for instances in detached state. The developer has to override the <literal>equals()</literal> and <literal>hashCode()</literal> methods in persistent classes and implement his own notion of object equality. There is one caveat: Never use the database identifier to implement equality, use a business key, a combination of unique, usually immutable, attributes. The database identifier will change if a transient object is made persistent. If the transient instance (usually together with detached instances) is held in a <literal>Set</literal>, changing the hashcode breaks the contract of t!
 he <literal>Set</literal>. Attributes for business keys don't have to be as stable as database primary keys, you only have to guarantee stability as long as the objects are in the same <literal>Set</literal>. See the Hibernate website for a more thorough discussion of this issue. Also note that this is not a Hibernate issue, but simply how Java object identity and equality has to be implemented."
+msgid "However, an application that uses <literal>==</literal> outside of a <literal>Session</literal> might produce unexpected results. This might occur even in some unexpected places. For example, if you put two detached instances into the same <literal>Set</literal>, both might have the same database identity (i.e., they represent the same row). JVM identity, however, is by definition not guaranteed for instances in a detached state. The developer has to override the <literal>equals()</literal> and <literal>hashCode()</literal> methods in persistent classes and implement their own notion of object equality. There is one caveat: never use the database identifier to implement equality. Use a business key that is a combination of unique, usually immutable, attributes. The database identifier will change if a transient object is made persistent. If the transient instance (usually together with detached instances) is held in a <literal>Set</literal>, changing the hashcode bre!
 aks the contract of the <literal>Set</literal>. Attributes for business keys do not have to be as stable as database primary keys; you only have to guarantee stability as long as the objects are in the same <literal>Set</literal>. See the Hibernate website for a more thorough discussion of this issue. Please note that this is not a Hibernate issue, but simply how Java object identity and equality has to be implemented."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:320
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:322
+#: transactions.xml:336
 #, no-c-format
-msgid "Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or <emphasis>session-per-application</emphasis> (of course, there are rare exceptions to this rule). Note that some of the following issues might also appear with the recommended patterns, make sure you understand the implications before making a design decision:"
+msgid "Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> or <emphasis>session-per-application</emphasis> (there are, however, rare exceptions to this rule). Some of the following issues might also arise within the recommended patterns, so ensure that you understand the implications before making a design decision:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:331
+#: transactions.xml:345
 #, no-c-format
-msgid "A <literal>Session</literal> is not thread-safe. Things which are supposed to work concurrently, like HTTP requests, session beans, or Swing workers, will cause race conditions if a <literal>Session</literal> instance would be shared. If you keep your Hibernate <literal>Session</literal> in your <literal>HttpSession</literal> (discussed later), you should consider synchronizing access to your Http session. Otherwise, a user that clicks reload fast enough may use the same <literal>Session</literal> in two concurrently running threads."
+msgid "A <literal>Session</literal> is not thread-safe. Things that work concurrently, like HTTP requests, session beans, or Swing workers, will cause race conditions if a <literal>Session</literal> instance is shared. If you keep your Hibernate <literal>Session</literal> in your <literal>HttpSession</literal> (this is discussed later in the chapter), you should consider synchronizing access to your Http session. Otherwise, a user that clicks reload fast enough can use the same <literal>Session</literal> in two concurrently running threads."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:342
+#: transactions.xml:356
 #, no-c-format
-msgid "An exception thrown by Hibernate means you have to rollback your database transaction and close the <literal>Session</literal> immediately (discussed later in more detail). If your <literal>Session</literal> is bound to the application, you have to stop the application. Rolling back the database transaction doesn't put your business objects back into the state they were at the start of the transaction. This means the database state and the business objects do get out of sync. Usually this is not a problem, because exceptions are not recoverable and you have to start over after rollback anyway."
+msgid "An exception thrown by Hibernate means you have to rollback your database transaction and close the <literal>Session</literal> immediately (this is discussed in more detail later in the chapter). If your <literal>Session</literal> is bound to the application, you have to stop the application. Rolling back the database transaction does not put your business objects back into the state they were at the start of the transaction. This means that the database state and the business objects will be out of sync. Usually this is not a problem, because exceptions are not recoverable and you will have to start over after rollback anyway."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:354
+#: transactions.xml:368
 #, no-c-format
-msgid "The <literal>Session</literal> caches every object that is in persistent state (watched and checked for dirty state by Hibernate). This means it grows endlessly until you get an OutOfMemoryException, if you keep it open for a long time or simply load too much data. One solution for this is to call <literal>clear()</literal> and <literal>evict()</literal> to manage the <literal>Session</literal> cache, but you most likely should consider a Stored Procedure if you need mass data operations. Some solutions are shown in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for the duration of a user session also means a high probability of stale data."
+msgid "The <literal>Session</literal> caches every object that is in a persistent state (watched and checked for dirty state by Hibernate). If you keep it open for a long time or simply load too much data, it will grow endlessly until you get an OutOfMemoryException. One solution is to call <literal>clear()</literal> and <literal>evict()</literal> to manage the <literal>Session</literal> cache, but you should consider a Stored Procedure if you need mass data operations. Some solutions are shown in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for the duration of a user session also means a higher probability of stale data."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:372
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:374
+#: transactions.xml:388
 #, no-c-format
-msgid "Database (or system) transaction boundaries are always necessary. No communication with the database can occur outside of a database transaction (this seems to confuse many developers who are used to the auto-commit mode). Always use clear transaction boundaries, even for read-only operations. Depending on your isolation level and database capabilities this might not be required but there is no downside if you always demarcate transactions explicitly. Certainly, a single database transaction is going to perform better than many small transactions, even for reading data."
+msgid "Database, or system, transaction boundaries are always necessary. No communication with the database can occur outside of a database transaction (this seems to confuse many developers who are used to the auto-commit mode). Always use clear transaction boundaries, even for read-only operations. Depending on your isolation level and database capabilities this might not be required, but there is no downside if you always demarcate transactions explicitly. Certainly, a single database transaction is going to perform better than many small transactions, even for reading data."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:384
+#: transactions.xml:398
 #, no-c-format
-msgid "A Hibernate application can run in non-managed (i.e. standalone, simple Web- or Swing applications) and managed J2EE environments. In a non-managed environment, Hibernate is usually responsible for its own database connection pool. The application developer has to manually set transaction boundaries, in other words, begin, commit, or rollback database transactions himself. A managed environment usually provides container-managed transactions (CMT), with the transaction assembly defined declaratively in deployment descriptors of EJB session beans, for example. Programmatic transaction demarcation is then no longer necessary."
+msgid "A Hibernate application can run in non-managed (i.e., standalone, simple Web- or Swing applications) and managed J2EE environments. In a non-managed environment, Hibernate is usually responsible for its own database connection pool. The application developer has to manually set transaction boundaries (begin, commit, or rollback database transactions) themselves. A managed environment usually provides container-managed transactions (CMT), with the transaction assembly defined declaratively (in deployment descriptors of EJB session beans, for example). Programmatic transaction demarcation is then no longer necessary."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:394
+#: transactions.xml:408
 #, no-c-format
-msgid "However, it is often desirable to keep your persistence layer portable between non-managed resource-local environments, and systems that can rely on JTA but use BMT instead of CMT. In both cases you'd use programmatic transaction demarcation. Hibernate offers a wrapper API called <literal>Transaction</literal> that translates into the native transaction system of your deployment environment. This API is actually optional, but we strongly encourage its use unless you are in a CMT session bean."
+msgid "However, it is often desirable to keep your persistence layer portable between non-managed resource-local environments, and systems that can rely on JTA but use BMT instead of CMT. In both cases use programmatic transaction demarcation. Hibernate offers a wrapper API called <literal>Transaction</literal> that translates into the native transaction system of your deployment environment. This API is actually optional, but we strongly encourage its use unless you are in a CMT session bean."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:403
+#: transactions.xml:417
 #, no-c-format
-msgid "Usually, ending a <literal>Session</literal> involves four distinct phases:"
+msgid "Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:409
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:414
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:419
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:430
+#: transactions.xml:444
 #, no-c-format
-msgid "Flushing the session has been discussed earlier, we'll now have a closer look at transaction demarcation and exception handling in both managed- and non-managed environments."
+msgid "We discussed Flushing the session earlier, so we will now have a closer look at transaction demarcation and exception handling in both managed and non-managed environments."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:437
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:439
+#: transactions.xml:453
 #, no-c-format
-msgid "If a Hibernate persistence layer runs in a non-managed environment, database connections are usually handled by simple (i.e. non-DataSource) connection pools from which Hibernate obtains connections as needed. The session/transaction handling idiom looks like this:"
+msgid "If a Hibernate persistence layer runs in a non-managed environment, database connections are usually handled by simple (i.e., non-DataSource) connection pools from which Hibernate obtains connections as needed. The session/transaction handling idiom looks like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:446
+#: transactions.xml:460
 #, no-c-format
 msgid ""
       "<![CDATA[// Non-managed environment idiom\n"
@@ -357,19 +363,19 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:448
+#: transactions.xml:462
 #, no-c-format
-msgid "You don't have to <literal>flush()</literal> the <literal>Session</literal> explicitly - the call to <literal>commit()</literal> automatically triggers the synchronization (depending upon the <link linkend=\"objectstate-flushing\">FlushMode</link> for the session. A call to <literal>close()</literal> marks the end of a session. The main implication of <literal>close()</literal> is that the JDBC connection will be relinquished by the session. This Java code is portable and runs in both non-managed and JTA environments."
+msgid "You do not have to <literal>flush()</literal> the <literal>Session</literal> explicitly: the call to <literal>commit()</literal> automatically triggers the synchronization depending on the <link linkend=\"objectstate-flushing\">FlushMode</link> for the session. A call to <literal>close()</literal> marks the end of a session. The main implication of <literal>close()</literal> is that the JDBC connection will be relinquished by the session. This Java code is portable and runs in both non-managed and JTA environments."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:457
+#: transactions.xml:471
 #, no-c-format
-msgid "A much more flexible solution is Hibernate's built-in \"current session\" context management, as described earlier:"
+msgid "As outlined earlier, a much more flexible solution is Hibernate's built-in \"current session\" context management:"
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:462
+#: transactions.xml:476
 #, no-c-format
 msgid ""
       "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -388,37 +394,37 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:464
+#: transactions.xml:478
 #, no-c-format
-msgid "You will very likely never see these code snippets in a regular application; fatal (system) exceptions should always be caught at the \"top\". In other words, the code that executes Hibernate calls (in the persistence layer) and the code that handles <literal>RuntimeException</literal> (and usually can only clean up and exit) are in different layers. The current context management by Hibernate can significantly simplify this design, as all you need is access to a <literal>SessionFactory</literal>. Exception handling is discussed later in this chapter."
+msgid "You will not see these code snippets in a regular application; fatal (system) exceptions should always be caught at the \"top\". In other words, the code that executes Hibernate calls in the persistence layer, and the code that handles <literal>RuntimeException</literal> (and usually can only clean up and exit), are in different layers. The current context management by Hibernate can significantly simplify this design by accessing a <literal>SessionFactory</literal>. Exception handling is discussed later in this chapter."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:474
+#: transactions.xml:488
 #, no-c-format
-msgid "Note that you should select <literal>org.hibernate.transaction.JDBCTransactionFactory</literal> (which is the default), and for the second example <literal>\"thread\"</literal> as your <literal>hibernate.current_session_context_class</literal>."
+msgid "You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</literal>, which is the default, and for the second example select <literal>\"thread\"</literal> as your <literal>hibernate.current_session_context_class</literal>."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:483
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:485
+#: transactions.xml:499
 #, no-c-format
-msgid "If your persistence layer runs in an application server (e.g. behind EJB session beans), every datasource connection obtained by Hibernate will automatically be part of the global JTA transaction. You can also install a standalone JTA implementation and use it without EJB. Hibernate offers two strategies for JTA integration."
+msgid "If your persistence layer runs in an application server (for example, behind EJB session beans), every datasource connection obtained by Hibernate will automatically be part of the global JTA transaction. You can also install a standalone JTA implementation and use it without EJB. Hibernate offers two strategies for JTA integration."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:492
+#: transactions.xml:506
 #, no-c-format
-msgid "If you use bean-managed transactions (BMT) Hibernate will tell the application server to start and end a BMT transaction if you use the <literal>Transaction</literal> API. So, the transaction management code is identical to the non-managed environment."
+msgid "If you use bean-managed transactions (BMT), Hibernate will tell the application server to start and end a BMT transaction if you use the <literal>Transaction</literal> API. The transaction management code is identical to the non-managed environment."
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:498
+#: transactions.xml:512
 #, no-c-format
 msgid ""
       "<![CDATA[// BMT idiom\n"
@@ -442,13 +448,13 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:500
+#: transactions.xml:514
 #, no-c-format
-msgid "If you want to use a transaction-bound <literal>Session</literal>, that is, the <literal>getCurrentSession()</literal> functionality for easy context propagation, you will have to use the JTA <literal>UserTransaction</literal> API directly:"
+msgid "If you want to use a transaction-bound <literal>Session</literal>, that is, the <literal>getCurrentSession()</literal> functionality for easy context propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:506
+#: transactions.xml:520
 #, no-c-format
 msgid ""
       "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -471,13 +477,13 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:508
+#: transactions.xml:522
 #, no-c-format
-msgid "With CMT, transaction demarcation is done in session bean deployment descriptors, not programmatically, hence, the code is reduced to:"
+msgid "With CMT, transaction demarcation is completed in session bean deployment descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:513
+#: transactions.xml:527
 #, no-c-format
 msgid ""
       "<![CDATA[// CMT idiom\n"
@@ -489,91 +495,91 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:515
+#: transactions.xml:529
 #, no-c-format
-msgid "In a CMT/EJB even rollback happens automatically, since an unhandled <literal>RuntimeException</literal> thrown by a session bean method tells the container to set the global transaction to rollback. <emphasis>This means you do not need to use the Hibernate <literal>Transaction</literal> API at all with BMT or CMT, and you get automatic propagation of the \"current\" Session bound to the transaction.</emphasis>"
+msgid "In a CMT/EJB, even rollback happens automatically. An unhandled <literal>RuntimeException</literal> thrown by a session bean method tells the container to set the global transaction to rollback. <emphasis>You do not need to use the Hibernate <literal>Transaction</literal> API at all with BMT or CMT, and you get automatic propagation of the \"current\" Session bound to the transaction.</emphasis>"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:523
+#: transactions.xml:537
 #, no-c-format
-msgid "Note that you should choose <literal>org.hibernate.transaction.JTATransactionFactory</literal> if you use JTA directly (BMT), and <literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT session bean, when you configure Hibernate's transaction factory. Remember to also set <literal>hibernate.transaction.manager_lookup_class</literal>. Furthermore, make sure that your <literal>hibernate.current_session_context_class</literal> is either unset (backwards compatibility), or set to <literal>\"jta\"</literal>."
+msgid "When configuring Hibernate's transaction factory, choose <literal>org.hibernate.transaction.JTATransactionFactory</literal> if you use JTA directly (BMT), and <literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT session bean. Remember to also set <literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that your <literal>hibernate.current_session_context_class</literal> is either unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:532
+#: transactions.xml:546
 #, no-c-format
-msgid "The <literal>getCurrentSession()</literal> operation has one downside in a JTA environment. There is one caveat to the use of <literal>after_statement</literal> connection release mode, which is then used by default. Due to a silly limitation of the JTA spec, it is not possible for Hibernate to automatically clean up any unclosed <literal>ScrollableResults</literal> or <literal>Iterator</literal> instances returned by <literal>scroll()</literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> release the underlying database cursor by calling <literal>ScrollableResults.close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly from a <literal>finally</literal> block. (Of course, most applications can easily avoid using <literal>scroll()</literal> or <literal>iterate()</literal> at all from the JTA or CMT code.)"
+msgid "The <literal>getCurrentSession()</literal> operation has one downside in a JTA environment. There is one caveat to the use of <literal>after_statement</literal> connection release mode, which is then used by default. Due to a limitation of the JTA spec, it is not possible for Hibernate to automatically clean up any unclosed <literal>ScrollableResults</literal> or <literal>Iterator</literal> instances returned by <literal>scroll()</literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> release the underlying database cursor by calling <literal>ScrollableResults.close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly from a <literal>finally</literal> block. Most applications can easily avoid using <literal>scroll()</literal> or <literal>iterate()</literal> from the JTA or CMT code.)"
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:548
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:550
+#: transactions.xml:564
 #, no-c-format
-msgid "If the <literal>Session</literal> throws an exception (including any <literal>SQLException</literal>), you should immediately rollback the database transaction, call <literal>Session.close()</literal> and discard the <literal>Session</literal> instance. Certain methods of <literal>Session</literal> will <emphasis>not</emphasis> leave the session in a consistent state. No exception thrown by Hibernate can be treated as recoverable. Ensure that the <literal>Session</literal> will be closed by calling <literal>close()</literal> in a <literal>finally</literal> block."
+msgid "If the <literal>Session</literal> throws an exception, including any <literal>SQLException</literal>, immediately rollback the database transaction, call <literal>Session.close()</literal> and discard the <literal>Session</literal> instance. Certain methods of <literal>Session</literal> will <emphasis>not</emphasis> leave the session in a consistent state. No exception thrown by Hibernate can be treated as recoverable. Ensure that the <literal>Session</literal> will be closed by calling <literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:561
+#: transactions.xml:575
 #, no-c-format
-msgid "The <literal>HibernateException</literal>, which wraps most of the errors that can occur in a Hibernate persistence layer, is an unchecked exception (it wasn't in older versions of Hibernate). In our opinion, we shouldn't force the application developer to catch an unrecoverable exception at a low layer. In most systems, unchecked and fatal exceptions are handled in one of the first frames of the method call stack (i.e. in higher layers) and an error message is presented to the application user (or some other appropriate action is taken). Note that Hibernate might also throw other unchecked exceptions which are not a <literal>HibernateException</literal>. These are, again, not recoverable and appropriate action should be taken."
+msgid "The <literal>HibernateException</literal>, which wraps most of the errors that can occur in a Hibernate persistence layer, is an unchecked exception. It was not in older versions of Hibernate. In our opinion, we should not force the application developer to catch an unrecoverable exception at a low layer. In most systems, unchecked and fatal exceptions are handled in one of the first frames of the method call stack (i.e., in higher layers) and either an error message is presented to the application user or some other appropriate action is taken. Note that Hibernate might also throw other unchecked exceptions that are not a <literal>HibernateException</literal>. These are not recoverable and appropriate action should be taken."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:573
+#: transactions.xml:587
 #, no-c-format
-msgid "Hibernate wraps <literal>SQLException</literal>s thrown while interacting with the database in a <literal>JDBCException</literal>. In fact, Hibernate will attempt to convert the exception into a more meaningful subclass of <literal>JDBCException</literal>. The underlying <literal>SQLException</literal> is always available via <literal>JDBCException.getCause()</literal>. Hibernate converts the <literal>SQLException</literal> into an appropriate <literal>JDBCException</literal> subclass using the <literal>SQLExceptionConverter</literal> attached to the <literal>SessionFactory</literal>. By default, the <literal>SQLExceptionConverter</literal> is defined by the configured dialect; however, it is also possible to plug in a custom implementation (see the javadocs for the <literal>SQLExceptionConverterFactory</literal> class for details). The standard <literal>JDBCException</literal> subtypes are:"
+msgid "Hibernate wraps <literal>SQLException</literal>s thrown while interacting with the database in a <literal>JDBCException</literal>. In fact, Hibernate will attempt to convert the exception into a more meaningful subclass of <literal>JDBCException</literal>. The underlying <literal>SQLException</literal> is always available via <literal>JDBCException.getCause()</literal>. Hibernate converts the <literal>SQLException</literal> into an appropriate <literal>JDBCException</literal> subclass using the <literal>SQLExceptionConverter</literal> attached to the <literal>SessionFactory</literal>. By default, the <literal>SQLExceptionConverter</literal> is defined by the configured dialect. However, it is also possible to plug in a custom implementation. See the javadocs for the <literal>SQLExceptionConverterFactory</literal> class for details. The standard <literal>JDBCException</literal> subtypes are:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:589
+#: transactions.xml:603
 #, no-c-format
-msgid "<literal>JDBCConnectionException</literal> - indicates an error with the underlying JDBC communication."
+msgid "<literal>JDBCConnectionException</literal>: indicates an error with the underlying JDBC communication."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:595
+#: transactions.xml:609
 #, no-c-format
-msgid "<literal>SQLGrammarException</literal> - indicates a grammar or syntax problem with the issued SQL."
+msgid "<literal>SQLGrammarException</literal>: indicates a grammar or syntax problem with the issued SQL."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:601
+#: transactions.xml:615
 #, no-c-format
-msgid "<literal>ConstraintViolationException</literal> - indicates some form of integrity constraint violation."
+msgid "<literal>ConstraintViolationException</literal>: indicates some form of integrity constraint violation."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:607
+#: transactions.xml:621
 #, no-c-format
-msgid "<literal>LockAcquisitionException</literal> - indicates an error acquiring a lock level necessary to perform the requested operation."
+msgid "<literal>LockAcquisitionException</literal>: indicates an error acquiring a lock level necessary to perform the requested operation."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:613
+#: transactions.xml:627
 #, no-c-format
-msgid "<literal>GenericJDBCException</literal> - a generic exception which did not fall into any of the other categories."
+msgid "<literal>GenericJDBCException</literal>: a generic exception which did not fall into any of the other categories."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:623
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:625
+#: transactions.xml:639
 #, no-c-format
-msgid "One extremely important feature provided by a managed environment like EJB that is never provided for non-managed code is transaction timeout. Transaction timeouts ensure that no misbehaving transaction can indefinitely tie up resources while returning no response to the user. Outside a managed (JTA) environment, Hibernate cannot fully provide this functionality. However, Hibernate can at least control data access operations, ensuring that database level deadlocks and queries with huge result sets are limited by a defined timeout. In a managed environment, Hibernate can delegate transaction timeout to JTA. This functionality is abstracted by the Hibernate <literal>Transaction</literal> object."
+msgid "An important feature provided by a managed environment like EJB, that is never provided for non-managed code, is transaction timeout. Transaction timeouts ensure that no misbehaving transaction can indefinitely tie up resources while returning no response to the user. Outside a managed (JTA) environment, Hibernate cannot fully provide this functionality. However, Hibernate can at least control data access operations, ensuring that database level deadlocks and queries with huge result sets are limited by a defined timeout. In a managed environment, Hibernate can delegate transaction timeout to JTA. This functionality is abstracted by the Hibernate <literal>Transaction</literal> object."
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:638
+#: transactions.xml:652
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -598,37 +604,37 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:640
+#: transactions.xml:654
 #, no-c-format
-msgid "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, where transaction timeouts must be defined declaratively."
+msgid "<literal>setTimeout()</literal> cannot be called in a CMT bean, where transaction timeouts must be defined declaratively."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:650
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:666
 #, no-c-format
-msgid "The only approach that is consistent with high concurrency and high scalability is optimistic concurrency control with versioning. Version checking uses version numbers, or timestamps, to detect conflicting updates (and to prevent lost updates). Hibernate provides for three possible approaches to writing application code that uses optimistic concurrency. The use cases we show are in the context of long conversations, but version checking also has the benefit of preventing lost updates in single database transactions."
+msgid "The only approach that is consistent with high concurrency and high scalability, is optimistic concurrency control with versioning. Version checking uses version numbers, or timestamps, to detect conflicting updates and to prevent lost updates. Hibernate provides three possible approaches to writing application code that uses optimistic concurrency. The use cases we discuss are in the context of long conversations, but version checking also has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:663
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:665
+#: transactions.xml:679
 #, no-c-format
-msgid "In an implementation without much help from Hibernate, each interaction with the database occurs in a new <literal>Session</literal> and the developer is responsible for reloading all persistent instances from the database before manipulating them. This approach forces the application to carry out its own version checking to ensure conversation transaction isolation. This approach is the least efficient in terms of database access. It is the approach most similar to entity EJBs."
+msgid "In an implementation without much help from Hibernate, each interaction with the database occurs in a new <literal>Session</literal> and the developer is responsible for reloading all persistent instances from the database before manipulating them. The application is forced to carry out its own version checking to ensure conversation transaction isolation. This approach is the least efficient in terms of database access. It is the approach most similar to entity EJBs."
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:674
+#: transactions.xml:688
 #, no-c-format
 msgid ""
       "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -645,43 +651,43 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:676
+#: transactions.xml:690
 #, no-c-format
 msgid "The <literal>version</literal> property is mapped using <literal>&lt;version&gt;</literal>, and Hibernate will automatically increment it during flush if the entity is dirty."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:682
+#: transactions.xml:696
 #, no-c-format
-msgid "Of course, if you are operating in a low-data-concurrency environment and don't require version checking, you may use this approach and just skip the version check. In that case, <emphasis>last commit wins</emphasis> will be the default strategy for your long conversations. Keep in mind that this might confuse the users of the application, as they might experience lost updates without error messages or a chance to merge conflicting changes."
+msgid "If you are operating in a low-data-concurrency environment, and do not require version checking, you can use this approach and skip the version check. In this case, <emphasis>last commit wins</emphasis> is the default strategy for long conversations. Be aware that this might confuse the users of the application, as they might experience lost updates without error messages or a chance to merge conflicting changes."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:691
+#: transactions.xml:705
 #, no-c-format
-msgid "Clearly, manual version checking is only feasible in very trivial circumstances and not practical for most applications. Often not only single instances, but complete graphs of modified objects have to be checked. Hibernate offers automatic version checking with either an extended <literal>Session</literal> or detached instances as the design paradigm."
+msgid "Manual version checking is only feasible in trivial circumstances and not practical for most applications. Often not only single instances, but complete graphs of modified objects, have to be checked. Hibernate offers automatic version checking with either an extended <literal>Session</literal> or detached instances as the design paradigm."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:702
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:704
+#: transactions.xml:718
 #, no-c-format
-msgid "A single <literal>Session</literal> instance and its persistent instances are used for the whole conversation, known as <emphasis>session-per-conversation</emphasis>. Hibernate checks instance versions at flush time, throwing an exception if concurrent modification is detected. It's up to the developer to catch and handle this exception (common options are the opportunity for the user to merge changes or to restart the business conversation with non-stale data)."
+msgid "A single <literal>Session</literal> instance and its persistent instances that are used for the whole conversation are known as <emphasis>session-per-conversation</emphasis>. Hibernate checks instance versions at flush time, throwing an exception if concurrent modification is detected. It is up to the developer to catch and handle this exception. Common options are the opportunity for the user to merge changes or to restart the business conversation with non-stale data."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:713
+#: transactions.xml:727
 #, no-c-format
-msgid "The <literal>Session</literal> is disconnected from any underlying JDBC connection when waiting for user interaction. This approach is the most efficient in terms of database access. The application need not concern itself with version checking or with reattaching detached instances, nor does it have to reload instances in every database transaction."
+msgid "The <literal>Session</literal> is disconnected from any underlying JDBC connection when waiting for user interaction. This approach is the most efficient in terms of database access. The application does not version check or reattach detached instances, nor does it have to reload instances in every database transaction."
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:721
+#: transactions.xml:735
 #, no-c-format
 msgid ""
       "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -695,49 +701,55 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:722
+#: transactions.xml:736
 #, no-c-format
-msgid "The <literal>foo</literal> object still knows which <literal>Session</literal> it was loaded in. Beginning a new database transaction on an old session obtains a new connection and resumes the session. Committing a database transaction disconnects a session from the JDBC connection and returns the connection to the pool. After reconnection, to force a version check on data you aren't updating, you may call <literal>Session.lock()</literal> with <literal>LockMode.READ</literal> on any objects that might have been updated by another transaction. You don't need to lock any data that you <emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode.MANUAL</literal> on an extended <literal>Session</literal>, so that only the last database transaction cycle is allowed to actually persist all modifications made in this conversation. Hence, only this last database transaction would include the <literal>flush()</literal> operation, and then also <literal>close()!
 </literal> the session to end the conversation."
+msgid "The <literal>foo</literal> object knows which <literal>Session</literal> it was loaded in. Beginning a new database transaction on an old session obtains a new connection and resumes the session. Committing a database transaction disconnects a session from the JDBC connection and returns the connection to the pool. After reconnection, to force a version check on data you are not updating, you can call <literal>Session.lock()</literal> with <literal>LockMode.READ</literal> on any objects that might have been updated by another transaction. You do not need to lock any data that you <emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode.MANUAL</literal> on an extended <literal>Session</literal>, so that only the last database transaction cycle is allowed to actually persist all modifications made in this conversation. Only this last database transaction will include the <literal>flush()</literal> operation, and then <literal>close()</literal> the se!
 ssion to end the conversation."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:737
+#: transactions.xml:751
 #, no-c-format
-msgid "This pattern is problematic if the <literal>Session</literal> is too big to be stored during user think time, e.g. an <literal>HttpSession</literal> should be kept as small as possible. As the <literal>Session</literal> is also the (mandatory) first-level cache and contains all loaded objects, we can probably use this strategy only for a few request/response cycles. You should use a <literal>Session</literal> only for a single conversation, as it will soon also have stale data."
+msgid "This pattern is problematic if the <literal>Session</literal> is too big to be stored during user think time (for example, an <literal>HttpSession</literal> should be kept as small as possible). As the <literal>Session</literal> is also the first-level cache and contains all loaded objects, we can probably use this strategy only for a few request/response cycles. Use a <literal>Session</literal> only for a single conversation as it will soon have stale data."
 msgstr ""
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:747
+#: transactions.xml:763
 #, no-c-format
-msgid "(Note that earlier Hibernate versions required explicit disconnection and reconnection of a <literal>Session</literal>. These methods are deprecated, as beginning and ending a transaction has the same effect.)"
+msgid "Earlier versions of Hibernate required explicit disconnection and reconnection of a <literal>Session</literal>. These methods are deprecated, as beginning and ending a transaction has the same effect."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:753
+#: transactions.xml:769
 #, no-c-format
-msgid "Also note that you should keep the disconnected <literal>Session</literal> close to the persistence layer. In other words, use an EJB stateful session bean to hold the <literal>Session</literal> in a three-tier environment, and don't transfer it to the web layer (or even serialize it to a separate tier) to store it in the <literal>HttpSession</literal>."
+msgid "Keep the disconnected <literal>Session</literal> close to the persistence layer. Use an EJB stateful session bean to hold the <literal>Session</literal> in a three-tier environment. Do not transfer it to the web layer, or even serialize it to a separate tier, to store it in the <literal>HttpSession</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:761
+#: transactions.xml:777
 #, no-c-format
-msgid "The extended session pattern, or <emphasis>session-per-conversation</emphasis>, is more difficult to implement with automatic current session context management. You need to supply your own implementation of the <literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki for examples."
+msgid "The extended session pattern, or <emphasis>session-per-conversation</emphasis>, is more difficult to implement with automatic current session context management. You need to supply your own implementation of the <literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki for examples."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:771
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:773
+#: transactions.xml:789
 #, no-c-format
 msgid "Each interaction with the persistent store occurs in a new <literal>Session</literal>. However, the same persistent instances are reused for each interaction with the database. The application manipulates the state of detached instances originally loaded in another <literal>Session</literal> and then reattaches them using <literal>Session.update()</literal>, <literal>Session.saveOrUpdate()</literal>, or <literal>Session.merge()</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: transactions.xml:781
+#: transactions.xml:797
 #, no-c-format
 msgid ""
       "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -750,200 +762,200 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:783
+#: transactions.xml:799
 #, no-c-format
 msgid "Again, Hibernate will check instance versions during flush, throwing an exception if conflicting updates occurred."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:788
+#: transactions.xml:804
 #, no-c-format
-msgid "You may also call <literal>lock()</literal> instead of <literal>update()</literal> and use <literal>LockMode.READ</literal> (performing a version check, bypassing all caches) if you are sure that the object has not been modified."
+msgid "You can also call <literal>lock()</literal> instead of <literal>update()</literal>, and use <literal>LockMode.READ</literal> (performing a version check and bypassing all caches) if you are sure that the object has not been modified."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:797
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:799
+#: transactions.xml:815
 #, no-c-format
-msgid "You may disable Hibernate's automatic version increment for particular properties and collections by setting the <literal>optimistic-lock</literal> mapping attribute to <literal>false</literal>. Hibernate will then no longer increment versions if the property is dirty."
+msgid "You can disable Hibernate's automatic version increment for particular properties and collections by setting the <literal>optimistic-lock</literal> mapping attribute to <literal>false</literal>. Hibernate will then no longer increment versions if the property is dirty."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:806
+#: transactions.xml:822
 #, no-c-format
-msgid "Legacy database schemas are often static and can't be modified. Or, other applications might also access the same database and don't know how to handle version numbers or even timestamps. In both cases, versioning can't rely on a particular column in a table. To force a version check without a version or timestamp property mapping, with a comparison of the state of all fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the <literal>&lt;class&gt;</literal> mapping. Note that this conceptually only works if Hibernate can compare the old and new state, i.e. if you use a single long <literal>Session</literal> and not session-per-request-with-detached-objects."
+msgid "Legacy database schemas are often static and cannot be modified. Or, other applications might access the same database and will not know how to handle version numbers or even timestamps. In both cases, versioning cannot rely on a particular column in a table. To force a version check with a comparison of the state of all fields in a row but without a version or timestamp property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the <literal>&lt;class&gt;</literal> mapping. This conceptually only works if Hibernate can compare the old and the new state (i.e., if you use a single long <literal>Session</literal> and not session-per-request-with-detached-objects)."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:817
+#: transactions.xml:834
 #, no-c-format
-msgid "Sometimes concurrent modification can be permitted as long as the changes that have been made don't overlap. If you set <literal>optimistic-lock=\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate will only compare dirty fields during flush."
+msgid "Concurrent modification can be permitted in instances where the changes that have been made do not overlap. If you set <literal>optimistic-lock=\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate will only compare dirty fields during flush."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:823
+#: transactions.xml:840
 #, no-c-format
-msgid "In both cases, with dedicated version/timestamp columns or with full/dirty field comparison, Hibernate uses a single <literal>UPDATE</literal> statement (with an appropriate <literal>WHERE</literal> clause) per entity to execute the version check and update the information. If you use transitive persistence to cascade reattachment to associated entities, Hibernate might execute unnecessary updates. This is usually not a problem, but <emphasis>on update</emphasis> triggers in the database might be executed even when no changes have been made to detached instances. You can customize this behavior by setting <literal>select-before-update=\"true\"</literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate to <literal>SELECT</literal> the instance to ensure that changes did actually occur, before updating the row."
+msgid "In both cases, with dedicated version/timestamp columns or with a full/dirty field comparison, Hibernate uses a single <literal>UPDATE</literal> statement, with an appropriate <literal>WHERE</literal> clause, per entity to execute the version check and update the information. If you use transitive persistence to cascade reattachment to associated entities, Hibernate may execute unnecessary updates. This is usually not a problem, but <emphasis>on update</emphasis> triggers in the database might be executed even when no changes have been made to detached instances. You can customize this behavior by setting <literal>select-before-update=\"true\"</literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate to <literal>SELECT</literal> the instance to ensure that changes did occur before updating the row."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:841
+#: transactions.xml:858
 #, no-c-format
-msgid "Pessimistic Locking"
+msgid "Pessimistic locking"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:843
+#: transactions.xml:860
 #, no-c-format
-msgid "It is not intended that users spend much time worrying about locking strategies. It's usually enough to specify an isolation level for the JDBC connections and then simply let the database do all the work. However, advanced users may sometimes wish to obtain exclusive pessimistic locks, or re-obtain locks at the start of a new transaction."
+msgid "It is not intended that users spend much time worrying about locking strategies. It is usually enough to specify an isolation level for the JDBC connections and then simply let the database do all the work. However, advanced users may wish to obtain exclusive pessimistic locks or re-obtain locks at the start of a new transaction."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:850
+#: transactions.xml:867
 #, no-c-format
-msgid "Hibernate will always use the locking mechanism of the database, never lock objects in memory!"
+msgid "Hibernate will always use the locking mechanism of the database; it never lock objects in memory."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:855
+#: transactions.xml:872
 #, no-c-format
-msgid "The <literal>LockMode</literal> class defines the different lock levels that may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+msgid "The <literal>LockMode</literal> class defines the different lock levels that can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:862
+#: transactions.xml:879
 #, no-c-format
 msgid "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate updates or inserts a row."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:868
+#: transactions.xml:885
 #, no-c-format
-msgid "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user request using <literal>SELECT ... FOR UPDATE</literal> on databases which support that syntax."
+msgid "<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user request using <literal>SELECT ... FOR UPDATE</literal> on databases which support that syntax."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:874
+#: transactions.xml:891
 #, no-c-format
-msgid "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under Oracle."
+msgid "<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under Oracle."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:880
+#: transactions.xml:897
 #, no-c-format
-msgid "<literal>LockMode.READ</literal> is acquired automatically when Hibernate reads data under Repeatable Read or Serializable isolation level. May be re-acquired by explicit user request."
+msgid "<literal>LockMode.READ</literal> is acquired automatically when Hibernate reads data under Repeatable Read or Serializable isolation level. It can be re-acquired by explicit user request."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:887
+#: transactions.xml:904
 #, no-c-format
 msgid "<literal>LockMode.NONE</literal> represents the absence of a lock. All objects switch to this lock mode at the end of a <literal>Transaction</literal>. Objects associated with the session via a call to <literal>update()</literal> or <literal>saveOrUpdate()</literal> also start out in this lock mode."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:896
+#: transactions.xml:913
 #, no-c-format
 msgid "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:902
+#: transactions.xml:919
 #, no-c-format
 msgid "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:907
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:912
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:918
+#: transactions.xml:935
 #, no-c-format
 msgid "If <literal>Session.load()</literal> is called with <literal>UPGRADE</literal> or <literal>UPGRADE_NOWAIT</literal>, and the requested object was not yet loaded by the session, the object is loaded using <literal>SELECT ... FOR UPDATE</literal>. If <literal>load()</literal> is called for an object that is already loaded with a less restrictive lock than the one requested, Hibernate calls <literal>lock()</literal> for that object."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:927
+#: transactions.xml:944
 #, no-c-format
-msgid "<literal>Session.lock()</literal> performs a version number check if the specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR UPDATE</literal> is used.)"
+msgid "<literal>Session.lock()</literal> performs a version number check if the specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR UPDATE</literal> is used."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:934
+#: transactions.xml:951
 #, no-c-format
-msgid "If the database does not support the requested lock mode, Hibernate will use an appropriate alternate mode (instead of throwing an exception). This ensures that applications will be portable."
+msgid "If the requested lock mode is not supported by the database, Hibernate uses an appropriate alternate mode instead of throwing an exception. This ensures that applications are portable."
 msgstr ""
 
 #. Tag: title
-#: transactions.xml:943
+#: transactions.xml:960
 #, no-c-format
-msgid "Connection Release Modes"
+msgid "Connection release modes"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:945
+#: transactions.xml:962
 #, no-c-format
-msgid "The legacy (2.x) behavior of Hibernate in regards to JDBC connection management was that a <literal>Session</literal> would obtain a connection when it was first needed and then hold unto that connection until the session was closed. Hibernate 3.x introduced the notion of connection release modes to tell a session how to handle its JDBC connections. Note that the following discussion is pertinent only to connections provided through a configured <literal>ConnectionProvider</literal>; user-supplied connections are outside the breadth of this discussion. The different release modes are identified by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</literal>:"
+msgid "One of the legacies of Hibernate 2.x JDBC connection management meant that a <literal>Session</literal> would obtain a connection when it was first required and then maintain that connection until the session was closed. Hibernate 3.x introduced the notion of connection release modes that would instruct a session how to handle its JDBC connections. The following discussion is pertinent only to connections provided through a configured <literal>ConnectionProvider</literal>. User-supplied connections are outside the breadth of this discussion. The different release modes are identified by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</literal>:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:959
+#: transactions.xml:976
 #, no-c-format
-msgid "<literal>ON_CLOSE</literal> - is essentially the legacy behavior described above. The Hibernate session obtains a connection when it first needs to perform some JDBC access and holds unto that connection until the session is closed."
+msgid "<literal>ON_CLOSE</literal>: is the legacy behavior described above. The Hibernate session obtains a connection when it first needs to perform some JDBC access and maintains that connection until the session is closed."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:966
+#: transactions.xml:983
 #, no-c-format
-msgid "<literal>AFTER_TRANSACTION</literal> - says to release connections after a <literal>org.hibernate.Transaction</literal> has completed."
+msgid "<literal>AFTER_TRANSACTION</literal>: releases connections after a <literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:972
+#: transactions.xml:989
 #, no-c-format
-msgid "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) - says to release connections after each and every statement execution. This aggressive releasing is skipped if that statement leaves open resources associated with the given session; currently the only situation where this occurs is through the use of <literal>org.hibernate.ScrollableResults</literal>."
+msgid "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): releases connections after every statement execution. This aggressive releasing is skipped if that statement leaves open resources associated with the given session. Currently the only situation where this occurs is through the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:982
+#: transactions.xml:999
 #, no-c-format
-msgid "The configuration parameter <literal>hibernate.connection.release_mode</literal> is used to specify which release mode to use. The possible values:"
+msgid "The configuration parameter <literal>hibernate.connection.release_mode</literal> is used to specify which release mode to use. The possible values are as follows:"
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1006
 #, no-c-format
-msgid "<literal>auto</literal> (the default) - this choice delegates to the release mode returned by the <literal>org.hibernate.transaction.TransactionFactory.getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good idea to change this default behavior as failures due to the value of this setting tend to indicate bugs and/or invalid assumptions in user code."
+msgid "<literal>auto</literal> (the default): this choice delegates to the release mode returned by the <literal>org.hibernate.transaction.TransactionFactory.getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this default behavior as failures due to the value of this setting tend to indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:999
+#: transactions.xml:1016
 #, no-c-format
-msgid "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. This setting is left for backwards compatibility, but its use is highly discouraged."
+msgid "<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:1005
+#: transactions.xml:1022
 #, no-c-format
-msgid "<literal>after_transaction</literal> - says to use ConnectionReleaseMode.AFTER_TRANSACTION. This setting should not be used in JTA environments. Also note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is considered to be in auto-commit mode connections will be released as if the release mode were AFTER_STATEMENT."
+msgid "<literal>after_transaction</literal>: uses ConnectionReleaseMode.AFTER_TRANSACTION. This setting should not be used in JTA environments. Also note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is considered to be in auto-commit mode, connections will be released as if the release mode were AFTER_STATEMENT."
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:1013
+#: transactions.xml:1030
 #, no-c-format
-msgid "<literal>after_statement</literal> - says to use ConnectionReleaseMode.AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</literal> is consulted to see if it supports this setting (<literal>supportsAggressiveRelease()</literal>). If not, the release mode is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only safe in environments where we can either re-acquire the same underlying JDBC connection each time we make a call into <literal>ConnectionProvider.getConnection()</literal> or in auto-commit environments where it does not matter whether we get back the same connection."
+msgid "<literal>after_statement</literal>: uses ConnectionReleaseMode.AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</literal> is consulted to see if it supports this setting (<literal>supportsAggressiveRelease()</literal>). If not, the release mode is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only safe in environments where we can either re-acquire the same underlying JDBC connection each time you make a call into <literal>ConnectionProvider.getConnection()</literal> or in auto-commit environments where it does not matter if we re-establish the same connection."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -15,67 +15,88 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:33
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
+msgid "Tutorial"
 msgstr ""
 
-#. Tag: title
-#: tutorial.xml:36
+#. Tag: para
+#: tutorial.xml:33
 #, no-c-format
-msgid "Preface"
+msgid "Intended for new users, this chapter provides an step-by-step introduction to Hibernate, starting with a simple application using an in-memory database. The tutorial is based on an earlier tutorial developed by Michael Gloegl. All code is contained in the <filename>tutorials/web</filename> directory of the project source."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:38
+#: tutorial.xml:42
 #, no-c-format
-msgid "This chapter is an introduction to Hibernate by way of a tutorial, intended for new users of Hibernate. We start with a simple application using an in-memory database. We build the application in small, easy to understand steps. The tutorial is based on another, earlier one developed by Michael Gloegl. All code is contained in the <filename>tutorials/web</filename> directory of the project source."
+msgid "This tutorial expects the user have knowledge of both Java and SQL. If you have a limited knowledge of JAVA or SQL, it is advised that you start with a good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
 
 #. Tag: para
 #: tutorial.xml:51
 #, no-c-format
-msgid "This tutorial expects the user have knowledge of both Java and SQL. If you are new or uncomfortable with either, it is advised that you start with a good introduction to that technology prior to attempting to learn Hibernate. It will save time and effort in the long run."
+msgid "The distribution contains another example application under the <filename>tutorial/eg</filename> project source directory."
 msgstr ""
 
+#. Tag: title
+#: tutorial.xml:59
+#, no-c-format
+msgid "Part 1 - The first Hibernate Application"
+msgstr ""
+
 #. Tag: para
 #: tutorial.xml:61
 #, no-c-format
-msgid "There is another tutorial/example application in the <filename>/tutorials/eg</filename> directory of the project source. That example is console based and as such would not have the dependency on a servlet container to execute. The basic setup is the same as the instructions below."
+msgid "For this example, we will set up a small database application that can store events we want to attend and information about the host(s) of these events."
 msgstr ""
 
+#. Tag: para
+#: tutorial.xml:67
+#, no-c-format
+msgid "Although you can use whatever database you feel comfortable using, we will use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java database) to avoid describing installation/setup of any particular database servers."
+msgstr ""
+
 #. Tag: title
-#: tutorial.xml:71
+#: tutorial.xml:76
 #, no-c-format
-msgid "Part 1 - The first Hibernate Application"
+msgid "Setup"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:73
+#: tutorial.xml:78
 #, no-c-format
-msgid "Let's assume we need a small database application that can store events we want to attend, and information about the host(s) of these events. We will use an in-memory, Java database named HSQLDB to avoid describing installation/setup of any particular database servers. Feel free to tweak this tutorial to use whatever database you feel comfortable using."
+msgid "The first thing we need to do is to set up the development environment. We will be using the \"standard layout\" advocated by alot of build tools such as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has a good resource describing this <ulink url=\"http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html\">layout</ulink>. As this tutorial is to be a web application, we will be creating and making use of <filename>src/main/java</filename>, <filename>src/main/resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:82
+#: tutorial.xml:88
 #, no-c-format
-msgid "The first thing we need to do is set up our development environment, and specifically to setup all the required dependencies to Hibernate as well as other libraries. Hibernate is built using Maven which amongst other features provides <literal>dependecy management</literal>; moreover it provides <emphasis>transitive</emphasis> <literal>dependecy management</literal> which simply means that to use Hibernate we can simply define our dependency on Hibernate, Hibernate itself defines the dependencies it needs which then become transitive dependencies of our project."
+msgid "We will be using Maven in this tutorial, taking advantage of its transitive dependency management capabilities as well as the ability of many IDEs to automatically set up a project for us based on the maven descriptor."
 msgstr ""
 
 #. Tag: programlisting
 #: tutorial.xml:94
 #, no-c-format
 msgid ""
-      "<![CDATA[.\n"
-      "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+      "<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
       "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
       "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n"
       "\n"
-      "    ...\n"
+      "    <modelVersion>4.0.0</modelVersion>\n"
       "\n"
+      "    <groupId>org.hibernate.tutorials</groupId>\n"
+      "    <artifactId>hibernate-tutorial</artifactId>\n"
+      "    <version>1.0.0-SNAPSHOT</version>\n"
+      "    <name>First Hibernate Tutorial</name>\n"
+      "\n"
+      "    <build>\n"
+      "         <!-- we dont want the version to be part of the generated war file name -->\n"
+      "         <finalName>${artifactId}</finalName>\n"
+      "    </build>\n"
+      "\n"
       "    <dependencies>\n"
       "        <dependency>\n"
-      "            <groupId>${groupId}</groupId>\n"
+      "            <groupId>org.hibernate</groupId>\n"
       "            <artifactId>hibernate-core</artifactId>\n"
       "        </dependency>\n"
       "\n"
@@ -84,6 +105,18 @@
       "            <groupId>javax.servlet</groupId>\n"
       "            <artifactId>servlet-api</artifactId>\n"
       "        </dependency>\n"
+      "\n"
+      "        <!-- Hibernate uses slf4j for logging, for our purposes here use the simple backend -->\n"
+      "        <dependency>\n"
+      "            <groupId>org.slf4j</groupId>\n"
+      "            <artifactId>slf4j-simple</artifactId>\n"
+      "        </dependency>\n"
+      "\n"
+      "        <!-- Hibernate gives you a choice of bytecode providers between cglib and javassist -->\n"
+      "        <dependency>\n"
+      "            <groupId>javassist</groupId>\n"
+      "            <artifactId>javassist</artifactId>\n"
+      "        </dependency>\n"
       "    </dependencies>\n"
       "\n"
       "</project>]]>"
@@ -92,35 +125,29 @@
 #. Tag: para
 #: tutorial.xml:97
 #, no-c-format
-msgid "Essentially we are describing here the <filename>/tutorials/web/pom.xml</filename> file. See the <ulink url=\"http://maven.org\">Maven</ulink> site for more information."
+msgid "It is not a requirement to use Maven. If you wish to use something else to build this tutoial (such as Ant), the layout will remain the same. The only change is that you will need to manually account for all the needed dependencies. If you use something like <ulink url=\"http://ant.apache.org/ivy/\">Ivy</ulink> providing transitive dependency management you would still use the dependencies mentioned below. Otherwise, you'd need to grab <emphasis>all</emphasis> dependencies, both explicit and transitive, and add them to the project's classpath. If working from the Hibernate distribution bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts in the <filename>lib/required</filename> directory and all files from either the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/javassist</filename> directory; additionally you will need both the servlet-api jar and one of the slf4j logging backends."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:105
+#: tutorial.xml:114
 #, no-c-format
-msgid "While not strictly necessary, most IDEs have integration with Maven to read these POM files and automatically set up a project for you which can save lots of time and effort."
+msgid "Save this file as <filename>pom.xml</filename> in the project root directory."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:112
-#, no-c-format
-msgid "Next we create a class that represents the event we want to store in database."
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:123
 #, no-c-format
-msgid "Our first persistent class is a simple JavaBean class with some properties:"
+msgid "Next, we create a class that represents the event we want to store in the database; it is a simple JavaBean class with some properties:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:123
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
       "<![CDATA[package org.hibernate.tutorial.domain;\n"
@@ -162,67 +189,49 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:125
+#: tutorial.xml:130
 #, no-c-format
-msgid "You can see that this class uses standard JavaBean naming conventions for property getter and setter methods, as well as private visibility for the fields. This is a recommended design - but not required. Hibernate can also access fields directly, the benefit of accessor methods is robustness for refactoring. The no-argument constructor is required to instantiate an object of this class through reflection."
+msgid "This class uses standard JavaBean naming conventions for property getter and setter methods, as well as private visibility for the fields. Although this is the recommended design, it is not required. Hibernate can also access fields directly, the benefit of accessor methods is robustness for refactoring."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:133
+#: tutorial.xml:138
 #, no-c-format
-msgid "The <literal>id</literal> property holds a unique identifier value for a particular event. All persistent entity classes (there are less important dependent classes as well) will need such an identifier property if we want to use the full feature set of Hibernate. In fact, most applications (esp. web applications) need to distinguish objects by identifier, so you should consider this a feature rather than a limitation. However, we usually don't manipulate the identity of an object, hence the setter method should be private. Only Hibernate will assign identifiers when an object is saved. You can see that Hibernate can access public, private, and protected accessor methods, as well as (public, private, protected) fields directly. The choice is up to you and you can match it to fit your application design."
+msgid "The <literal>id</literal> property holds a unique identifier value for a particular event. All persistent entity classes (there are less important dependent classes as well) will need such an identifier property if we want to use the full feature set of Hibernate. In fact, most applications, especially web applications, need to distinguish objects by identifier, so you should consider this a feature rather than a limitation. However, we usually do not manipulate the identity of an object, hence the setter method should be private. Only Hibernate will assign identifiers when an object is saved. Hibernate can access public, private, and protected accessor methods, as well as public, private and protected fields directly. The choice is up to you and you can match it to fit your application design."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:145
+#: tutorial.xml:153
 #, no-c-format
-msgid "The no-argument constructor is a requirement for all persistent classes; Hibernate has to create objects for you, using Java Reflection. The constructor can be private, however, package visibility is required for runtime proxy generation and efficient data retrieval without bytecode instrumentation."
+msgid "The no-argument constructor is a requirement for all persistent classes; Hibernate has to create objects for you, using Java Reflection. The constructor can be private, however package or public visibility is required for runtime proxy generation and efficient data retrieval without bytecode instrumentation."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:152
+#: tutorial.xml:161
 #, no-c-format
-msgid "Place this Java source file in a directory called <literal>src</literal> in the development folder, and in its correct package. The directory should now look like this:"
+msgid "Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</filename> directory."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:157
-#, no-c-format
-msgid ""
-      "<![CDATA[.\n"
-      "+lib\n"
-      "  <Hibernate and third-party libraries>\n"
-      "+src\n"
-      "  +events\n"
-      "    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:159
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:166
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:168
+#: tutorial.xml:170
 #, no-c-format
 msgid "Hibernate needs to know how to load and store objects of the persistent class. This is where the Hibernate mapping file comes into play. The mapping file tells Hibernate what table in the database it has to access, and what columns in that table it should use."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:175
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:179
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -230,36 +239,36 @@
       "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
       "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
       "\n"
-      "<hibernate-mapping>\n"
+      "<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
       "[...]\n"
       "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:181
+#: tutorial.xml:184
 #, no-c-format
-msgid "Note that the Hibernate DTD is very sophisticated. You can use it for auto-completion of XML mapping elements and attributes in your editor or IDE. You also should open up the DTD file in your text editor - it's the easiest way to get an overview of all elements and attributes and to see the defaults, as well as some comments. Note that Hibernate will not load the DTD file from the web, but first look it up from the classpath of the application. The DTD file is included in <literal>hibernate3.jar</literal> as well as in the <literal>src/</literal> directory of the Hibernate distribution."
+msgid "Hibernate DTD is sophisticated. You can use it for auto-completion of XML mapping elements and attributes in your editor or IDE. Opening up the DTD file in your text editor is the easiest way to get an overview of all elements and attributes, and to view the defaults, as well as some comments. Hibernate will not load the DTD file from the web, but first look it up from the classpath of the application. The DTD file is included in <filename>hibernate-core.jar</filename> (it is also included in the <filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:192
+#: tutorial.xml:197
 #, no-c-format
-msgid "We will omit the DTD declaration in future examples to shorten the code. It is of course not optional."
+msgid "We will omit the DTD declaration in future examples to shorten the code. It is, of course, not optional."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:197
+#: tutorial.xml:203
 #, no-c-format
-msgid "Between the two <literal>hibernate-mapping</literal> tags, include a <literal>class</literal> element. All persistent entity classes (again, there might be dependent classes later on, which are not first-class entities) need such a mapping, to a table in the SQL database:"
+msgid "Between the two <literal>hibernate-mapping</literal> tags, include a <literal>class</literal> element. All persistent entity classes (again, there might be dependent classes later on, which are not first-class entities) need a mapping to a table in the SQL database:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:204
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-      "<![CDATA[<hibernate-mapping>\n"
+      "<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
       "\n"
-      "    <class name=\"events.Event\" table=\"EVENTS\">\n"
+      "    <class name=\"Event\" table=\"EVENTS\">\n"
       "\n"
       "    </class>\n"
       "\n"
@@ -267,18 +276,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:206
+#: tutorial.xml:212
 #, no-c-format
-msgid "So far we told Hibernate how to persist and load object of class <literal>Event</literal> to the table <literal>EVENTS</literal>, each instance represented by a row in that table. Now we continue with a mapping of the unique identifier property to the tables primary key. In addition, as we don't want to care about handling this identifier, we configure Hibernate's identifier generation strategy for a surrogate primary key column:"
+msgid "So far we have told Hibernate how to persist and load object of class <literal>Event</literal> to the table <literal>EVENTS</literal>. Each instance is now represented by a row in that table. Now we can continue by mapping the unique identifier property to the tables primary key. As we do not want to care about handling this identifier, we configure Hibernate's identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:214
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-      "<![CDATA[<hibernate-mapping>\n"
+      "<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
       "\n"
-      "    <class name=\"events.Event\" table=\"EVENTS\">\n"
+      "    <class name=\"Event\" table=\"EVENTS\">\n"
       "        <id name=\"id\" column=\"EVENT_ID\">\n"
       "            <generator class=\"native\"/>\n"
       "        </id>\n"
@@ -288,25 +297,37 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:216
+#: tutorial.xml:224
 #, no-c-format
-msgid "The <literal>id</literal> element is the declaration of the identifier property, <literal>name=\"id\"</literal> declares the name of the Java property - Hibernate will use the getter and setter methods to access the property. The column attribute tells Hibernate which column of the <literal>EVENTS</literal> table we use for this primary key. The nested <literal>generator</literal> element specifies the identifier generation strategy, in this case we used <literal>native</literal>, which picks the best strategy depending on the configured database (dialect). Hibernate supports database generated, globally unique, as well as application assigned identifiers (or any strategy you have written an extension for)."
+msgid "The <literal>id</literal> element is the declaration of the identifier property. The <literal>name=\"id\"</literal> mapping attribute declares the name of the JavaBean property and tells Hibernate to use the <literal>getId()</literal> and <literal>setId()</literal> methods to access the property. The column attribute tells Hibernate which column of the <literal>EVENTS</literal> table holds the primary key value."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:229
+#: tutorial.xml:234
 #, no-c-format
-msgid "Finally we include declarations for the persistent properties of the class in the mapping file. By default, no properties of the class are considered persistent:"
+msgid "The nested <literal>generator</literal> element specifies the identifier generation strategy (aka how are identifier values generated?). In this case we choose <literal>native</literal>, which offers a level of portability depending on the configured database dialect. Hibernate supports database generated, globally unique, as well as application assigned, identifiers. Identifier value generation is also one of Hibernate's many extension points and you can plugin in your own strategy."
 msgstr ""
 
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid "<literal>native</literal> is no longer consider the best strategy in terms of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, no-c-format
+msgid "Lastly, we need to tell Hibernate about the remaining entity class properties. By default, no properties of the class are considered persistent:"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:235
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
-      "<hibernate-mapping>\n"
+      "<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
       "\n"
-      "    <class name=\"events.Event\" table=\"EVENTS\">\n"
+      "    <class name=\"Event\" table=\"EVENTS\">\n"
       "        <id name=\"id\" column=\"EVENT_ID\">\n"
       "            <generator class=\"native\"/>\n"
       "        </id>\n"
@@ -318,80 +339,79 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:237
+#: tutorial.xml:260
 #, no-c-format
-msgid "Just as with the <literal>id</literal> element, the <literal>name</literal> attribute of the <literal>property</literal> element tells Hibernate which getter and setter methods to use. So, in this case, Hibernate will look for <literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/setTitle()</literal>."
+msgid "Similar to the <literal>id</literal> element, the <literal>name</literal> attribute of the <literal>property</literal> element tells Hibernate which getter and setter methods to use. In this case, Hibernate will search for <literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:244
+#: tutorial.xml:271
 #, no-c-format
-msgid "Why does the <literal>date</literal> property mapping include the <literal>column</literal> attribute, but the <literal>title</literal> doesn't? Without the <literal>column</literal> attribute Hibernate by default uses the property name as the column name. This works fine for <literal>title</literal>. However, <literal>date</literal> is a reserved keyword in most database, so we better map it to a different name."
+msgid "Why does the <literal>date</literal> property mapping include the <literal>column</literal> attribute, but the <literal>title</literal> does not? Without the <literal>column</literal> attribute, Hibernate by default uses the property name as the column name. This works for <literal>title</literal>, however, <literal>date</literal> is a reserved keyword in most databases so you will need to map it to a different name."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:253
+#: tutorial.xml:281
 #, no-c-format
-msgid "The next interesting thing is that the <literal>title</literal> mapping also lacks a <literal>type</literal> attribute. The types we declare and use in the mapping files are not, as you might expect, Java data types. They are also not SQL database types. These types are so called <emphasis>Hibernate mapping types</emphasis>, converters which can translate from Java to SQL data types and vice versa. Again, Hibernate will try to determine the correct conversion and mapping type itself if the <literal>type</literal> attribute is not present in the mapping. In some cases this automatic detection (using Reflection on the Java class) might not have the default you expect or need. This is the case with the <literal>date</literal> property. Hibernate can't know if the property (which is of <literal>java.util.Date</literal>) should map to a SQL <literal>date</literal>, <literal>timestamp</literal>, or <literal>time</literal> column. We preserve full date and time information !
 by mapping the property with a <literal>timestamp</literal> converter."
+msgid "The <literal>title</literal> mapping also lacks a <literal>type</literal> attribute. The types declared and used in the mapping files are not Java data types; they are not SQL database types either. These types are called <emphasis>Hibernate mapping types</emphasis>, converters which can translate from Java to SQL data types and vice versa. Again, Hibernate will try to determine the correct conversion and mapping type itself if the <literal>type</literal> attribute is not present in the mapping. In some cases this automatic detection using Reflection on the Java class might not have the default you expect or need. This is the case with the <literal>date</literal> property. Hibernate cannot know if the property, which is of <literal>java.util.Date</literal>, should map to a SQL <literal>date</literal>, <literal>timestamp</literal>, or <literal>time</literal> column. Full date and time information is preserved by mapping the property with a <literal>timestamp</literal>!
  converter."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:269
+#: tutorial.xml:297
 #, no-c-format
-msgid "This mapping file should be saved as <literal>Event.hbm.xml</literal>, right in the directory next to the <literal>Event</literal> Java class source file. The naming of mapping files can be arbitrary, however the <literal>hbm.xml</literal> suffix is a convention in the Hibernate developer community. The directory structure should now look like this:"
+msgid "Hibernate makes this mapping type determination using reflection when the mapping files are processed. This can take time and resources, so if startup performance is important you should consider explicitly defining the type to use."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:277
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
-msgid ""
-      "<![CDATA[.\n"
-      "+lib\n"
-      "  <Hibernate and third-party libraries>\n"
-      "+src\n"
-      "  +events\n"
-      "    Event.java\n"
-      "    Event.hbm.xml]]>"
+msgid "Save this mapping file as <filename>src/main/resources/org/hibernate/tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
+#. Tag: title
+#: tutorial.xml:312
+#, no-c-format
+msgid "Hibernate configuration"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:279
+#: tutorial.xml:314
 #, no-c-format
-msgid "We continue with the main configuration of Hibernate."
+msgid "At this point, you should have the persistent class and its mapping file in place. It is now time to configure Hibernate. First let's set up HSQLDB to run in \"server mode\""
 msgstr ""
 
-#. Tag: title
-#: tutorial.xml:286
+#. Tag: para
+#: tutorial.xml:321
 #, no-c-format
-msgid "Hibernate configuration"
+msgid "We do this do that the data remains between runs."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:288
+#: tutorial.xml:326
 #, no-c-format
-msgid "We now have a persistent class and its mapping file in place. It is time to configure Hibernate. Before we do this, we will need a database. HSQL DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from this download. Place this file in the <literal>lib/</literal> directory of the development folder."
+msgid "We will utilize the Maven exec plugin to launch the HSQLDB server by running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see it start up and bind to a TCP/IP socket; this is where our application will connect later. If you want to start with a fresh database during this tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</filename> directory, and start HSQLDB again."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:337
 #, no-c-format
-msgid "Create a directory called <literal>data</literal> in the root of the development directory - this is where HSQL DB will store its data files. Now start the database by running <literal>java -classpath ../lib/hsqldb.jar org.hsqldb.Server</literal> in this data directory. You can see it start up and bind to a TCP/IP socket, this is where our application will connect later. If you want to start with a fresh database during this tutorial, shutdown HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files in the <literal>data/</literal> directory, and start HSQL DB again."
+msgid "Hibernate will be connecting to the database on behalf of your application, so it needs to know how to obtain connections. For this tutorial we will be using a standalone connection pool (as opposed to a <interfacename>javax.sql.DataSource</interfacename>). Hibernate comes with support for two third-party open source JDBC connection pools: <ulink url=\"https://sourceforge.net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge.net/\">proxool</ulink>. However, we will be using the Hibernate built-in connection pool for this tutorial."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:306
+#: tutorial.xml:348
 #, no-c-format
-msgid "Hibernate is the layer in your application which connects to this database, so it needs connection information. The connections are made through a JDBC connection pool, which we also have to configure. The Hibernate distribution contains several open source JDBC connection pooling tools, but will use the Hibernate built-in connection pool for this tutorial. Note that you have to copy the required library into your classpath and use different connection pooling settings if you want to use a production-quality third party JDBC pooling software."
+msgid "The built-in Hibernate connection pool is in no way intended for production use. It lacks several features found on any decent connection pool."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:316
+#: tutorial.xml:354
 #, no-c-format
-msgid "For Hibernate's configuration, we can use a simple <literal>hibernate.properties</literal> file, a slightly more sophisticated <literal>hibernate.cfg.xml</literal> file, or even complete programmatic setup. Most users prefer the XML configuration file:"
+msgid "For Hibernate's configuration, we can use a simple <literal>hibernate.properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</literal> file, or even complete programmatic setup. Most users prefer the XML configuration file:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:322
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -425,9 +445,9 @@
       "        <property name=\"show_sql\">true</property>\n"
       "\n"
       "        <!-- Drop and re-create the database schema on startup -->\n"
-      "        <property name=\"hbm2ddl.auto\">create</property>\n"
+      "        <property name=\"hbm2ddl.auto\">update</property>\n"
       "\n"
-      "        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+      "        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
       "\n"
       "    </session-factory>\n"
       "\n"
@@ -435,138 +455,113 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:324
+#: tutorial.xml:363
 #, no-c-format
-msgid "Note that this XML configuration uses a different DTD. We configure Hibernate's <literal>SessionFactory</literal> - a global factory responsible for a particular database. If you have several databases, use several <literal>&lt;session-factory&gt;</literal> configurations, usually in several configuration files (for easier startup)."
+msgid "Notice that this configuration file specifies a different DTD"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:332
+#: tutorial.xml:366
 #, no-c-format
-msgid "The first four <literal>property</literal> elements contain the necessary configuration for the JDBC connection. The dialect <literal>property</literal> element specifies the particular SQL variant Hibernate generates. Hibernate's automatic session management for persistence contexts will come in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option turns on automatic generation of database schemas - directly into the database. This can of course also be turned off (by removing the config option) or redirected to a file with the help of the <literal>SchemaExport</literal> Ant task. Finally, we add the mapping file(s) for persistent classes to the configuration."
+msgid "You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory is a global factory responsible for a particular database. If you have several databases, for easier startup you should use several <literal>&lt;session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:345
+#: tutorial.xml:373
 #, no-c-format
-msgid "Copy this file into the source directory, so it will end up in the root of the classpath. Hibernate automatically looks for a file called <literal>hibernate.cfg.xml</literal> in the root of the classpath, on startup."
+msgid "The first four <literal>property</literal> elements contain the necessary configuration for the JDBC connection. The dialect <literal>property</literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
 
-#. Tag: title
-#: tutorial.xml:354
+#. Tag: para
+#: tutorial.xml:380
 #, no-c-format
-msgid "Building with Ant"
+msgid "In most cases, Hibernate is able to properly determine which dialect to use. See <xref linkend=\"portability-dialectresolver\"/> for more information."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:356
+#: tutorial.xml:386
 #, no-c-format
-msgid "We'll now build the tutorial with Ant. You will need to have Ant installed - get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant download page</ulink>. How to install Ant will not be covered here. Please refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant manual</ulink>. After you have installed Ant, we can start to create the buildfile. It will be called <literal>build.xml</literal> and placed directly in the development directory."
+msgid "Hibernate's automatic session management for persistence contexts is particularly useful in this context. The <literal>hbm2ddl.auto</literal> option turns on automatic generation of database schemas directly into the database. This can also be turned off by removing the configuration option, or redirected to a file with the help of the <literal>SchemaExport</literal> Ant task. Finally, add the mapping file(s) for persistent classes to the configuration."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:365
+#: tutorial.xml:395
 #, no-c-format
-msgid "A basic build file looks like this:"
+msgid "Save this file as <filename>hibernate.cfg.xml</filename> into the <filename>src/main/resources</filename> directory."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:369
+#. Tag: title
+#: tutorial.xml:403
 #, no-c-format
-msgid ""
-      "<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-      "\n"
-      "    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-      "    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-      "    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-      "\n"
-      "    <path id=\"libraries\">\n"
-      "        <fileset dir=\"${librarydir}\">\n"
-      "            <include name=\"*.jar\"/>\n"
-      "        </fileset>\n"
-      "    </path>\n"
-      "\n"
-      "    <target name=\"clean\">\n"
-      "        <delete dir=\"${targetdir}\"/>\n"
-      "        <mkdir dir=\"${targetdir}\"/>\n"
-      "    </target>\n"
-      "\n"
-      "    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-      "      <javac srcdir=\"${sourcedir}\"\n"
-      "             destdir=\"${targetdir}\"\n"
-      "             classpathref=\"libraries\"/>\n"
-      "    </target>\n"
-      "\n"
-      "    <target name=\"copy-resources\">\n"
-      "        <copy todir=\"${targetdir}\">\n"
-      "            <fileset dir=\"${sourcedir}\">\n"
-      "                <exclude name=\"**/*.java\"/>\n"
-      "            </fileset>\n"
-      "        </copy>\n"
-      "    </target>\n"
-      "\n"
-      "</project>]]>"
+msgid "Building with Maven"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:371
+#: tutorial.xml:405
 #, no-c-format
-msgid "This will tell Ant to add all files in the lib directory ending with <literal>.jar</literal> to the classpath used for compilation. It will also copy all non-Java source files to the target directory, e.g. configuration and Hibernate mapping files. If you now run Ant, you should get this output:"
+msgid "We will now build the tutorial with Maven. You will need to have Maven installed; it is available from the <ulink url=\"http://maven.apache.org/download.html\">Maven download page</ulink>. Maven will read the <filename>/pom.xml</filename> file we created earlier and know how to perform some basic project tasks. First, lets run the <literal>compile</literal> goal to make sure we can compile everything so far:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:378
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-      "<![CDATA[C:\\hibernateTutorial\\>ant\n"
-      "Buildfile: build.xml\n"
-      "\n"
-      "copy-resources:\n"
-      "     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-      "\n"
-      "compile:\n"
-      "    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-      "\n"
-      "BUILD SUCCESSFUL\n"
-      "Total time: 1 second ]]>"
+      "<![CDATA[[hibernateTutorial]$ mvn compile\n"
+      "[INFO] Scanning for projects...\n"
+      "[INFO] ------------------------------------------------------------------------\n"
+      "[INFO] Building First Hibernate Tutorial\n"
+      "[INFO]    task-segment: [compile]\n"
+      "[INFO] ------------------------------------------------------------------------\n"
+      "[INFO] [resources:resources]\n"
+      "[INFO] Using default encoding to copy filtered resources.\n"
+      "[INFO] [compiler:compile]\n"
+      "[INFO] Compiling 1 source file to /home/steve/projects/sandbox/hibernateTutorial/target/classes\n"
+      "[INFO] ------------------------------------------------------------------------\n"
+      "[INFO] BUILD SUCCESSFUL\n"
+      "[INFO] ------------------------------------------------------------------------\n"
+      "[INFO] Total time: 2 seconds\n"
+      "[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+      "[INFO] Final Memory: 5M/547M\n"
+      "[INFO] ------------------------------------------------------------------------]]>"
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:383
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:385
+#: tutorial.xml:422
 #, no-c-format
-msgid "It's time to load and store some <literal>Event</literal> objects, but first we have to complete the setup with some infrastructure code. We have to startup Hibernate. This startup includes building a global <literal>SessionFactory</literal> object and to store it somewhere for easy access in application code. A <literal>SessionFactory</literal> can open up new <literal>Session</literal>'s. A <literal>Session</literal> represents a single-threaded unit of work, the <literal>SessionFactory</literal> is a thread-safe global object, instantiated once."
+msgid "It is time to load and store some <literal>Event</literal> objects, but first you have to complete the setup with some infrastructure code. You have to startup Hibernate by building a global <interfacename>org.hibernate.SessionFactory</interfacename> object and storing it somewhere for easy access in application code. A <interfacename>org.hibernate.SessionFactory</interfacename> is used to obtain <interfacename>org.hibernate.Session</interfacename> instances. A <interfacename>org.hibernate.Session</interfacename> represents a single-threaded unit of work. The <interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe global object that is instantiated once."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:395
+#: tutorial.xml:436
 #, no-c-format
-msgid "We'll create a <literal>HibernateUtil</literal> helper class which takes care of startup and makes accessing a <literal>SessionFactory</literal> convenient. Let's have a look at the implementation:"
+msgid "We will create a <literal>HibernateUtil</literal> helper class that takes care of startup and makes accessing the <interfacename>org.hibernate.SessionFactory</interfacename> more convenient."
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:401
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-      "<![CDATA[package util;\n"
+      "<![CDATA[package org.hibernate.tutorial.util;\n"
       "\n"
-      "import org.hibernate.*;\n"
-      "import org.hibernate.cfg.*;\n"
+      "import org.hibernate.SessionFactory;\n"
+      "import org.hibernate.cfg.Configuration;\n"
       "\n"
       "public class HibernateUtil {\n"
       "\n"
-      "    private static final SessionFactory sessionFactory;\n"
+      "    private static final SessionFactory sessionFactory = buildSessionFactory();\n"
       "\n"
-      "    static {\n"
+      "    private static SessionFactory buildSessionFactory() {\n"
       "        try {\n"
       "            // Create the SessionFactory from hibernate.cfg.xml\n"
-      "            sessionFactory = new Configuration().configure().buildSessionFactory();\n"
-      "        } catch (Throwable ex) {\n"
+      "            return new Configuration().configure().buildSessionFactory();\n"
+      "        }\n"
+      "        catch (Throwable ex) {\n"
       "            // Make sure you log the exception, as it might be swallowed\n"
       "            System.err.println(\"Initial SessionFactory creation failed.\" + ex);\n"
       "            throw new ExceptionInInitializerError(ex);\n"
@@ -581,75 +576,59 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:403
+#: tutorial.xml:444
 #, no-c-format
-msgid "This class does not only produce the global <literal>SessionFactory</literal> in its static initializer (called once by the JVM when the class is loaded), but also hides the fact that it uses a static singleton. It might as well lookup the <literal>SessionFactory</literal> from JNDI in an application server."
+msgid "Save this code as <filename>src/main/java/org/hibernate/tutorial/util/HibernateUtil.java</filename>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:410
+#: tutorial.xml:449
 #, no-c-format
-msgid "If you give the <literal>SessionFactory</literal> a name in your configuration file, Hibernate will in fact try to bind it to JNDI after it has been built. To avoid this code completely you could also use JMX deployment and let the JMX-capable container instantiate and bind a <literal>HibernateService</literal> to JNDI. These advanced options are discussed in the Hibernate reference documentation."
+msgid "This class not only produces the global <interfacename>org.hibernate.SessionFactory</interfacename> reference in its static initializer; it also hides the fact that it uses a static singleton. We might just as well have looked up the <interfacename>org.hibernate.SessionFactory</interfacename> reference from JNDI in an application server or any other location for that matter."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:419
+#: tutorial.xml:458
 #, no-c-format
-msgid "Place <literal>HibernateUtil.java</literal> in the development source directory, in a package next to <literal>events</literal>:"
+msgid "If you give the <interfacename>org.hibernate.SessionFactory</interfacename> a name in your configuration, Hibernate will try to bind it to JNDI under that name after it has been built. Another, better option is to use a JMX deployment and let the JMX-capable container instantiate and bind a <literal>HibernateService</literal> to JNDI. Such advanced options are discussed later."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:424
-#, no-c-format
-msgid ""
-      "<![CDATA[.\n"
-      "+lib\n"
-      "  <Hibernate and third-party libraries>\n"
-      "+src\n"
-      "  +events\n"
-      "    Event.java\n"
-      "    Event.hbm.xml\n"
-      "  +util\n"
-      "    HibernateUtil.java\n"
-      "  hibernate.cfg.xml\n"
-      "+data\n"
-      "build.xml]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:426
+#: tutorial.xml:467
 #, no-c-format
-msgid "This should again compile without problems. We finally need to configure a logging system - Hibernate uses commons logging and leaves you the choice between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy <literal>log4j.properties</literal> from the Hibernate distribution (it's in the <literal>etc/</literal> directory) to your <literal>src</literal> directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the example configuration and change the settings if you like to have more verbose output. By default, only Hibernate startup message are shown on stdout."
+msgid "You now need to configure a logging system. Hibernate uses commons logging and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy <literal>log4j.properties</literal> from the Hibernate distribution in the <literal>etc/</literal> directory to your <literal>src</literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you prefer to have more verbose output than that provided in the example configuration, you can change the settings. By default, only the Hibernate startup message is shown on stdout."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:436
+#: tutorial.xml:477
 #, no-c-format
-msgid "The tutorial infrastructure is complete - and we are ready to do some real work with Hibernate."
+msgid "The tutorial infrastructure is complete and you are now ready to do some real work with Hibernate."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:444
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:446
+#: tutorial.xml:487
 #, no-c-format
-msgid "Finally, we can use Hibernate to load and store objects. We write an <literal>EventManager</literal> class with a <literal>main()</literal> method:"
+msgid "We are now ready to start doing some real worjk with Hibernate. Let's start by writing an <literal>EventManager</literal> class with a <literal>main()</literal> method:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:451
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-      "<![CDATA[package events;\n"
+      "<![CDATA[package org.hibernate.tutorial;\n"
+      "\n"
       "import org.hibernate.Session;\n"
       "\n"
-      "import java.util.Date;\n"
+      "import java.util.*;\n"
       "\n"
-      "import util.HibernateUtil;\n"
+      "import org.hibernate.tutorial.domain.Event;\n"
+      "import org.hibernate.tutorial.util.HibernateUtil;\n"
       "\n"
       "public class EventManager {\n"
       "\n"
@@ -664,15 +643,12 @@
       "    }\n"
       "\n"
       "    private void createAndStoreEvent(String title, Date theDate) {\n"
-      "\n"
       "        Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "\n"
       "        session.beginTransaction();\n"
       "\n"
       "        Event theEvent = new Event();\n"
       "        theEvent.setTitle(title);\n"
       "        theEvent.setDate(theDate);\n"
-      "\n"
       "        session.save(theEvent);\n"
       "\n"
       "        session.getTransaction().commit();\n"
@@ -682,201 +658,161 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:453
+#: tutorial.xml:495
 #, no-c-format
-msgid "We create a new <literal>Event</literal> object, and hand it over to Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</literal>s on the database. Let's have a look at the <literal>Session</literal> and <literal>Transaction</literal>-handling code before we run this."
+msgid "In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</literal> object and handed it over to Hibernate. At that point, Hibernate takes care of the SQL and executes an <literal>INSERT</literal> on the database."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:460
+#: tutorial.xml:502
 #, no-c-format
-msgid "A <literal>Session</literal> is a single unit of work. For now we'll keep things simple and assume a one-to-one granularity between a Hibernate <literal>Session</literal> and a database transaction. To shield our code from the actual underlying transaction system (in this case plain JDBC, but it could also run with JTA) we use the <literal>Transaction</literal> API that is available on the Hibernate <literal>Session</literal>."
+msgid "A <interface>org.hibernate.Session</interface> is designed to represent a single unit of work (a single atmoic piece of work to be performed). For now we will keep things simple and assume a one-to-one granularity between a Hibernate <interface>org.hibernate.Session</interface> and a database transaction. To shield our code from the actual underlying transaction system we use the Hibernate <interfacename>org.hibernate.Transaction</interfacename> API. In this particular case we are using JDBC-based transactional semantics, but it could also run with JTA."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:468
+#: tutorial.xml:515
 #, no-c-format
-msgid "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, you can call it as many times and anywhere you like, once you get hold of your <literal>SessionFactory</literal> (easy thanks to <literal>HibernateUtil</literal>). The <literal>getCurrentSession()</literal> method always returns the \"current\" unit of work. Remember that we switched the configuration option for this mechanism to \"thread\" in <literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is bound to the current Java thread that executes our application. However, this is not the full picture, you also have to consider scope, when a unit of work begins and when it ends."
+msgid "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, you can call it as many times and anywhere you like once you get hold of your <interfacename>org.hibernate.SessionFactory</interfacename>. The <literal>getCurrentSession()</literal> method always returns the \"current\" unit of work. Remember that we switched the configuration option for this mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg.xml</filename>? Due to that setting, the context of a current unit of work is bound to the current Java thread that executes the application."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:479
+#: tutorial.xml:529
 #, no-c-format
-msgid "A <literal>Session</literal> begins when it is first needed, when the first call to <literal>getCurrentSession()</literal> is made. It is then bound by Hibernate to the current thread. When the transaction ends, either through commit or rollback, Hibernate automatically unbinds the <literal>Session</literal> from the thread and closes it for you. If you call <literal>getCurrentSession()</literal> again, you get a new <literal>Session</literal> and can start a new unit of work. This <emphasis>thread-bound</emphasis> programming model is the most popular way of using Hibernate, as it allows flexible layering of your code (transaction demarcation code can be separated from data access code, we'll do this later in this tutorial)."
+msgid "Hibernate offers three methods of current session tracking. The \"thread\" based method is not intended for production use; it is merely useful for prototyping and tutorials such as this one. Current session tracking is discussed in more detail later on."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
+#: tutorial.xml:538
 #, no-c-format
-msgid "Related to the unit of work scope, should the Hibernate <literal>Session</literal> be used to execute one or several database operations? The above example uses one <literal>Session</literal> for one operation. This is pure coincidence, the example is just not complex enough to show any other approach. The scope of a Hibernate <literal>Session</literal> is flexible but you should never design your application to use a new Hibernate <literal>Session</literal> for <emphasis>every</emphasis> database operation. So even if you see it a few more times in the following (very trivial) examples, consider <emphasis>session-per-operation</emphasis> an anti-pattern. A real (web) application is shown later in this tutorial."
+msgid "A <interface>org.hibernate.Session</interface> begins when the first call to <literal>getCurrentSession()</literal> is made for the current thread. It is then bound by Hibernate to the current thread. When the transaction ends, either through commit or rollback, Hibernate automatically unbinds the <interface>org.hibernate.Session</interface> from the thread and closes it for you. If you call <literal>getCurrentSession()</literal> again, you get a new <interface>org.hibernate.Session</interface> and can start a new unit of work."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:501
+#: tutorial.xml:551
 #, no-c-format
-msgid "Have a look at <xref linkend=\"transactions\"/> for more information about transaction handling and demarcation. We also skipped any error handling and rollback in the previous example."
+msgid "Related to the unit of work scope, should the Hibernate <interface>org.hibernate.Session</interface> be used to execute one or several database operations? The above example uses one <interface>org.hibernate.Session</interface> for one operation. However this is pure coincidence; the example is just not complex enough to show any other approach. The scope of a Hibernate <interface>org.hibernate.Session</interface> is flexible but you should never design your application to use a new Hibernate <interface>org.hibernate.Session</interface> for <emphasis>every</emphasis> database operation. Even though it is used in the following examples, consider <emphasis>session-per-operation</emphasis> an anti-pattern. A real web application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:507
+#: tutorial.xml:568
 #, no-c-format
-msgid "To run this first routine we have to add a callable target to the Ant build file:"
+msgid "See <xref linkend=\"transactions\"/> for more information about transaction handling and demarcation. The previous example also skipped any error handling and rollback."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:511
+#. Tag: para
+#: tutorial.xml:574
 #, no-c-format
-msgid ""
-      "<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-      "    <java fork=\"true\" classname=\"events.EventManager\" classpathref=\"libraries\">\n"
-      "        <classpath path=\"${targetdir}\"/>\n"
-      "        <arg value=\"${action}\"/>\n"
-      "    </java>\n"
-      "</target>]]>"
+msgid "To run this, we will make use of the Maven exec plugin to call our class with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:513
+#: tutorial.xml:581
 #, no-c-format
-msgid "The value of the <literal>action</literal> argument is set on the command line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
 
-#. Tag: programlisting
-#: tutorial.xml:518
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:520
+#: tutorial.xml:586
 #, no-c-format
-msgid "You should see, after compilation, Hibernate starting up and, depending on your configuration, lots of log output. At the end you will find the following line:"
+msgid "You should see Hibernate starting up and, depending on your configuration, lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:525
+#: tutorial.xml:591
 #, no-c-format
 msgid "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) values (?, ?, ?)]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:527
+#: tutorial.xml:593
 #, no-c-format
-msgid "This is the <literal>INSERT</literal> executed by Hibernate, the question marks represent JDBC bind parameters. To see the values bound as arguments, or to reduce the verbosity of the log, check your <literal>log4j.properties</literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:533
+#: tutorial.xml:597
 #, no-c-format
-msgid "Now we'd like to list stored events as well, so we add an option to the main method:"
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:537
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-      "<![CDATA[if (args[0].equals(\"store\")) {\n"
-      "    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-      "}\n"
-      "else if (args[0].equals(\"list\")) {\n"
-      "    List events = mgr.listEvents();\n"
-      "    for (int i = 0; i < events.size(); i++) {\n"
-      "        Event theEvent = (Event) events.get(i);\n"
-      "        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-      "                           \" Time: \" + theEvent.getDate());\n"
-      "    }\n"
-      "}]]>"
+      "<![CDATA[        if (args[0].equals(\"store\")) {\n"
+      "            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+      "        }\n"
+      "        else if (args[0].equals(\"list\")) {\n"
+      "            List events = mgr.listEvents();\n"
+      "            for (int i = 0; i < events.size(); i++) {\n"
+      "                Event theEvent = (Event) events.get(i);\n"
+      "                System.out.println(\n"
+      "                        \"Event: \" + theEvent.getTitle() + \" Time: \" + theEvent.getDate()\n"
+      "                );\n"
+      "            }\n"
+      "        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:539
+#: tutorial.xml:603
 #, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:543
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-      "<![CDATA[private List listEvents() {\n"
-      "\n"
-      "    Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "\n"
-      "    session.beginTransaction();\n"
-      "\n"
-      "    List result = session.createQuery(\"from Event\").list();\n"
-      "\n"
-      "    session.getTransaction().commit();\n"
-      "\n"
-      "    return result;\n"
-      "}]]>"
+      "<![CDATA[    private List listEvents() {\n"
+      "        Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
+      "        session.beginTransaction();\n"
+      "        List result = session.createQuery(\"from Event\").list();\n"
+      "        session.getTransaction().commit();\n"
+      "        return result;\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:545
+#: tutorial.xml:609
 #, no-c-format
-msgid "What we do here is use an HQL (Hibernate Query Language) query to load all existing <literal>Event</literal> objects from the database. Hibernate will generate the appropriate SQL, send it to the database and populate <literal>Event</literal> objects with the data. You can create more complex queries with HQL, of course."
+msgid "Here, we are using a Hibernate Query Language (HQL) query to load all existing <literal>Event</literal> objects from the database. Hibernate will generate the appropriate SQL, send it to the database and populate <literal>Event</literal> objects with the data. You can create more complex queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:552
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
+msgid "Now we can call our new functionality, again using the Maven exec plugin: <command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"list\"</command>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:558
-#, no-c-format
-msgid "Run <literal>ant run -Daction=store</literal> to store something into the database and, of course, to generate the database schema before through hbm2ddl."
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:564
-#, no-c-format
-msgid "Now disable hbm2ddl by commenting out the property in your <literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned on in continuous unit testing, but another run of hbm2ddl would <emphasis>drop</emphasis> everything you have stored - the <literal>create</literal> configuration setting actually translates into \"drop all tables from the schema, then re-create all tables, when the SessionFactory is build\"."
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:574
-#, no-c-format
-msgid "If you now call Ant with <literal>-Daction=list</literal>, you should see the events you have stored so far. You can of course also call the <literal>store</literal> action a few times more."
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:580
-#, no-c-format
-msgid "Note: Most new Hibernate users fail at this point and we see questions about <emphasis>Table not found</emphasis> error messages regularly. However, if you follow the steps outlined above you will not have this problem, as hbm2ddl creates the database schema on the first run, and subsequent application restarts will use this schema. If you change the mapping and/or database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:593
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:595
+#: tutorial.xml:629
 #, no-c-format
-msgid "We mapped a persistent entity class to a table. Let's build on this and add some class associations. First we'll add people to our application, and store a list of events they participate in."
+msgid "So far we have mapped a single persistent entity class to a table in isolation. Let's expand on that a bit and add some class associations. We will add people to the application and store a list of events in which they participate."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:601
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:603
+#: tutorial.xml:639
 #, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:607
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-      "<![CDATA[package events;\n"
+      "<![CDATA[package org.hibernate.tutorial.domain;\n"
       "\n"
       "public class Person {\n"
       "\n"
@@ -893,18 +829,24 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:609
+#: tutorial.xml:645
 #, no-c-format
-msgid "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't forget the DTD reference at the top):"
+msgid "Save this to a file named <filename>src/main/java/org/hibernate/tutorial/domain/Person.java</filename>"
 msgstr ""
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid "Next, create the new mapping file as <filename>src/main/resources/org/hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:614
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-      "<![CDATA[<hibernate-mapping>\n"
+      "<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
       "\n"
-      "    <class name=\"events.Person\" table=\"PERSON\">\n"
+      "    <class name=\"Person\" table=\"PERSON\">\n"
       "        <id name=\"id\" column=\"PERSON_ID\">\n"
       "            <generator class=\"native\"/>\n"
       "        </id>\n"
@@ -917,13 +859,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:616
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:620
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
       "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -931,31 +873,25 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:622
+#: tutorial.xml:663
 #, no-c-format
-msgid "We'll now create an association between these two entities. Obviously, persons can participate in events, and events have participants. The design questions we have to deal with are: directionality, multiplicity, and collection behavior."
+msgid "Create an association between these two entities. Persons can participate in events, and events have participants. The design questions you have to deal with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:632
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:634
+#: tutorial.xml:675
 #, no-c-format
-msgid "We'll add a collection of events to the <literal>Person</literal> class. That way we can easily navigate to the events for a particular person, without executing an explicit query - by calling <literal>aPerson.getEvents()</literal>. We use a Java collection, a <literal>Set</literal>, because the collection will not contain duplicate elements and the ordering is not relevant for us."
+msgid "By adding a collection of events to the <literal>Person</literal> class, you can easily navigate to the events for a particular person, without executing an explicit query - by calling <literal>Person#getEvents</literal>. Multi-valued associations are represented in Hibernate by one of the Java Collection Framework contracts; here we choose a <interfacename>java.util.Set</interfacename> because the collection will not contain duplicate elements and the ordering is not relevant to our examples:"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:641
-#, no-c-format
-msgid "We need a unidirectional, many-valued associations, implemented with a <literal>Set</literal>. Let's write the code for this in the Java classes and then map it:"
-msgstr ""
-
 #. Tag: programlisting
-#: tutorial.xml:646
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
       "<![CDATA[public class Person {\n"
@@ -973,16 +909,16 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:648
+#: tutorial.xml:688
 #, no-c-format
-msgid "Before we map this association, think about the other side. Clearly, we could just keep this unidirectional. Or, we could create another collection on the <literal>Event</literal>, if we want to be able to navigate it bi-directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not necessary, from a functional perspective. You could always execute an explicit query to retrieve the participants for a particular event. This is a design choice left to you, but what is clear from this discussion is the multiplicity of the association: \"many\" valued on both sides, we call this a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's many-to-many mapping:"
+msgid "Before mapping this association, let's consider the other side. We could just keep this unidirectional or create another collection on the <literal>Event</literal>, if we wanted to be able to navigate it from both directions. This is not necessary, from a functional perspective. You can always execute an explicit query to retrieve the participants for a particular event. This is a design choice left to you, but what is clear from this discussion is the multiplicity of the association: \"many\" valued on both sides is called a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:659
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-      "<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+      "<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
       "    <id name=\"id\" column=\"PERSON_ID\">\n"
       "        <generator class=\"native\"/>\n"
       "    </id>\n"
@@ -992,26 +928,26 @@
       "\n"
       "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
       "        <key column=\"PERSON_ID\"/>\n"
-      "        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+      "        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
       "    </set>\n"
       "\n"
       "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:661
+#: tutorial.xml:703
 #, no-c-format
-msgid "Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</literal> being most common. For a many-to-many association (or <emphasis>n:m</emphasis> entity relationship), an association table is needed. Each row in this table represents a link between a person and an event. The table name is configured with the <literal>table</literal> attribute of the <literal>set</literal> element. The identifier column name in the association, for the person's side, is defined with the <literal>&lt;key&gt;</literal> element, the column name for the event's side with the <literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</literal>. You also have to tell Hibernate the class of the objects in your collection (correct: the class on the other side of the collection of references)."
+msgid "Hibernate supports a broad range of collection mappings, a <literal>set</literal> being most common. For a many-to-many association, or <emphasis>n:m</emphasis> entity relationship, an association table is required. Each row in this table represents a link between a person and an event. The table name is decalred using the <literal>table</literal> attribute of the <literal>set</literal> element. The identifier column name in the association, for the person side, is defined with the <literal>key</literal> element, the column name for the event's side with the <literal>column</literal> attribute of the <literal>many-to-many</literal>. You also have to tell Hibernate the class of the objects in your collection (the class on the other side of the collection of references)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:673
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:677
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -1030,173 +966,168 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:682
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:684
+#: tutorial.xml:730
 #, no-c-format
-msgid "Let's bring some people and events together in a new method in <literal>EventManager</literal>:"
+msgid "Now we will bring some people and events together in a new method in <literal>EventManager</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:688
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-      "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
+      "<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+      "        Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
+      "        session.beginTransaction();\n"
       "\n"
-      "    Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "    session.beginTransaction();\n"
+      "        Person aPerson = (Person) session.load(Person.class, personId);\n"
+      "        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+      "        aPerson.getEvents().add(anEvent);\n"
       "\n"
-      "    Person aPerson = (Person) session.load(Person.class, personId);\n"
-      "    Event anEvent = (Event) session.load(Event.class, eventId);\n"
-      "\n"
-      "    aPerson.getEvents().add(anEvent);\n"
-      "\n"
-      "    session.getTransaction().commit();\n"
-      "}]]>"
+      "        session.getTransaction().commit();\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:690
+#: tutorial.xml:736
 #, no-c-format
-msgid "After loading a <literal>Person</literal> and an <literal>Event</literal>, simply modify the collection using the normal collection methods. As you can see, there is no explicit call to <literal>update()</literal> or <literal>save()</literal>, Hibernate automatically detects that the collection has been modified and needs to be updated. This is called <emphasis>automatic dirty checking</emphasis>, and you can also try it by modifying the name or the date property of any of your objects. As long as they are in <emphasis>persistent</emphasis> state, that is, bound to a particular Hibernate <literal>Session</literal> (i.e. they have been just loaded or saved in a unit of work), Hibernate monitors any changes and executes SQL in a write-behind fashion. The process of synchronizing the memory state with the database, usually only at the end of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the unit of work ends with a commit (or rollback) of the dat!
 abase transaction - as defined by the <literal>thread</literal> configuration option for the <literal>CurrentSessionContext</literal> class."
+msgid "After loading a <literal>Person</literal> and an <literal>Event</literal>, simply modify the collection using the normal collection methods. There is no explicit call to <literal>update()</literal> or <literal>save()</literal>; Hibernate automatically detects that the collection has been modified and needs to be updated. This is called <emphasis>automatic dirty checking</emphasis>. You can also try it by modifying the name or the date property of any of your objects. As long as they are in <emphasis>persistent</emphasis> state, that is, bound to a particular Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate monitors any changes and executes SQL in a write-behind fashion. The process of synchronizing the memory state with the database, usually only at the end of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:755
 #, no-c-format
-msgid "You might of course load person and event in different units of work. Or you modify an object outside of a <literal>Session</literal>, when it is not in persistent state (if it was persistent before, we call this state <emphasis>detached</emphasis>). You can even modify a collection when it is detached:"
+msgid "You can load person and event in different units of work. Or you can modify an object outside of a <interfacename>org.hibernate.Session</interfacename>, when it is not in persistent state (if it was persistent before, this state is called <emphasis>detached</emphasis>). You can even modify a collection when it is detached:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:712
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-      "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
+      "<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+      "        Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
+      "        session.beginTransaction();\n"
       "\n"
-      "    Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "    session.beginTransaction();\n"
+      "        Person aPerson = (Person) session\n"
+      "                .createQuery(\"select p from Person p left join fetch p.events where p.id = :pid\")\n"
+      "                .setParameter(\"pid\", personId)\n"
+      "                .uniqueResult(); // Eager fetch the collection so we can use it detached\n"
+      "        Event anEvent = (Event) session.load(Event.class, eventId);\n"
       "\n"
-      "    Person aPerson = (Person) session\n"
-      "            .createQuery(\"select p from Person p left join fetch p.events where p.id = :pid\")\n"
-      "            .setParameter(\"pid\", personId)\n"
-      "            .uniqueResult(); // Eager fetch the collection so we can use it detached\n"
+      "        session.getTransaction().commit();\n"
       "\n"
-      "    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+      "        // End of first unit of work\n"
       "\n"
-      "    session.getTransaction().commit();\n"
+      "        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is detached\n"
       "\n"
-      "    // End of first unit of work\n"
+      "        // Begin second unit of work\n"
       "\n"
-      "    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is detached\n"
+      "        Session session2 = HibernateUtil.getSessionFactory().getCurrentSession();\n"
+      "        session2.beginTransaction();\n"
+      "        session2.update(aPerson); // Reattachment of aPerson\n"
       "\n"
-      "    // Begin second unit of work\n"
-      "\n"
-      "    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "    session2.beginTransaction();\n"
-      "\n"
-      "    session2.update(aPerson); // Reattachment of aPerson\n"
-      "\n"
-      "    session2.getTransaction().commit();\n"
-      "}]]>"
+      "        session2.getTransaction().commit();\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:714
+#: tutorial.xml:766
 #, no-c-format
-msgid "The call to <literal>update</literal> makes a detached object persistent again, you could say it binds it to a new unit of work, so any modifications you made to it while detached can be saved to the database. This includes any modifications (additions/deletions) you made to a collection of that entity object."
+msgid "The call to <literal>update</literal> makes a detached object persistent again by binding it to a new unit of work, so any modifications you made to it while detached can be saved to the database. This includes any modifications (additions/deletions) you made to a collection of that entity object."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:721
+#: tutorial.xml:775
 #, no-c-format
-msgid "Well, this is not much use in our current situation, but it's an important concept you can design into your own application. For now, complete this exercise by adding a new action to the <literal>EventManager</literal>'s main method and call it from the command line. If you need the identifiers of a person and an event - the <literal>save()</literal> method returns it (you might have to modify some of the previous methods to return that identifier):"
+msgid "This is not much use in our example, but it is an important concept you can incorporate into your own application. Complete this exercise by adding a new action to the main method of the <literal>EventManager</literal> and call it from the command line. If you need the identifiers of a person and an event - the <literal>save()</literal> method returns it (you might have to modify some of the previous methods to return that identifier):"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:729
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-      "<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-      "    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-      "    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-      "    mgr.addPersonToEvent(personId, eventId);\n"
-      "    System.out.println(\"Added person \" + personId + \" to event \" + eventId);\n"
-      "}]]>"
+      "<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+      "            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+      "            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+      "            mgr.addPersonToEvent(personId, eventId);\n"
+      "            System.out.println(\"Added person \" + personId + \" to event \" + eventId);\n"
+      "        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:731
+#: tutorial.xml:785
 #, no-c-format
-msgid "This was an example of an association between two equally important classes, two entities. As mentioned earlier, there are other classes and types in a typical model, usually \"less important\". Some you have already seen, like an <literal>int</literal> or a <literal>String</literal>. We call these classes <emphasis>value types</emphasis>, and their instances <emphasis>depend</emphasis> on a particular entity. Instances of these types don't have their own identity, nor are they shared between entities (two persons don't reference the same <literal>firstname</literal> object, even if they have the same first name). Of course, value types can not only be found in the JDK (in fact, in a Hibernate application all JDK classes are considered value types), but you can also write dependent classes yourself, <literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+msgid "This is an example of an association between two equally important classes : two entities. As mentioned earlier, there are other classes and types in a typical model, usually \"less important\". Some you have already seen, like an <literal>int</literal> or a <classname>java.lang.String</classname>. We call these classes <emphasis>value types</emphasis>, and their instances <emphasis>depend</emphasis> on a particular entity. Instances of these types do not have their own identity, nor are they shared between entities. Two persons do not reference the same <literal>firstname</literal> object, even if they have the same first name. Value types cannot only be found in the JDK , but you can also write dependent classes yourself such as an <literal>Address</literal> or <literal>MonetaryAmount</literal> class. In fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:744
+#: tutorial.xml:803
 #, no-c-format
-msgid "You can also design a collection of value types. This is conceptually very different from a collection of references to other entities, but looks almost the same in Java."
+msgid "You can also design a collection of value types. This is conceptually different from a collection of references to other entities, but looks almost the same in Java."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:752
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:754
+#: tutorial.xml:814
 #, no-c-format
-msgid "We add a collection of value typed objects to the <literal>Person</literal> entity. We want to store email addresses, so the type we use is <literal>String</literal>, and the collection is again a <literal>Set</literal>:"
+msgid "Let's add a collection of email addresses to the <literal>Person</literal> entity. This will be represented as a <interfacename>java.util.Set</interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:759
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-      "<![CDATA[private Set emailAddresses = new HashSet();\n"
+      "<![CDATA[    private Set emailAddresses = new HashSet();\n"
       "\n"
-      "public Set getEmailAddresses() {\n"
-      "    return emailAddresses;\n"
-      "}\n"
+      "    public Set getEmailAddresses() {\n"
+      "        return emailAddresses;\n"
+      "    }\n"
       "\n"
-      "public void setEmailAddresses(Set emailAddresses) {\n"
-      "    this.emailAddresses = emailAddresses;\n"
-      "}]]>"
+      "    public void setEmailAddresses(Set emailAddresses) {\n"
+      "        this.emailAddresses = emailAddresses;\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:761
+#: tutorial.xml:822
 #, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:765
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-      "<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-      "    <key column=\"PERSON_ID\"/>\n"
-      "    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-      "</set>]]>"
+      "<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+      "            <key column=\"PERSON_ID\"/>\n"
+      "            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+      "        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:828
 #, no-c-format
-msgid "The difference compared with the earlier mapping is the <literal>element</literal> part, which tells Hibernate that the collection does not contain references to another entity, but a collection of elements of type <literal>String</literal> (the lowercase name tells you it's a Hibernate mapping type/converter). Once again, the <literal>table</literal> attribute of the <literal>set</literal> element determines the table name for the collection. The <literal>key</literal> element defines the foreign-key column name in the collection table. The <literal>column</literal> attribute in the <literal>element</literal> element defines the column name where the <literal>String</literal> values will actually be stored."
+msgid "The difference compared with the earlier mapping is the use of the <literal>element</literal> part which tells Hibernate that the collection does not contain references to another entity, but is rather a collection whose elements are values types, here specifically of type <literal>string</literal>. The lowercase name tells you it is a Hibernate mapping type/converter. Again the <literal>table</literal> attribute of the <literal>set</literal> element determines the table name for the collection. The <literal>key</literal> element defines the foreign-key column name in the collection table. The <literal>column</literal> attribute in the <literal>element</literal> element defines the column name where the email address values will actually be stored."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:777
+#: tutorial.xml:844
 #, no-c-format
-msgid "Have a look at the updated schema:"
+msgid "Here is the updated schema:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:781
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -1215,419 +1146,393 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:783
+#: tutorial.xml:850
 #, no-c-format
-msgid "You can see that the primary key of the collection table is in fact a composite key, using both columns. This also implies that there can't be duplicate email addresses per person, which is exactly the semantics we need for a set in Java."
+msgid "You can see that the primary key of the collection table is in fact a composite key that uses both columns. This also implies that there cannot be duplicate email addresses per person, which is exactly the semantics we need for a set in Java."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:789
+#: tutorial.xml:856
 #, no-c-format
-msgid "You can now try and add elements to this collection, just like we did before by linking persons and events. It's the same code in Java:"
+msgid "You can now try to add elements to this collection, just like we did before by linking persons and events. It is the same code in Java:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:794
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-      "<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) {\n"
+      "<![CDATA[    private void addEmailToPerson(Long personId, String emailAddress) {\n"
+      "        Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
+      "        session.beginTransaction();\n"
       "\n"
-      "    Session session = HibernateUtil.getSessionFactory().getCurrentSession();\n"
-      "    session.beginTransaction();\n"
+      "        Person aPerson = (Person) session.load(Person.class, personId);\n"
+      "        // adding to the emailAddress collection might trigger a lazy load of the collection\n"
+      "        aPerson.getEmailAddresses().add(emailAddress);\n"
       "\n"
-      "    Person aPerson = (Person) session.load(Person.class, personId);\n"
-      "\n"
-      "    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-      "    aPerson.getEmailAddresses().add(emailAddress);\n"
-      "\n"
-      "    session.getTransaction().commit();\n"
-      "}]]>"
+      "        session.getTransaction().commit();\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:796
+#: tutorial.xml:863
 #, no-c-format
-msgid "This time we didn't use a <emphasis>fetch</emphasis> query to initialize the collection. Hence, the call to its getter method will trigger an additional select to initialize it, so we can add an element to it. Monitor the SQL log and try to optimize this with an eager fetch."
+msgid "This time we did not use a <emphasis>fetch</emphasis> query to initialize the collection. Monitor the SQL log and try to optimize this with an eager fetch."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:806
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:808
+#: tutorial.xml:874
 #, no-c-format
-msgid "Next we are going to map a bi-directional association - making the association between person and event work from both sides in Java. Of course, the database schema doesn't change, we still have many-to-many multiplicity. A relational database is more flexible than a network programming language, so it doesn't need anything like a navigation direction - data can be viewed and retrieved in any possible way."
+msgid "Next you will map a bi-directional association. You will make the association between person and event work from both sides in Java. The database schema does not change, so you will still have many-to-many multiplicity."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:816
+#: tutorial.xml:882
 #, no-c-format
-msgid "First, add a collection of participants to the <literal>Event</literal> Event class:"
+msgid "A relational database is more flexible than a network programming language, in that it does not need a navigation direction; data can be viewed and retrieved in any possible way."
 msgstr ""
 
+#. Tag: para
+#: tutorial.xml:890
+#, no-c-format
+msgid "First, add a collection of participants to the <literal>Event</literal> class:"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:820
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-      "<![CDATA[private Set participants = new HashSet();\n"
+      "<![CDATA[    private Set participants = new HashSet();\n"
       "\n"
-      "public Set getParticipants() {\n"
-      "    return participants;\n"
-      "}\n"
+      "    public Set getParticipants() {\n"
+      "        return participants;\n"
+      "    }\n"
       "\n"
-      "public void setParticipants(Set participants) {\n"
-      "    this.participants = participants;\n"
-      "}]]>"
+      "    public void setParticipants(Set participants) {\n"
+      "        this.participants = participants;\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:822
+#: tutorial.xml:897
 #, no-c-format
-msgid "Now map this side of the association too, in <literal>Event.hbm.xml</literal>."
+msgid "Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:826
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-      "<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true\">\n"
-      "    <key column=\"EVENT_ID\"/>\n"
-      "    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-      "</set>]]>"
+      "<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true\">\n"
+      "            <key column=\"EVENT_ID\"/>\n"
+      "            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+      "        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:828
+#: tutorial.xml:903
 #, no-c-format
-msgid "As you see, these are normal <literal>set</literal> mappings in both mapping documents. Notice that the column names in <literal>key</literal> and <literal>many-to-many</literal> are swapped in both mapping documents. The most important addition here is the <literal>inverse=\"true\"</literal> attribute in the <literal>set</literal> element of the <literal>Event</literal>'s collection mapping."
+msgid "These are normal <literal>set</literal> mappings in both mapping documents. Notice that the column names in <literal>key</literal> and <literal>many-to-many</literal> swap in both mapping documents. The most important addition here is the <literal>inverse=\"true\"</literal> attribute in the <literal>set</literal> element of the <literal>Event</literal>'s collection mapping."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:836
+#: tutorial.xml:911
 #, no-c-format
-msgid "What this means is that Hibernate should take the other side - the <literal>Person</literal> class - when it needs to find out information about the link between the two. This will be a lot easier to understand once you see how the bi-directional link between our two entities is created ."
+msgid "What this means is that Hibernate should take the other side, the <literal>Person</literal> class, when it needs to find out information about the link between the two. This will be a lot easier to understand once you see how the bi-directional link between our two entities is created."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:845
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:847
+#: tutorial.xml:922
 #, no-c-format
-msgid "First, keep in mind that Hibernate does not affect normal Java semantics. How did we create a link between a <literal>Person</literal> and an <literal>Event</literal> in the unidirectional example? We added an instance of <literal>Event</literal> to the collection of event references, of an instance of <literal>Person</literal>. So, obviously, if we want to make this link working bi-directional, we have to do the same on the other side - adding a <literal>Person</literal> reference to the collection in an <literal>Event</literal>. This \"setting the link on both sides\" is absolutely necessary and you should never forget doing it."
+msgid "First, keep in mind that Hibernate does not affect normal Java semantics. How did we create a link between a <literal>Person</literal> and an <literal>Event</literal> in the unidirectional example? You add an instance of <literal>Event</literal> to the collection of event references, of an instance of <literal>Person</literal>. If you want to make this link bi-directional, you have to do the same on the other side by adding a <literal>Person</literal> reference to the collection in an <literal>Event</literal>. This process of \"setting the link on both sides\" is absolutely necessary with bi-directional links."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:857
+#: tutorial.xml:932
 #, no-c-format
-msgid "Many developers program defensively and create link management methods to correctly set both sides, e.g. in <literal>Person</literal>:"
+msgid "Many developers program defensively and create link management methods to correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:862
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-      "<![CDATA[protected Set getEvents() {\n"
-      "    return events;\n"
-      "}\n"
+      "<![CDATA[    protected Set getEvents() {\n"
+      "        return events;\n"
+      "    }\n"
       "\n"
-      "protected void setEvents(Set events) {\n"
-      "    this.events = events;\n"
-      "}\n"
+      "    protected void setEvents(Set events) {\n"
+      "        this.events = events;\n"
+      "    }\n"
       "\n"
-      "public void addToEvent(Event event) {\n"
-      "    this.getEvents().add(event);\n"
-      "    event.getParticipants().add(this);\n"
-      "}\n"
+      "    public void addToEvent(Event event) {\n"
+      "        this.getEvents().add(event);\n"
+      "        event.getParticipants().add(this);\n"
+      "    }\n"
       "\n"
-      "public void removeFromEvent(Event event) {\n"
-      "    this.getEvents().remove(event);\n"
-      "    event.getParticipants().remove(this);\n"
-      "}]]>"
+      "    public void removeFromEvent(Event event) {\n"
+      "        this.getEvents().remove(event);\n"
+      "        event.getParticipants().remove(this);\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:864
+#: tutorial.xml:939
 #, no-c-format
-msgid "Notice that the get and set methods for the collection are now protected - this allows classes in the same package and subclasses to still access the methods, but prevents everybody else from messing with the collections directly (well, almost). You should probably do the same with the collection on the other side."
+msgid "The get and set methods for the collection are now protected. This allows classes in the same package and subclasses to still access the methods, but prevents everybody else from altering the collections directly. Repeat the steps for the collection on the other side."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:871
+#: tutorial.xml:946
 #, no-c-format
-msgid "What about the <literal>inverse</literal> mapping attribute? For you, and for Java, a bi-directional link is simply a matter of setting the references on both sides correctly. Hibernate however doesn't have enough information to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</literal> statements (to avoid constraint violations), and needs some help to handle bi-directional associations properly. Making one side of the association <literal>inverse</literal> tells Hibernate to basically ignore it, to consider it a <emphasis>mirror</emphasis> of the other side. That's all that is necessary for Hibernate to work out all of the issues when transformation a directional navigation model to a SQL database schema. The rules you have to remember are straightforward: All bi-directional associations need one side as <literal>inverse</literal>. In a one-to-many association it has to be the many-side, in many-to-many association you can pick either side, there!
  is no difference."
+msgid "What about the <literal>inverse</literal> mapping attribute? For you, and for Java, a bi-directional link is simply a matter of setting the references on both sides correctly. Hibernate, however, does not have enough information to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</literal> statements (to avoid constraint violations). Making one side of the association <literal>inverse</literal> tells Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. That is all that is necessary for Hibernate to resolve any issues that arise when transforming a directional navigation model to a SQL database schema. The rules are straightforward: all bi-directional associations need one side as <literal>inverse</literal>. In a one-to-many association it has to be the many-side, and in many-to-many association you can select either side."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:889
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:964
 #, no-c-format
-msgid "Let's turn the following discussion into a small web application..."
+msgid "A Hibernate web application uses <literal>Session</literal> and <literal>Transaction</literal> almost like a standalone application. However, some common patterns are useful. You can now write an <literal>EventManagerServlet</literal>. This servlet can list all events stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:895
-#, no-c-format
-msgid "A Hibernate web application uses <literal>Session</literal> and <literal>Transaction</literal> almost like a standalone application. However, some common patterns are useful. We now write an <literal>EventManagerServlet</literal>. This servlet can list all events stored in the database, and it provides an HTML form to enter new events."
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:903
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:905
+#: tutorial.xml:974
 #, no-c-format
-msgid "Create a new class in your source directory, in the <literal>events</literal> package:"
+msgid "First we need create our basic processing servlet. Since our servlet only handles HTTP <literal>GET</literal> requests, we will only implement the <literal>doGet()</literal> method:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:910
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-      "<![CDATA[package events;\n"
+      "<![CDATA[package org.hibernate.tutorial.web;\n"
       "\n"
       "// Imports\n"
       "\n"
       "public class EventManagerServlet extends HttpServlet {\n"
       "\n"
-      "    // Servlet code\n"
-      "}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:912
-#, no-c-format
-msgid "The servlet handles HTTP <literal>GET</literal> requests only, hence, the method we implement is <literal>doGet()</literal>:"
-msgstr ""
-
-#. Tag: programlisting
-#: tutorial.xml:917
-#, no-c-format
-msgid ""
-      "<![CDATA[protected void doGet(HttpServletRequest request,\n"
-      "                     HttpServletResponse response)\n"
-      "        throws ServletException, IOException {\n"
+      "    protected void doGet(\n"
+      "            HttpServletRequest request,\n"
+      "            HttpServletResponse response) throws ServletException, IOException {\n"
       "\n"
-      "    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+      "        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy\" );\n"
       "\n"
-      "    try {\n"
-      "        // Begin unit of work\n"
-      "        HibernateUtil.getSessionFactory()\n"
-      "                .getCurrentSession().beginTransaction();\n"
+      "        try {\n"
+      "            // Begin unit of work\n"
+      "            HibernateUtil.getSessionFactory().getCurrentSession().beginTransaction();\n"
       "\n"
-      "        // Process request and render page...\n"
+      "            // Process request and render page...\n"
       "\n"
-      "        // End unit of work\n"
-      "        HibernateUtil.getSessionFactory()\n"
-      "                .getCurrentSession().getTransaction().commit();\n"
-      "\n"
-      "    } catch (Exception ex) {\n"
-      "        HibernateUtil.getSessionFactory()\n"
-      "                .getCurrentSession().getTransaction().rollback();\n"
-      "        throw new ServletException(ex);\n"
+      "            // End unit of work\n"
+      "            HibernateUtil.getSessionFactory().getCurrentSession().getTransaction().commit();\n"
+      "        }\n"
+      "        catch (Exception ex) {\n"
+      "            HibernateUtil.getSessionFactory().getCurrentSession().getTransaction().rollback();\n"
+      "            if ( ServletException.class.isInstance( ex ) ) {\n"
+      "                throw ( ServletException ) ex;\n"
+      "            }\n"
+      "            else {\n"
+      "                throw new ServletException( ex );\n"
+      "            }\n"
+      "        }\n"
       "    }\n"
       "\n"
       "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:919
+#: tutorial.xml:982
 #, no-c-format
-msgid "The pattern we are applying here is called <emphasis>session-per-request</emphasis>. When a request hits the servlet, a new Hibernate <literal>Session</literal> is opened through the first call to <literal>getCurrentSession()</literal> on the <literal>SessionFactory</literal>. Then a database transaction is started&mdash;all data access as to occur inside a transaction, no matter if data is read or written (we don't use the auto-commit mode in applications)."
+msgid "Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/EventManagerServlet.java</filename>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:928
+#: tutorial.xml:987
 #, no-c-format
+msgid "The pattern applied here is called <emphasis>session-per-request</emphasis>. When a request hits the servlet, a new Hibernate <literal>Session</literal> is opened through the first call to <literal>getCurrentSession()</literal> on the <literal>SessionFactory</literal>. A database transaction is then started. All data access occurs inside a transaction irrespective of whether the data is read or written. Do not use the auto-commit mode in applications."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:996
+#, no-c-format
 msgid "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> for every database operation. Use one Hibernate <literal>Session</literal> that is scoped to the whole request. Use <literal>getCurrentSession()</literal>, so that it is automatically bound to the current Java thread."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:935
+#: tutorial.xml:1003
 #, no-c-format
-msgid "Next, the possible actions of the request are processed and the response HTML is rendered. We'll get to that part soon."
+msgid "Next, the possible actions of the request are processed and the response HTML is rendered. We will get to that part soon."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
+#: tutorial.xml:1008
 #, no-c-format
-msgid "Finally, the unit of work ends when processing and rendering is complete. If any problem occurred during processing or rendering, an exception will be thrown and the database transaction rolled back. This completes the <literal>session-per-request</literal> pattern. Instead of the transaction demarcation code in every servlet you could also write a servlet filter. See the Hibernate website and Wiki for more information about this pattern, called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as soon as you consider rendering your view in JSP, not in a servlet."
+msgid "Finally, the unit of work ends when processing and rendering are complete. If any problems occurred during processing or rendering, an exception will be thrown and the database transaction rolled back. This completes the <literal>session-per-request</literal> pattern. Instead of the transaction demarcation code in every servlet, you could also write a servlet filter. See the Hibernate website and Wiki for more information about this pattern called <emphasis>Open Session in View</emphasis>. You will need it as soon as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1024
 #, no-c-format
-msgid "Let's implement the processing of the request and rendering of the page."
+msgid "Now you can implement the processing of the request and the rendering of the page."
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:960
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-      "<![CDATA[// Write HTML header\n"
-      "PrintWriter out = response.getWriter();\n"
-      "out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+      "<![CDATA[        // Write HTML header\n"
+      "        PrintWriter out = response.getWriter();\n"
+      "        out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
       "\n"
-      "// Handle actions\n"
-      "if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+      "        // Handle actions\n"
+      "        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
       "\n"
-      "    String eventTitle = request.getParameter(\"eventTitle\");\n"
-      "    String eventDate = request.getParameter(\"eventDate\");\n"
+      "            String eventTitle = request.getParameter(\"eventTitle\");\n"
+      "            String eventDate = request.getParameter(\"eventDate\");\n"
       "\n"
-      "    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-      "        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-      "    } else {\n"
-      "        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-      "        out.println(\"<b><i>Added event.</i></b>\");\n"
-      "    }\n"
-      "}\n"
+      "            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+      "                out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
+      "            }\n"
+      "            else {\n"
+      "                createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
+      "                out.println(\"<b><i>Added event.</i></b>\");\n"
+      "            }\n"
+      "        }\n"
       "\n"
-      "// Print page\n"
-      "printEventForm(out);\n"
-      "listEvents(out, dateFormatter);\n"
+      "        // Print page\n"
+      "       printEventForm(out);\n"
+      "       listEvents(out, dateFormatter);\n"
       "\n"
-      "// Write HTML footer\n"
-      "out.println(\"</body></html>\");\n"
-      "out.flush();\n"
-      "out.close();]]>"
+      "       // Write HTML footer\n"
+      "       out.println(\"</body></html>\");\n"
+      "       out.flush();\n"
+      "       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:962
+#: tutorial.xml:1030
 #, no-c-format
-msgid "Granted, this coding style with a mix of Java and HTML would not scale in a more complex application&mdash;keep in mind that we are only illustrating basic Hibernate concepts in this tutorial. The code prints an HTML header and a footer. Inside this page, an HTML form for event entry and a list of all events in the database are printed. The first method is trivial and only outputs HTML:"
+msgid "This coding style, with a mix of Java and HTML, would not scale in a more complex application&mdash;keep in mind that we are only illustrating basic Hibernate concepts in this tutorial. The code prints an HTML header and a footer. Inside this page, an HTML form for event entry and a list of all events in the database are printed. The first method is trivial and only outputs HTML:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:971
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-      "<![CDATA[private void printEventForm(PrintWriter out) {\n"
-      "    out.println(\"<h2>Add new event:</h2>\");\n"
-      "    out.println(\"<form>\");\n"
-      "    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-      "    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' length='10'/><br/>\");\n"
-      "    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-      "    out.println(\"</form>\");\n"
-      "}]]>"
+      "<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+      "        out.println(\"<h2>Add new event:</h2>\");\n"
+      "        out.println(\"<form>\");\n"
+      "        out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
+      "        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' length='10'/><br/>\");\n"
+      "        out.println(\"<input type='submit' name='action' value='store'/>\");\n"
+      "        out.println(\"</form>\");\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:973
+#: tutorial.xml:1041
 #, no-c-format
 msgid "The <literal>listEvents()</literal> method uses the Hibernate <literal>Session</literal> bound to the current thread to execute a query:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:979
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-      "<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat dateFormatter) {\n"
+      "<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat dateFormatter) {\n"
       "\n"
-      "    List result = HibernateUtil.getSessionFactory()\n"
-      "                    .getCurrentSession().createCriteria(Event.class).list();\n"
-      "    if (result.size() > 0) {\n"
-      "        out.println(\"<h2>Events in database:</h2>\");\n"
-      "        out.println(\"<table border='1'>\");\n"
-      "        out.println(\"<tr>\");\n"
-      "        out.println(\"<th>Event title</th>\");\n"
-      "        out.println(\"<th>Event date</th>\");\n"
-      "        out.println(\"</tr>\");\n"
-      "        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-      "            Event event = (Event) it.next();\n"
+      "        List result = HibernateUtil.getSessionFactory()\n"
+      "                .getCurrentSession().createCriteria(Event.class).list();\n"
+      "        if (result.size() > 0) {\n"
+      "            out.println(\"<h2>Events in database:</h2>\");\n"
+      "            out.println(\"<table border='1'>\");\n"
       "            out.println(\"<tr>\");\n"
-      "            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-      "            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + \"</td>\");\n"
+      "            out.println(\"<th>Event title</th>\");\n"
+      "            out.println(\"<th>Event date</th>\");\n"
       "            out.println(\"</tr>\");\n"
+      "            Iterator it = result.iterator();\n"
+      "            while (it.hasNext()) {\n"
+      "                Event event = (Event) it.next();\n"
+      "                out.println(\"<tr>\");\n"
+      "                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+      "                out.println(\"<td>\" + dateFormatter.format(event.getDate()) + \"</td>\");\n"
+      "                out.println(\"</tr>\");\n"
+      "            }\n"
+      "            out.println(\"</table>\");\n"
       "        }\n"
-      "        out.println(\"</table>\");\n"
-      "    }\n"
-      "}]]>"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:981
+#: tutorial.xml:1049
 #, no-c-format
 msgid "Finally, the <literal>store</literal> action is dispatched to the <literal>createAndStoreEvent()</literal> method, which also uses the <literal>Session</literal> of the current thread:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:987
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-      "<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-      "    Event theEvent = new Event();\n"
-      "    theEvent.setTitle(title);\n"
-      "    theEvent.setDate(theDate);\n"
+      "<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) {\n"
+      "        Event theEvent = new Event();\n"
+      "        theEvent.setTitle(title);\n"
+      "        theEvent.setDate(theDate);\n"
       "\n"
-      "    HibernateUtil.getSessionFactory()\n"
-      "                    .getCurrentSession().save(theEvent);\n"
-      "}]]>"
+      "        HibernateUtil.getSessionFactory()\n"
+      "                .getCurrentSession().save(theEvent);\n"
+      "    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:989
+#: tutorial.xml:1057
 #, no-c-format
-msgid "That's it, the servlet is complete. A request to the servlet will be processed in a single <literal>Session</literal> and <literal>Transaction</literal>. As earlier in the standalone application, Hibernate can automatically bind these objects to the current thread of execution. This gives you the freedom to layer your code and access the <literal>SessionFactory</literal> in any way you like. Usually you'd use a more sophisticated design and move the data access code into data access objects (the DAO pattern). See the Hibernate Wiki for more examples."
+msgid "The servlet is now complete. A request to the servlet will be processed in a single <literal>Session</literal> and <literal>Transaction</literal>. As earlier in the standalone application, Hibernate can automatically bind these objects to the current thread of execution. This gives you the freedom to layer your code and access the <literal>SessionFactory</literal> in any way you like. Usually you would use a more sophisticated design and move the data access code into data access objects (the DAO pattern). See the Hibernate Wiki for more examples."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:1003
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1005
+#: tutorial.xml:1073
 #, no-c-format
-msgid "To deploy this application you have to create a web archive, a WAR. Add the following Ant target to your <literal>build.xml</literal>:"
+msgid "To deploy this application for testing we must create a Web ARchive (WAR). First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/web.xml</filename>"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:1010
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-      "<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-      "    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-      "        <lib dir=\"${librarydir}\">\n"
-      "          <exclude name=\"jsdk*.jar\"/>\n"
-      "        </lib>\n"
-      "\n"
-      "        <classes dir=\"${targetdir}\"/>\n"
-      "    </war>\n"
-      "</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:1012
-#, no-c-format
-msgid "This target creates a file called <literal>hibernate-tutorial.war</literal> in your project directory. It packages all libraries and the <literal>web.xml</literal> descriptor, which is expected in the base directory of your project:"
-msgstr ""
-
-#. Tag: programlisting
-#: tutorial.xml:1018
-#, no-c-format
-msgid ""
       "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       "<web-app version=\"2.4\"\n"
       "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -1636,7 +1541,7 @@
       "\n"
       "    <servlet>\n"
       "        <servlet-name>Event Manager</servlet-name>\n"
-      "        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+      "        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</servlet-class>\n"
       "    </servlet>\n"
       "\n"
       "    <servlet-mapping>\n"
@@ -1647,44 +1552,32 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1020
+#: tutorial.xml:1081
 #, no-c-format
-msgid "Before you compile and deploy the web application, note that an additional library is required: <literal>jsdk.jar</literal>. This is the Java servlet development kit, if you don't have this library already, get it from the Sun website and copy it to your library directory. However, it will be only used for compilation and excluded from the WAR package."
+msgid "To build and deploy call <literal>mvn package</literal> in your project directory and copy the <filename>hibernate-tutorial.war</filename> file into your Tomcat <filename>webapps</filename> directory."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1028
+#: tutorial.xml:1088
 #, no-c-format
-msgid "To build and deploy call <literal>ant war</literal> in your project directory and copy the <literal>hibernate-tutorial.war</literal> file into your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat installed, download it and follow the installation instructions. You don't have to change any Tomcat configuration to deploy this application though."
+msgid "If you do not have Tomcat installed, download it from <ulink url=\"http://tomcat.apache.org/\"></ulink> and follow the installation instructions. Our application requires no changes to the standard Tomcat configuration."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1036
+#: tutorial.xml:1096
 #, no-c-format
 msgid "Once deployed and Tomcat is running, access the application at <literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. Make sure you watch the Tomcat log to see Hibernate initialize when the first request hits your servlet (the static initializer in <literal>HibernateUtil</literal> is called) and to get the detailed output if any exceptions occurs."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:1049
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1051
+#: tutorial.xml:1111
 #, no-c-format
-msgid "This tutorial covered the basics of writing a simple standalone Hibernate application and a small web application."
+msgid "This tutorial covered the basics of writing a simple standalone Hibernate application and a small web application. More tutorials are available from the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:1056
-#, no-c-format
-msgid "If you already feel confident with Hibernate, continue browsing through the reference documentation table of contents for topics you find interesting - most asked are transactional processing (<xref linkend=\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), or the usage of the API (<xref linkend=\"objectstate\"/>) and the query features (<xref linkend=\"objectstate-querying\"/>)."
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:1064
-#, no-c-format
-msgid "Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: emphasis
 #: xml.xml:31
 #, no-c-format
-msgid "Note that this is an experimental feature in Hibernate 3.0 and is under extremely active development."
+msgid "XML Mapping is an experimental feature in Hibernate 3.0 and is currently under active development."
 msgstr ""
 
 #. Tag: title
@@ -35,7 +35,7 @@
 #. Tag: para
 #: xml.xml:39
 #, no-c-format
-msgid "Hibernate lets you work with persistent XML data in much the same way you work with persistent POJOs. A parsed XML tree can be thought of as just another way to represent the relational data at the object level, instead of POJOs."
+msgid "Hibernate allows you to work with persistent XML data in much the same way you work with persistent POJOs. A parsed XML tree can be thought of as another way of representing the relational data at the object level, instead of POJOs."
 msgstr ""
 
 #. Tag: para
@@ -53,7 +53,7 @@
 #. Tag: para
 #: xml.xml:61
 #, no-c-format
-msgid "A single mapping may be used to simultaneously map properties of a class and nodes of an XML document to the database, or, if there is no class to map, it may be used to map just the XML."
+msgid "A single mapping can be used to simultaneously map properties of a class and nodes of an XML document to the database, or, if there is no class to map, it can be used to map just the XML."
 msgstr ""
 
 #. Tag: title
@@ -138,7 +138,7 @@
 #. Tag: para
 #: xml.xml:86
 #, no-c-format
-msgid "This mapping allows you to access the data as a dom4j tree, or as a graph of property name/value pairs (java <literal>Map</literal>s). The property names are purely logical constructs that may be referred to in HQL queries."
+msgid "This mapping allows you to access the data as a dom4j tree, or as a graph of property name/value pairs or java <literal>Map</literal>s. The property names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 
 #. Tag: title
@@ -150,43 +150,43 @@
 #. Tag: para
 #: xml.xml:99
 #, no-c-format
-msgid "Many Hibernate mapping elements accept the <literal>node</literal> attribute. This let's you specify the name of an XML attribute or element that holds the property or entity data. The format of the <literal>node</literal> attribute must be one of the following:"
+msgid "A range of Hibernate mapping elements accept the <literal>node</literal> attribute. This lets you specify the name of an XML attribute or element that holds the property or entity data. The format of the <literal>node</literal> attribute must be one of the following:"
 msgstr ""
 
 #. Tag: para
 #: xml.xml:108
 #, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr ""
 
 #. Tag: para
 #: xml.xml:111
 #, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 
 #. Tag: para
 #: xml.xml:114
 #, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr ""
 
 #. Tag: para
 #: xml.xml:117
 #, no-c-format
-msgid "<literal>\"element-name/@attribute-name\"</literal> - map to the named attribute of the named element"
+msgid "<literal>\"element-name/@attribute-name\"</literal>: map to the named attribute of the named element"
 msgstr ""
 
 #. Tag: para
 #: xml.xml:124
 #, no-c-format
-msgid "For collections and single valued associations, there is an additional <literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</literal>, the default, the XML tree for the associated entity (or collection of value type) will be embedded directly in the XML tree for the entity that owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, then only the referenced identifier value will appear in the XML for single point associations and collections will simply not appear at all."
+msgid "For collections and single valued associations, there is an additional <literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</literal>, the default, the XML tree for the associated entity (or collection of value type) will be embedded directly in the XML tree for the entity that owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, then only the referenced identifier value will appear in the XML for single point associations and collections will not appear at all."
 msgstr ""
 
 #. Tag: para
 #: xml.xml:134
 #, no-c-format
-msgid "You should be careful not to leave <literal>embed-xml=\"true\"</literal> for too many associations, since XML does not deal well with circularity!"
+msgid "Do not leave <literal>embed-xml=\"true\"</literal> for too many associations, since XML does not deal well with circularity."
 msgstr ""
 
 #. Tag: programlisting
@@ -232,7 +232,7 @@
 #. Tag: para
 #: xml.xml:141
 #, no-c-format
-msgid "in this case, we have decided to embed the collection of account ids, but not the actual account data. The following HQL query:"
+msgid "In this case, the collection of account ids is embedded, but not the actual account data. The following HQL query:"
 msgstr ""
 
 #. Tag: programlisting
@@ -244,7 +244,7 @@
 #. Tag: para
 #: xml.xml:148
 #, no-c-format
-msgid "Would return datasets such as this:"
+msgid "would return datasets such as this:"
 msgstr ""
 
 #. Tag: programlisting
@@ -300,7 +300,7 @@
 #. Tag: para
 #: xml.xml:167
 #, no-c-format
-msgid "Let's rearead and update XML documents in the application. We do this by obtaining a dom4j session:"
+msgid "You can also re-read and update XML documents in the application. You can do this by obtaining a dom4j session:"
 msgstr ""
 
 #. Tag: programlisting
@@ -351,6 +351,6 @@
 #. Tag: para
 #: xml.xml:176
 #, no-c-format
-msgid "It is extremely useful to combine this feature with Hibernate's <literal>replicate()</literal> operation to implement XML-based data import/export."
+msgid "When implementing XML-based data import/export, it is useful to combine this feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 

Modified: core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot	2009-07-14 20:58:00 UTC (rev 17091)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-05-07 21:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - Relational Persistence for Idiomatic Java"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "Documentação da Referência do Hibernate"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,43 +11,59 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: architecture.xml:21
+#: architecture.xml:30
 #, no-c-format
 msgid "Architecture"
 msgstr "Arquitetura"
 
 #. Tag: title
-#: architecture.xml:24
+#: architecture.xml:33
 #, no-c-format
 msgid "Overview"
 msgstr "Visão Geral"
 
 #. Tag: para
-#: architecture.xml:26
-#, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+#: architecture.xml:35
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Uma visão bem ampla da arquitetura do Hibernate:"
 
 #. Tag: para
-#: architecture.xml:39
-#, no-c-format
+#: architecture.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"Nós gostaríamos de mostrar uma visão mais detalhada da arquitetura em "
+"execução. Infelizmente, o Hibernate é muito flexível e suporta várias "
+"aproximações. Nós iremos mostrar os dois extremos. Na arquitetura mais "
+"simples o aplicativo fornece suas próprias conexões JDBC e gerencia suas "
+"transações. Esta abordagem usa o mínimo de subconjuntos das APIs do "
+"Hibernate:"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "Esse diagrama mostra o Hibernate usando o banco de dados e a configuração de "
 "dados para prover persistência de serviços (e persistência de objetos) para "
 "o aplicativo."
 
 #. Tag: para
-#: architecture.xml:44
-#, no-c-format
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "Nós gostaríamos de mostrar uma visão mais detalhada da arquitetura em "
 "execução. Infelizmente, o Hibernate é muito flexível e suporta várias "
@@ -57,36 +73,36 @@
 "Hibernate:"
 
 #. Tag: para
-#: architecture.xml:61
-#, no-c-format
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "A arquitetura \"completa\" abstrai a aplicação de ter de lidar diretamente "
 "com JDBC/JTA e APIs e deixa o Hibernate tomar conta dos detalhes."
 
 #. Tag: para
-#: architecture.xml:75
+#: architecture.xml:88
 #, fuzzy, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr "Algumas definições dos objetos do diagrama: <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:80
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:82
-#, no-c-format
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "Um cache threadsafe (imutáveis) composto de identidades compiladas para um "
 "único banco de dados. Uma fabrica para <literal>Session</literal> e um "
@@ -95,20 +111,20 @@
 "de processo- ou cluster."
 
 #. Tag: term
-#: architecture.xml:92
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:94
-#, no-c-format
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "Objeto single-threaded, de vida curta, representando uma conversação entre o "
 "aplicativo e o armazenamento persistente. Cria uma camada sobre uma conexão "
@@ -117,21 +133,21 @@
 "no gráficos de objetos e pesquisa de objetos pelo identificador."
 
 #. Tag: term
-#: architecture.xml:104
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objetos persistentes e coleções"
 
 #. Tag: para
-#: architecture.xml:106
-#, no-c-format
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "Objetos, de vida curta, single threaded contendo estado persistente e função "
 "de negócios. Esses podem ser JavaBeans/POJOs, onde única coisa especial "
@@ -141,18 +157,18 @@
 "diretamente como data transfer objects de e para a camada de apresentação)"
 
 #. Tag: term
-#: architecture.xml:117
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos e coleções desatachados e transientes"
 
 #. Tag: para
-#: architecture.xml:119
-#, no-c-format
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "Instâncias de classes persistentes que ainda não estão associadas a uma "
@@ -161,21 +177,21 @@
 "<literal>Session</literal> que foi encerrada."
 
 #. Tag: term
-#: architecture.xml:128
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:130
-#, no-c-format
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(Opcional) Objeto de vida curta, single threaded, usado pela aplicação para "
 "especificar unidades atômicas de trabalho. Abstrai o aplicativo de lidar "
@@ -185,7 +201,7 @@
 "Transaction subjacentes, nunca é opcional!"
 
 #. Tag: term
-#: architecture.xml:141
+#: architecture.xml:153
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -195,13 +211,13 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:143
-#, no-c-format
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(Opcional) Uma fábrica de (e combinações de) conexões JDBC. Abstrai a "
 "aplicação de lidar diretamente com <literal>Datasource</literal> ou "
@@ -209,7 +225,7 @@
 "implementado ou estendido pelo programador."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:163
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -217,41 +233,43 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
-#, no-c-format
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(Opcional) Uma fábrica para instâncias de <literal>Transaction</literal>. "
 "Não exposta a aplicação, mas pode ser extendida/implementada pelo "
 "programador."
 
 #. Tag: emphasis
-#: architecture.xml:160
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "Extension Interfaces"
 
 #. Tag: para
-#: architecture.xml:162
-#, no-c-format
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "O Hibernate oferece várias opções de interfaces estendidas que você pode "
 "implementar para customizar sua camada persistente. Veja a documentação da "
 "API para maiores detalhes."
 
 #. Tag: para
-#: architecture.xml:171
-#, no-c-format
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "Dada uma arquitetura simples, o aplicativo passa pelas APIs "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> e/ou "
@@ -259,19 +277,19 @@
 "transação JTA ou JDBC."
 
 #. Tag: title
-#: architecture.xml:179
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr "Estados de instância"
 
 #. Tag: para
-#: architecture.xml:180
-#, no-c-format
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "Uma instância de classes persistentes pode estar em um dos três diferentes "
 "estados, que são definidos respeitando um <emphasis>contexto persistente</"
@@ -279,36 +297,36 @@
 "persistente:"
 
 #. Tag: term
-#: architecture.xml:188
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr "transiente"
 
 #. Tag: para
-#: architecture.xml:190
-#, no-c-format
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr ""
 "A instância não é, e nunca foi associada com nenhum contexto persistente. "
 "Não possui uma identidade persistente (valor de chave primária)."
 
 #. Tag: term
-#: architecture.xml:198
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr "persistente"
 
 #. Tag: para
-#: architecture.xml:200
-#, no-c-format
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "A instância está atualmente associada a um contexto persistente. Possui uma "
 "identidade persistente (valor de chave primária) e, talvez, correspondente a "
@@ -317,19 +335,19 @@
 "equivalente a identidade Java (na localização em memória do objeto)."
 
 #. Tag: term
-#: architecture.xml:212
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr "desatachado"
 
 #. Tag: para
-#: architecture.xml:214
-#, no-c-format
+#: architecture.xml:226
+#, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corrsponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "A instância foi associada com um contexto persistente, porém este contexto "
@@ -339,30 +357,31 @@
 "relacionamento entre identidade persistente e identidade Java."
 
 #. Tag: title
-#: architecture.xml:229
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr "Integração JMX"
 
 #. Tag: para
-#: architecture.xml:231
-#, no-c-format
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMX é padrão J2EE para manipulação de componentes Java. O Hibernate pode ser "
 "manipulado por um serviço JMX padrão. Nós fornecemos uma implementação do "
 "MBean na distribuição, <literal>org.hibernate.jmx.HibernateService</literal>."
 
 #. Tag: para
-#: architecture.xml:237
-#, no-c-format
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "Para um exemplo de como instalar o Hibernate como um serviço JMX em um "
 "servidor de aplicativo JBoss, por favor, consulte o manual do usuário do "
@@ -370,17 +389,17 @@
 "usando JMX:"
 
 #. Tag: para
-#: architecture.xml:245
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>Session Management:</emphasis> O ciclo de vida de uma "
@@ -395,16 +414,16 @@
 "literal>."
 
 #. Tag: para
-#: architecture.xml:257
-#, no-c-format
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>HAR deployment:</emphasis>: Normalmente você faz o deploy de um "
 "serviço JMX do Hibernate usando um serviço descritor de deploy do JBoss (em "
@@ -416,7 +435,7 @@
 "HAR."
 
 #. Tag: para
-#: architecture.xml:268
+#: architecture.xml:280
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
@@ -425,11 +444,12 @@
 "sobre essas opções."
 
 #. Tag: para
-#: architecture.xml:272
-#, no-c-format
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "Another feature available as a JMX service are runtime Hibernate statistics. "
 "See <xref linkend=\"configuration-optional-statistics\"/>. Outra opção "
@@ -437,18 +457,18 @@
 "Veja a <xref linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:279
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr "Suporte JCA"
 
 #. Tag: para
-#: architecture.xml:280
-#, no-c-format
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hibernate may also be configured as a JCA connector. Please see the website "
 "for more details. Please note that Hibernate JCA support is still considered "
@@ -457,23 +477,23 @@
 "suporte JCA do Hibernate ainda é considerado experimental."
 
 #. Tag: title
-#: architecture.xml:287
-#, no-c-format
-msgid "Contextual Sessions"
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "Sessões contextuais"
 
 #. Tag: para
-#: architecture.xml:288
-#, no-c-format
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "Muitas aplicações que usam o Hibernate necessita de algum tipo de sessão "
@@ -486,19 +506,18 @@
 "(como Spring ou Pico) que provê sessões contextuais baseadas em proxy."
 
 #. Tag: para
-#: architecture.xml:297
-#, no-c-format
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "A partir da versão 3.0.1, o Hibernate adicionou o método "
 "<literal>SessionFactory.getCurrentSession()</literal>. Inicialmente, este "
@@ -512,14 +531,14 @@
 "sessões contextuais baseadas em <literal>JTA</literal>."
 
 #. Tag: para
-#: architecture.xml:307
-#, no-c-format
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "Entretanto, na versão 3.1, o processo por trás do método "
@@ -531,15 +550,15 @@
 "definição de sessões correntes."
 
 #. Tag: para
-#: architecture.xml:314
-#, no-c-format
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "De uma olhada em Javadocs sobre a interface <literal>org.hibernate.context."
 "CurrentSessionContext</literal> para uma discussão detalhada. Ela define um "
@@ -549,11 +568,11 @@
 "interface."
 
 #. Tag: para
-#: architecture.xml:324
-#, no-c-format
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -563,25 +582,24 @@
 "Consulte em Javadocs para maiores detalhes."
 
 #. Tag: para
-#: architecture.xml:332
-#, no-c-format
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - As "
 "sessões correntes são rastreadas por uma thread de execução. Novamente, "
 "consulte em Javadocs para maiores detalhes."
 
 #. Tag: para
-#: architecture.xml:338
-#, no-c-format
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
 "sessions are tracked by thread of execution. However, you are responsible to "
@@ -589,20 +607,21 @@
 "this class, it does never open, flush, or close a <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:359
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programatic "
-"transaction demarcation in plain JSE without JTA, you are adviced to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "As duas primeiras implementações usam o modelo de programação \"uma sessão – "
 "uma transação do banco de dados\", também conhecida e usado como "
@@ -618,18 +637,18 @@
 "de código."
 
 #. Tag: para
-#: architecture.xml:359
-#, no-c-format
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "O parâmetro de configuração <literal>hibernate."

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,24 +11,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: association_mapping.xml:6
+#: association_mapping.xml:30
 #, no-c-format
 msgid "Association Mappings"
 msgstr "Mapeamento de Associações"
 
 #. Tag: title
-#: association_mapping.xml:9
+#: association_mapping.xml:33
 #, no-c-format
 msgid "Introduction"
 msgstr "Introdução"
 
 #. Tag: para
-#: association_mapping.xml:11
-#, no-c-format
+#: association_mapping.xml:35
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -39,22 +39,22 @@
 "literal> em todos os exemplos."
 
 #. Tag: para
-#: association_mapping.xml:19
-#, no-c-format
+#: association_mapping.xml:43
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr ""
 "Nós classificaremos as associações pelo seu mapeamento ou a falta do mesmo, "
 "sua intervenção na tabela associativa, e pela sua multiplicidade."
 
 #. Tag: para
-#: association_mapping.xml:24
-#, no-c-format
+#: association_mapping.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "O uso de chaves estrangeiras não obrigatórias não é considerada uma boa "
@@ -64,19 +64,19 @@
 "obrigatoriedade."
 
 #. Tag: title
-#: association_mapping.xml:34
+#: association_mapping.xml:58
 #, no-c-format
 msgid "Unidirectional associations"
 msgstr "Associações Unidirecionais"
 
 #. Tag: title
-#: association_mapping.xml:37 association_mapping.xml:108
-#, no-c-format
-msgid "many to one"
+#: association_mapping.xml:61 association_mapping.xml:132
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "muitos para um"
 
 #. Tag: para
-#: association_mapping.xml:39
+#: association_mapping.xml:63
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association</emphasis> is the most "
@@ -86,7 +86,7 @@
 "mais comum de associação unidirecional."
 
 #. Tag: programlisting
-#: association_mapping.xml:44
+#: association_mapping.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -106,7 +106,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:45 association_mapping.xml:161
+#: association_mapping.xml:69 association_mapping.xml:185
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -117,10 +117,10 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:50 association_mapping.xml:121
-#: association_mapping.xml:185 association_mapping.xml:225
+#: association_mapping.xml:74 association_mapping.xml:145
+#: association_mapping.xml:210
 #, fuzzy, no-c-format
-msgid "one to one"
+msgid "One-to-one"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "um para um\n"
@@ -132,7 +132,7 @@
 "one to one"
 
 #. Tag: para
-#: association_mapping.xml:52
+#: association_mapping.xml:76
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a foreign key</"
@@ -144,7 +144,7 @@
 "coluna."
 
 #. Tag: programlisting
-#: association_mapping.xml:57
+#: association_mapping.xml:81
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -165,7 +165,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:58 association_mapping.xml:193
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -176,19 +176,19 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:60
-#, no-c-format
+#: association_mapping.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"emphasis> usually uses a special id generator In this example, however, we "
+"have reversed the direction of the association:"
 msgstr ""
 "Uma <emphasis>associação unidirecional um-para-um na chave primaria</"
 "emphasis> geralmente usa um gerador de id special. ( Note que nós invertemos "
 "a direção da associação nesse exemplo)."
 
 #. Tag: programlisting
-#: association_mapping.xml:66
+#: association_mapping.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -208,7 +208,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:67 association_mapping.xml:201
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -218,24 +218,24 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:72 association_mapping.xml:94
-#, no-c-format
-msgid "one to many"
+#: association_mapping.xml:96 association_mapping.xml:118
+#, fuzzy, no-c-format
+msgid "One-to-many"
 msgstr "um para muitos"
 
 #. Tag: para
-#: association_mapping.xml:74
-#, no-c-format
+#: association_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "Uma <emphasis>associação unidirecional um-para-muitos em uma chave "
 "estrangeira</emphasis> é um caso muito incomum, e realmente não é "
 "recomendada."
 
 #. Tag: programlisting
-#: association_mapping.xml:79
+#: association_mapping.xml:103
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -257,7 +257,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:80
+#: association_mapping.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -268,27 +268,26 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:82
-#, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+#: association_mapping.xml:106
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr ""
 "Nós achamos que é melhor usar uma tabela associativa para este tipo de "
 "associação."
 
 #. Tag: title
-#: association_mapping.xml:91
+#: association_mapping.xml:115
 #, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "Associações Unidirecionais com tabelas associativas"
 
 #. Tag: para
-#: association_mapping.xml:96
-#, no-c-format
+#: association_mapping.xml:120
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"emphasis> is the preferred option. Specifying <literal>unique=\"true\"</"
+"literal>, changes the multiplicity from many-to-many to one-to-many."
 msgstr ""
 "Uma <emphasis>associação um-para-muitos unidirecional usando uma tabela "
 "associativa</emphasis> e o mais comum. Note que se especificarmos "
@@ -296,7 +295,7 @@
 "muitos-para-muitos para um-para-muitos."
 
 #. Tag: programlisting
-#: association_mapping.xml:102
+#: association_mapping.xml:126
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -319,7 +318,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:103
+#: association_mapping.xml:127
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -331,17 +330,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:110
-#, no-c-format
+#: association_mapping.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "Uma <emphasis>associação unidirecional muitos-para-um em uma tabela "
 "associativa</emphasis> é bastante comum quando a associação for opcional."
 
 #. Tag: programlisting
-#: association_mapping.xml:115
+#: association_mapping.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -365,7 +364,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:116
+#: association_mapping.xml:140
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -377,17 +376,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:123
-#, no-c-format
+#: association_mapping.xml:147
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Uma <emphasis>associação unidirecional um-para-um em uma tabela associativa</"
 "emphasis> é extremamente incomum, mas possível."
 
 #. Tag: programlisting
-#: association_mapping.xml:128
+#: association_mapping.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -413,7 +412,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:129 association_mapping.xml:233
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -425,23 +424,23 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:134 association_mapping.xml:238
-#, no-c-format
-msgid "many to many"
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "muitos para muitos"
 
 #. Tag: para
-#: association_mapping.xml:136
-#, no-c-format
+#: association_mapping.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr ""
 "Finalmente, nós temos a <emphasis>associação unidirecional muitos-para- "
 "muitos</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:140
+#: association_mapping.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -463,7 +462,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:141 association_mapping.xml:246
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -475,29 +474,30 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:148
+#: association_mapping.xml:172
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "Associações Bidirecionais"
 
 #. Tag: title
-#: association_mapping.xml:151 association_mapping.xml:211
-#, no-c-format
-msgid "one to many / many to one"
+#: association_mapping.xml:175 association_mapping.xml:236
+#, fuzzy, no-c-format
+msgid "one-to-many / many-to-one"
 msgstr "um para muitos / muitos para um"
 
 #. Tag: para
-#: association_mapping.xml:153
-#, no-c-format
+#: association_mapping.xml:177
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "Uma <emphasis>associação bidirecional muitos-para-um</emphasis> é o tipo "
 "mais comum de associação. (Esse é o relacionamento padrão pai / filho. )"
 
 #. Tag: programlisting
-#: association_mapping.xml:159
+#: association_mapping.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -521,15 +521,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:163
-#, no-c-format
+#: association_mapping.xml:187
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "Se você usar uma <literal>List</literal> ( ou outra coleção indexada ), você "
 "precisa especificar a coluna <literal>chave</literal> estrangeira como not "
@@ -539,7 +539,7 @@
 "literal> e <literal>insert=\"false\"</literal>):"
 
 #. Tag: programlisting
-#: association_mapping.xml:171
+#: association_mapping.xml:195
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -564,13 +564,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:173
-#, no-c-format
+#: association_mapping.xml:197
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -582,17 +582,17 @@
 "literal>."
 
 #. Tag: para
-#: association_mapping.xml:187
-#, no-c-format
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr ""
 "Uma <emphasis>associação bidirecional um para um em uma chave estrangeira</"
 "emphasis> é bastante comum."
 
 #. Tag: programlisting
-#: association_mapping.xml:192
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -615,17 +615,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:195
-#, no-c-format
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr ""
 "Uma <emphasis>associação bidirecional um para um em uma chave primária</"
 "emphasis> usa um gerador de id especial."
 
 #. Tag: programlisting
-#: association_mapping.xml:200
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -647,25 +647,26 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:208
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "Associações Bidirecionais com tabelas associativas"
 
 #. Tag: para
-#: association_mapping.xml:213
-#, no-c-format
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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 ""
 "Uma <emphasis>associação bidirecional um para muitos em uma tabela "
 "associativa</emphasis>. Veja que <literal>inverse=\"true\"</literal> pode "
 "ser colocado em qualquer ponta associação, na coleção, ou no join."
 
 #. Tag: programlisting
-#: association_mapping.xml:219
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -697,7 +698,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:220
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -708,18 +709,32 @@
 "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, fuzzy, no-c-format
+msgid "one to one"
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"um para um\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"um para um\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"um para um\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"one to one"
+
 #. Tag: para
-#: association_mapping.xml:227
-#, no-c-format
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "Uma <emphasis>associação bidirecional um-para-um em uma tabela de "
 "associação</emphasis> é algo bastante incomum, mas possivel."
 
 #. Tag: programlisting
-#: association_mapping.xml:232
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -755,10 +770,10 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:240
-#, no-c-format
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr ""
 "Finally, we have a <emphasis>bidirectional many-to-many association</"
@@ -766,7 +781,7 @@
 "muitos."
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -793,21 +808,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:253
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "Mapeamento de associações mais complexas"
 
 #. Tag: para
-#: association_mapping.xml:255
-#, no-c-format
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
 "Hibernate makes it possible to handle more complex situations using SQL "
@@ -822,7 +837,7 @@
 "effectiveEndDate e effectiveStartDate, mapeadas assim como segue:"
 
 #. Tag: programlisting
-#: association_mapping.xml:264
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -837,11 +852,11 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:266
-#, no-c-format
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"You can then map an association to the <emphasis>current</emphasis> "
+"instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "Then we can map an association to the <emphasis>current</emphasis> instance "
 "(the one with null <literal>effectiveEndDate</literal>) using: Então nós "
@@ -849,7 +864,7 @@
 "effectiveEndDate igual a null) usando:"
 
 #. Tag: programlisting
-#: association_mapping.xml:271
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -861,15 +876,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:273
-#, no-c-format
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"emphasis> employer, the one with the most recent <literal>startDate</"
+"literal>, could be mapped in the following way:"
 msgstr ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
@@ -883,7 +898,7 @@
 "startDate) deve ser mapeado desta maneira:"
 
 #. Tag: programlisting
-#: association_mapping.xml:281
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -901,11 +916,11 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:283
-#, no-c-format
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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 ""
 "You can get quite creative with this functionality, but it is usually more "
 "practical to handle these kinds of cases using HQL or a criteria query. Você "

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: basic_mapping.xml:5
+#: basic_mapping.xml:29
 #, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "Mapeamento O/R Bassico"
 
 #. Tag: title
-#: basic_mapping.xml:8
+#: basic_mapping.xml:32
 #, no-c-format
 msgid "Mapping declaration"
 msgstr "Declaração de mapeamento"
 
 #. Tag: para
-#: basic_mapping.xml:10
-#, no-c-format
+#: basic_mapping.xml:34
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "Object/relational mappings are usually defined in an XML document. The "
 "mapping document is designed to be readable and hand-editable. The mapping "
@@ -37,25 +37,25 @@
 "persistent class declarations, not table declarations."
 
 #. Tag: para
-#: basic_mapping.xml:17
-#, no-c-format
+#: basic_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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 ""
 "Note that, even though many Hibernate users choose to write the XML by hand, "
 "a number of tools exist to generate the mapping document, including XDoclet, "
 "Middlegen and AndroMDA."
 
 #. Tag: para
-#: basic_mapping.xml:23
-#, no-c-format
-msgid "Lets kick off with an example mapping:"
+#: basic_mapping.xml:47
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "Lets kick off with an example mapping:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:27
+#: basic_mapping.xml:51
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -125,14 +125,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:29
-#, no-c-format
+#: basic_mapping.xml:53
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "Discutir agora o conteúdo deste documento de mapeamento. Iremos apenas "
 "descrever os elementos do documento e atributos que são utilizados pelo "
@@ -142,21 +142,21 @@
 "esquemas. (Por exemplo, o atributo <literal>not-null</literal>)."
 
 #. Tag: title
-#: basic_mapping.xml:40
+#: basic_mapping.xml:64
 #, no-c-format
 msgid "Doctype"
 msgstr "Doctype"
 
 #. Tag: para
-#: basic_mapping.xml:42
-#, no-c-format
+#: basic_mapping.xml:66
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "Todos os mapeamentos de XML devem declarar o doctype exibido. O DTD atual "
 "pode ser encontrado na URL abaixo, no diretório <literal>hibernate-x.x.x/src/"
@@ -166,21 +166,20 @@
 "declaração do seu DTD com o conteúdo do seu classpath"
 
 #. Tag: title
-#: basic_mapping.xml:52
+#: basic_mapping.xml:76
 #, no-c-format
 msgid "EntityResolver"
 msgstr "EntityResolver"
 
 #. Tag: para
-#: basic_mapping.xml:53
-#, no-c-format
+#: basic_mapping.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
 "classpath. The manner in which it does this is by registering a custom "
@@ -190,13 +189,13 @@
 "namespaces."
 
 #. Tag: para
-#: basic_mapping.xml:61
-#, no-c-format
+#: basic_mapping.xml:85
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
 "encounteres a systemId starting with <literal>http://hibernate.sourceforge."
@@ -204,12 +203,12 @@
 "classlaoder which loaded the Hibernate classes."
 
 #. Tag: para
-#: basic_mapping.xml:70
-#, no-c-format
+#: basic_mapping.xml:94
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -220,13 +219,13 @@
 "Hibernate classes."
 
 #. Tag: para
-#: basic_mapping.xml:79
-#, no-c-format
-msgid "An example of utilizing user namespacing:"
+#: basic_mapping.xml:103
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "An example of utilizing user namespacing:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:82
+#: basic_mapping.xml:106
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -247,7 +246,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:83
+#: basic_mapping.xml:107
 #, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
@@ -259,24 +258,25 @@
 "custom\">typedef</xref>."
 
 #. Tag: title
-#: basic_mapping.xml:91
-#, no-c-format
-msgid "hibernate-mapping"
+#: basic_mapping.xml:115
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
-#: basic_mapping.xml:93
-#, no-c-format
+#: basic_mapping.xml:117
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "Este elemento tem diversos atributos opcionais. Os atributos "
 "<literal>schema</literal> e <literal>catalog</literal> especificam que "
@@ -290,7 +290,7 @@
 "de consulta, por default."
 
 #. Tag: programlisting
-#: basic_mapping.xml:114
+#: basic_mapping.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
@@ -305,36 +305,36 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:117
-#, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#: basic_mapping.xml:141
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr ""
 "<literal>schema</literal> (opcional): O nome do esquema do banco de dados."
 
 #. Tag: para
-#: basic_mapping.xml:122
-#, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#: basic_mapping.xml:146
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr ""
 "<literal>catalog</literal> (opcional): O nome do catálogo do banco de dados."
 
 #. Tag: para
-#: basic_mapping.xml:127
-#, no-c-format
+#: basic_mapping.xml:151
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (opcional – default é <literal>nenhum </"
 "literal>): Um estilo cascata default."
 
 #. Tag: para
-#: basic_mapping.xml:133
-#, no-c-format
+#: basic_mapping.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (opcional – default é <literal>property</"
 "literal>): A estratégia que o Hibernate deve utilizar para acessar todas as "
@@ -342,11 +342,11 @@
 "<literal>PropertyAccessor</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:140
-#, no-c-format
+#: basic_mapping.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (opcional - default é <literal>true</"
@@ -354,34 +354,34 @@
 "e dos mapeamentos de coleções."
 
 #. Tag: para
-#: basic_mapping.xml:147
-#, no-c-format
+#: basic_mapping.xml:171
+#, fuzzy, 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."
+"literal>): specifies whether we can use unqualified class names of classes "
+"in this mapping in the query language."
 msgstr ""
 "<literal>auto-import</literal> ((opcional - default é <literal>true</"
 "literal>): Especifica se nós podemos usar nomes de classess não qualificados "
 "(das classes deste mapeamento) na linguagem de consulta."
 
 #. Tag: para
-#: basic_mapping.xml:154
-#, no-c-format
+#: basic_mapping.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<literal>package</literal> (optional): specifies a package prefix to use for "
+"unqualified class names in the mapping document."
 msgstr ""
 "<literal>package</literal> (opcional): Especifica um prefixo da package para "
 "assumir para nomes de classes não qualificadas no documento de mapeamento."
 
 #. Tag: para
-#: basic_mapping.xml:162
-#, no-c-format
+#: basic_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "Se voce tem duas classes persistentes com o mesmo nome (não qualificadas), "
 "você deve setar <literal>auto-import=\"false\"</literal>. O Hibernate irá "
@@ -389,14 +389,14 @@
 "\"importado\"."
 
 #. Tag: para
-#: basic_mapping.xml:168
-#, no-c-format
+#: basic_mapping.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -410,23 +410,23 @@
 "estiver usando herança, <literal>Animal.hbm.xml</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:181
-#, no-c-format
-msgid "<title>class</title>"
-msgstr ""
+#: basic_mapping.xml:205
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:183
-#, no-c-format
+#: basic_mapping.xml:207
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr ""
 "Você pode declarar uma classe persistente utilizando o elemento "
 "<literal>class</literal>:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:211
+#: basic_mapping.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[<class\n"
@@ -456,11 +456,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:214
-#, no-c-format
+#: basic_mapping.xml:238
+#, fuzzy, 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 "
+"<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> (opcional): O nome da classe Java inteiramente "
@@ -468,22 +468,22 @@
 "assume-se que o mapeamento é para intidades não-POJO."
 
 #. Tag: para
-#: basic_mapping.xml:221
-#, no-c-format
+#: basic_mapping.xml:245
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (opcional – default para nomes de classes não "
 "qualificadas) O nome da sua tabela do banco de dados."
 
 #. Tag: para
-#: basic_mapping.xml:227
-#, no-c-format
+#: basic_mapping.xml:251
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (opcional – default para o nome da "
@@ -492,20 +492,20 @@
 "<literal>not null</literal>"
 
 #. Tag: para
-#: basic_mapping.xml:234
-#, no-c-format
+#: basic_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
+"specifies that instances of the class are (not) mutable."
 msgstr ""
 "<literal>mutable</literal> (opcional - valor default <literal>true</"
 "literal>): Especifica que instancias da classe são (ou não) mutáveis"
 
 #. Tag: para
-#: basic_mapping.xml:240 basic_mapping.xml:2204
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -517,10 +517,10 @@
 "especificado pelo elemento raiz <literal>&lt;hibernate-mapping&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:246 basic_mapping.xml:2210
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -532,23 +532,23 @@
 "especificado pelo elemento raiz<literal>&lt;hibernate-mapping&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:252
-#, no-c-format
+#: basic_mapping.xml:276
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (opcional): Especifica um interface para ser "
 "utilizada pelos proxies de inicialização tardia. Você pode especificar o "
 "nome da própria classe."
 
 #. Tag: para
-#: basic_mapping.xml:258
-#, no-c-format
+#: basic_mapping.xml:282
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (opcional, valor default <literal>false</"
 "literal>): Especifica que o SQL de <literal>UPDATE</literal> deve ser gerado "
@@ -556,11 +556,11 @@
 "alterados."
 
 #. Tag: para
-#: basic_mapping.xml:265
-#, no-c-format
+#: basic_mapping.xml:289
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (opcional, valor default <literal>false</"
@@ -569,17 +569,16 @@
 "nulos."
 
 #. Tag: para
-#: basic_mapping.xml:272
-#, no-c-format
+#: basic_mapping.xml:296
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (opcional, valor default "
 "<literal>false</literal>): Especifica que o Hibernate <emphasis>never</"
@@ -592,11 +591,11 @@
 "momento."
 
 #. Tag: para
-#: basic_mapping.xml:282
-#, no-c-format
+#: basic_mapping.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "<literal>polymorphism</literal> (opcional, default para <literal>implicit</"
@@ -604,67 +603,69 @@
 "explicitamente."
 
 #. Tag: para
-#: basic_mapping.xml:288
-#, no-c-format
+#: basic_mapping.xml:312
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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> (opicional) especifica um comando SQL "
 "<literal>WHERE</literal> arbitrário para ser usado quando da recuperação de "
 "objetos desta classe."
 
 #. Tag: para
-#: basic_mapping.xml:294
-#, no-c-format
+#: basic_mapping.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (opcional): Espeicifca uma "
 "<literal>ClassPersister</literal> customizada."
 
 #. Tag: para
-#: basic_mapping.xml:299
-#, no-c-format
+#: basic_mapping.xml:323
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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> (opcional, valor default <literal>1</literal>) "
 "especifica um \"tamanho de lote\" para a recuperação de instancias desta "
 "classe pelo identificador."
 
 #. Tag: para
-#: basic_mapping.xml:305
-#, no-c-format
+#: basic_mapping.xml:329
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock</literal> (octional, valor default "
 "<literal>version</literal>): Determina a estratégia de bloqueio."
 
 #. Tag: para
-#: basic_mapping.xml:311
-#, no-c-format
+#: basic_mapping.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<literal>lazy</literal> (optional): lazy fetching can be disabled by setting "
+"<literal>lazy=\"false\"</literal>."
 msgstr ""
 "<literal>lazy</literal> (opcional): A recuperação tardia pode ser "
 "completamente desabilitada, setando <literal>lazy=\"false\"</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:317
-#, no-c-format
+#: basic_mapping.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal> (opcional, default para o nome da classe): O "
 "Hibernate3 permite uma classe ser mapeada multiplas vezes, (potencialmente,"
@@ -675,10 +676,10 @@
 "para maiores informações."
 
 #. Tag: para
-#: basic_mapping.xml:327
-#, no-c-format
+#: basic_mapping.xml:351
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -687,14 +688,14 @@
 "a geração automática do esquema."
 
 #. Tag: para
-#: basic_mapping.xml:333
-#, no-c-format
+#: basic_mapping.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (opcional): O Hibernate poder usar as assim "
 "chamadas ROWIDs em bancos de dados que a suportam. Por exemplo, no Oracle, o "
@@ -704,12 +705,12 @@
 "uma determinada tupla armazenado."
 
 #. Tag: para
-#: basic_mapping.xml:341
-#, no-c-format
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (optional): Maps an immutable and read-only "
 "entity to a database subselect. Useful if you want to have a view instead of "
@@ -719,24 +720,24 @@
 "uma tabela. Veja abaixo para mais informações."
 
 #. Tag: para
-#: basic_mapping.xml:348
-#, no-c-format
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (opcional): Utilizada para marcar superclasses "
 "abstratas em hierarquias <literal>&lt;union-subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:356
-#, no-c-format
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "É perfeitamente aceitável para uma classe persitente nomeada ser uma "
 "interface. Você deverá então declarar as classes implementadas desta "
@@ -746,10 +747,10 @@
 "<literal>eg.Foo$Bar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:363
-#, no-c-format
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -758,14 +759,14 @@
 "alguns aperfeiçoamentos de performance."
 
 #. Tag: para
-#: basic_mapping.xml:368
-#, no-c-format
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "O atributo opcional <literal>proxy</literal> habilita a inicialização tardia "
 "das instâncias persistentes da classe. O Hibernate irá retornar CGLIB "
@@ -774,22 +775,22 @@
 "coleções e proxies\" abaixo."
 
 #. Tag: para
-#: basic_mapping.xml:375
-#, no-c-format
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "Polimorfismo <emphasis>implícito</emphasis> significa que instâncias de uma "
 "classe serão retornada por uma query que dá nome a qualquer superclasse ou "
@@ -806,17 +807,17 @@
 "classe \"peso leve\" que contem um subconjunto de colunas da tabela)."
 
 #. Tag: para
-#: basic_mapping.xml:387
-#, no-c-format
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "O atributo <literal>persister</literal> deixa você customizar a estratégia "
 "de persistência utilizada para a classe. Você pode, por exemplo, especificar "
@@ -829,15 +830,14 @@
 "\"persistencia\" para uma <literal>Hashtable</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:398
-#, no-c-format
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "Observe que as configurações <literal>dynamic-update</literal> e "
 "<literal>dynamic-insert</literal> não sao herdadas pelas subclasses e assim "
@@ -847,12 +847,12 @@
 "a performance em outras. Use-as de forma bastante criteriosa."
 
 #. Tag: para
-#: basic_mapping.xml:406
-#, no-c-format
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "O uso de <literal>select-before-update</literal> geralmente irá diminuir a "
@@ -861,7 +861,7 @@
 "de uma instancia desconectada em uma <literal>Session</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:412
+#: basic_mapping.xml:435
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -871,42 +871,41 @@
 "estratégia de bloqueio otimista:"
 
 #. Tag: para
-#: basic_mapping.xml:418
-#, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr "<literal>version</literal> verifica a versão e a hora das colunas"
 
 #. Tag: para
-#: basic_mapping.xml:423
-#, no-c-format
-msgid "<literal>all</literal> check all columns"
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all</literal> cverifica todas as colunas"
 
 #. Tag: para
-#: basic_mapping.xml:428
-#, no-c-format
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr ""
 "<literal>dirty</literal> verifica as colunas modificadas, permitindo alguns "
 "updates concorrentes"
 
 #. Tag: para
-#: basic_mapping.xml:433
-#, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none</literal> não utiliza o bloqueio otimista"
 
 #. Tag: para
-#: basic_mapping.xml:438
-#, no-c-format
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "Nós <emphasis>recomendamos</emphasis> com muita enfase que você utilize a "
 "versão e a hora das colunas para o bloqueio otimista com o Hibernate. Esta é "
@@ -915,15 +914,15 @@
 "(por exemplo, quando <literal>Session.merge()</literal> é utilizado)."
 
 #. Tag: para
-#: basic_mapping.xml:445
-#, no-c-format
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "Não ha diferença entre uma view e uma tabela para o mapeamento do Hibernate, "
 "e como esperado isto é transparente no nível do banco de dados (observe que "
@@ -934,7 +933,7 @@
 "expressão SQL, que representa um subselect:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:453
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -952,13 +951,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:455
-#, no-c-format
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "Declare as tabelas para sincronizar com esta entidade, garantindo que o auto-"
 "flush ocorra corretamente, e que as queries para esta entidade derivada não "
@@ -966,13 +965,13 @@
 "disponível tanto como um atributo como um elemento mapeado nested."
 
 #. Tag: title
-#: basic_mapping.xml:465
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:467
+#: basic_mapping.xml:490
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -988,7 +987,7 @@
 "desta propriedade para a chave primária."
 
 #. Tag: programlisting
-#: basic_mapping.xml:482
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -1004,38 +1003,38 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:485
-#, no-c-format
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr "<literal>name</literal> (opcional): O nome do identificador."
 
 #. Tag: para
-#: basic_mapping.xml:490
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
 msgstr ""
-"<literal>type</literal> (opcional): Um nome que indica o tipo no Hibernate."
+"<literal>type</literal> (opcional): um nome que indica o tipo Hibernate."
 
 #. Tag: para
-#: basic_mapping.xml:495
-#, no-c-format
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr ""
 "<literal>column</literal> (opcional – default para o a propridade name): O "
 "nome coluna chave primaria."
 
 #. Tag: para
-#: basic_mapping.xml:501
-#, no-c-format
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional - default para um valor \"sensível"
 "\"): Uma propriedade de identificação que indica que a instancia foi "
@@ -1043,13 +1042,11 @@
 "que foram salvas ou carregadas em uma sessão anterior."
 
 #. Tag: para
-#: basic_mapping.xml:509 basic_mapping.xml:1017 basic_mapping.xml:1156
-#: basic_mapping.xml:1238 basic_mapping.xml:1345 basic_mapping.xml:1534
-#: basic_mapping.xml:1708 basic_mapping.xml:1878 basic_mapping.xml:2457
+#: basic_mapping.xml:532
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1090,7 +1087,7 @@
 "propriedade."
 
 #. Tag: para
-#: basic_mapping.xml:517
+#: basic_mapping.xml:540
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1100,7 +1097,7 @@
 "classe não tem a propriedade de identificação."
 
 #. Tag: para
-#: basic_mapping.xml:522
+#: basic_mapping.xml:545
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1110,25 +1107,25 @@
 "Hibernate 3."
 
 #. Tag: para
-#: basic_mapping.xml:526
-#, no-c-format
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "Há declaração alternativa <literal>&lt;composite-id&gt;</literal> permite o "
 "acesso a dados legados com chaves compostas. Nós desencorajamos fortemente o "
 "seu uso por qualquer pessoa."
 
 #. Tag: title
-#: basic_mapping.xml:532
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:534
+#: basic_mapping.xml:557
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1144,7 +1141,7 @@
 "<literal>&lt;param&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:541
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1156,14 +1153,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:543
+#: basic_mapping.xml:566
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "Todos os generators implementam a interface <literal>org.hibernate.id."
 "IdentifierGenerator</literal>. Esta é uma interface bem simples; algumas "
@@ -1173,13 +1170,13 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:551
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:553
+#: basic_mapping.xml:576
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1193,13 +1190,13 @@
 "ambientes de cluster.</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:562
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:564
+#: basic_mapping.xml:587
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1211,13 +1208,13 @@
 "<literal>short</literal> ou <literal>int</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:572
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:574
+#: basic_mapping.xml:597
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1229,13 +1226,13 @@
 "literal>, <literal>short</literal> ou <literal>int</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:582
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:584
+#: basic_mapping.xml:607
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1253,13 +1250,13 @@
 "únicos apenas para um banco de dados particular."
 
 #. Tag: literal
-#: basic_mapping.xml:594
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:596
+#: basic_mapping.xml:619
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1271,47 +1268,47 @@
 "literal>, a partir de uma sequence de banco de dados fornecida."
 
 #. Tag: literal
-#: basic_mapping.xml:604
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:606
-#, no-c-format
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "utiliza um algortimo UUID de 128-bits para gerar identificadores do tipo "
 "string, unicos em uma rede(o endereço IP é utilizado). O UUID é codificado "
 "como um string de digitos hexadecimais de tamanho 32."
 
 #. Tag: literal
-#: basic_mapping.xml:614
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:616
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr ""
 "utiliza um string GUID gerado pelo banco de dados no MS SQL Server e MySQL."
 
 #. Tag: literal
-#: basic_mapping.xml:622
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:624
-#, no-c-format
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1320,51 +1317,51 @@
 "utilizado."
 
 #. Tag: literal
-#: basic_mapping.xml:632
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:634
-#, no-c-format
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "deixa a aplicação definir um identificador para o objeto antes que o "
 "<literal>save()</literal> seja chamado. Esta é a estratégia default se "
 "nenhum elemento <literal>&lt;generator&gt;</literal> é especificado."
 
 #. Tag: literal
-#: basic_mapping.xml:642
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:644
-#, no-c-format
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr ""
 "retorna a chave primaria recuperada por uma trigger do banco de dados, "
 "selecionado uma linha pela chave única e recuperando o valor da chave "
 "primária."
 
 #. Tag: literal
-#: basic_mapping.xml:651
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:653
-#, no-c-format
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1373,21 +1370,21 @@
 "one&gt;</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:660
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:662
-#, no-c-format
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "a specialized sequence generation strategy which utilizes a database "
 "sequence for the actual value generation, but combines this with JDBC3 "
@@ -1397,20 +1394,20 @@
 "these insert statements are disabled due to a bug in the Oracle drivers."
 
 #. Tag: title
-#: basic_mapping.xml:679
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "Algoritmo Hi/lo"
 
 #. Tag: para
-#: basic_mapping.xml:680
-#, no-c-format
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "Os geradores <literal>hilo</literal> e <literal>seqhilo</literal> fornecem "
 "duas implementações alternativas do algoritmo hi/lo, uma solução "
@@ -1420,7 +1417,7 @@
 "suportado)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:687
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1433,7 +1430,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:689
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1445,14 +1442,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:691
-#, no-c-format
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "Infelizemente, voce não pode utilizar <literal>hilo</literal> quando estiver "
 "fornecendo sia propria <literal>Connection</literal> para o Hibernate. "
@@ -1461,19 +1458,19 @@
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:700
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID algorithm"
 
 #. Tag: para
-#: basic_mapping.xml:701
-#, no-c-format
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "O UUID contem: o endereço IP, hora de inicio da JVM (com precisão de um "
 "quarto de segundo), a hora do sistema e um valor contador (unico dentro da "
@@ -1481,20 +1478,20 @@
 "código Java, assim este é o melhor que pode ser feito sem utilizar JNI."
 
 #. Tag: title
-#: basic_mapping.xml:710
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "Colunas de identidade e sequencias"
 
 #. Tag: para
-#: basic_mapping.xml:711
-#, no-c-format
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "Para bancos de dados que suportam colunas de identidade (DB2, MySQL, Sybase, "
 "MS SQL), você pode utilizar uma geração de chave <literal>identity</"
@@ -1504,7 +1501,7 @@
 "consultas SQL para inserir um novo objeto."
 
 #. Tag: programlisting
-#: basic_mapping.xml:719
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1515,7 +1512,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:721
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1525,13 +1522,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:723
-#, no-c-format
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "Para desenvolvimento multi-plataforma, a estratégia <literal>native</"
 "literal> irá escolher entre as estratégias i <literal>identity</literal>, "
@@ -1539,21 +1536,21 @@
 "capacidades do banco de dados utilizado."
 
 #. Tag: title
-#: basic_mapping.xml:732
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "Identificadores especificados"
 
 #. Tag: para
-#: basic_mapping.xml:733
-#, no-c-format
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "Se você quer que a aplicação especifique os identificadores (em vez do "
@@ -1565,12 +1562,12 @@
 "<literal>&lt;generator&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:742
-#, no-c-format
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1581,20 +1578,20 @@
 "você pode definir <literal>Interceptor.isUnsaved()</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:752
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "Chaves primárias geradas por triggers"
 
 #. Tag: para
-#: basic_mapping.xml:753
-#, no-c-format
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr "Apenas para sistemas legados (o Hibernate nao gera DDL com triggers)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:757
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1605,13 +1602,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:759
-#, no-c-format
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "No exemplo acima, há uma única propriedade com valor nomeada "
 "<literal>socialSecurityNumber</literal> definida pela classe, uma chave "
@@ -1619,22 +1616,22 @@
 "é gerado pro uma trigger."
 
 #. Tag: title
-#: basic_mapping.xml:771
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:773
-#, no-c-format
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1645,24 +1642,25 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:781
+#: basic_mapping.xml:803
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1682,24 +1680,24 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:795
-#, no-c-format
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:801
-#, no-c-format
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1708,13 +1706,13 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:808
-#, no-c-format
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
@@ -1722,11 +1720,11 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:815
-#, no-c-format
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1734,40 +1732,40 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:822
-#, no-c-format
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:829
+#: basic_mapping.xml:851
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>cascade</literal> (opcional – valor default <literal>none</"
 "literal>): o estilo do cascade."
 
 #. Tag: para
-#: basic_mapping.xml:836
+#: basic_mapping.xml:858
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1782,21 +1780,21 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:846
-#, no-c-format
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:852
-#, no-c-format
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1804,13 +1802,13 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:858
-#, no-c-format
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
@@ -1818,10 +1816,10 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:865
-#, no-c-format
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1830,63 +1828,64 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:872
-#, no-c-format
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:878
-#, no-c-format
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:884
-#, no-c-format
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:890
+#: basic_mapping.xml:912
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>cascade</literal> (opcional – valor default <literal>none</"
 "literal>): o estilo do cascade."
 
 #. Tag: title
-#: basic_mapping.xml:900
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:901
+#: basic_mapping.xml:923
 #, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1897,11 +1896,11 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:909
-#, no-c-format
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1909,13 +1908,13 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:915
-#, no-c-format
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1927,15 +1926,15 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:924
-#, no-c-format
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1945,13 +1944,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:937
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:939
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1970,10 +1969,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:941
-#, no-c-format
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1985,7 +1984,7 @@
 "literal>como elements filhos."
 
 #. Tag: programlisting
-#: basic_mapping.xml:948
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -1995,12 +1994,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:950
-#, no-c-format
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "Sua classe persistente <emphasis>precisa</emphasis> sobre escrever "
 "<literal>equals()</literal> e <literal>hashCode()</literal> para implementar "
@@ -2008,16 +2007,16 @@
 "<literal>Serializable</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:956
-#, no-c-format
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "Infelizmente, esta solução para um identificador composto significa que um "
 "objeto persistente é seu próprio identificador. Não há outro \"handle\" que "
@@ -2029,7 +2028,7 @@
 "sérias."
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:987
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -2043,7 +2042,7 @@
 "tando na classe persistente como em uma classe de identificação separada."
 
 #. Tag: programlisting
-#: basic_mapping.xml:971
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -2053,16 +2052,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:973
-#, no-c-format
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "No exemplo, ambas as classes de identificação compostas, "
 "<literal>MedicareId</literal>, e a própria classe entidade tem propriedades "
@@ -2072,7 +2070,7 @@
 "A desvantagem desta solução é obvia – duplicação de código."
 
 #. Tag: para
-#: basic_mapping.xml:982
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
@@ -2081,10 +2079,10 @@
 "identificador composto:"
 
 #. Tag: para
-#: basic_mapping.xml:988
-#, no-c-format
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -2095,20 +2093,20 @@
 "classe de identificação composta."
 
 #. Tag: para
-#: basic_mapping.xml:996
-#, no-c-format
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (opcional, mas requerida para um identificar "
 "composto mapeado): A classe usada como um identificador composto."
 
 #. Tag: para
-#: basic_mapping.xml:1003
-#, no-c-format
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -2119,53 +2117,100 @@
 "se apenas para esta solução:"
 
 #. Tag: para
-#: basic_mapping.xml:1011
-#, no-c-format
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (opcional, requerida para esta solução): Uma "
 "propriedade do tipo componente que armazena o identificador composto (veja "
 "capítulo 9)"
 
 #. Tag: para
-#: basic_mapping.xml:1023
-#, no-c-format
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estratégia que o Hiberante deve utilizar para acessar o valor "
+"da propriedade\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estartégia Hibernate que deve ser utilizada para acessar o "
+"valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estratégia Hibernate que deve ser usada para acessar o valor da "
+"propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default para <literal>property</"
+"literal>): A estretagia Hibernate que deve ser utilizada para acessar o "
+"valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o Hibernate deve utilizar para acessar o valor "
+"da propriedade\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estrategia que o Hibernate deve utilizar para acessar o valor "
+"da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default padrão "
+"<literal>property</literal>): A estratégia que o Hibernate pode usar para "
+"acessar o valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o Hibernate pode usar para acessar o valor da "
+"propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o hibernate deve usar para acessar o valor da "
+"propriedade."
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (opcional - valor default para o tipo de "
 "propriedade determiando por reflexão) : A classe componente utilizada como "
 "um identificador composto (veja a próxima sessão)."
 
 #. Tag: para
-#: basic_mapping.xml:1030
-#, no-c-format
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "Esta terceira solução, um <emphasis>componente de identificação</emphasis>, "
 "é o que nós recomendamos para a maioria das aplicações."
 
 #. Tag: title
-#: basic_mapping.xml:1038
-#, no-c-format
-msgid "discriminator"
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "discriminator"
 
 #. Tag: para
-#: basic_mapping.xml:1040
-#, no-c-format
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2182,7 +2227,7 @@
 "<literal>yes_no</literal>, <literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1058
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2195,31 +2240,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1061
-#, no-c-format
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal> (opcional - valor default <literal>class</"
 "literal>) o nome da coluna discriminadora"
 
 #. Tag: para
-#: basic_mapping.xml:1067
-#, no-c-format
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (opcional - valor default <literal>string</literal>) "
 "o nome que indica o tipo Hibernate"
 
 #. Tag: para
-#: basic_mapping.xml:1073
-#, no-c-format
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force</literal> (opcional - valor default <literal>false</literal>) "
@@ -2227,13 +2272,13 @@
 "quando recuperando todas as instancias da classe root."
 
 #. Tag: para
-#: basic_mapping.xml:1080
-#, no-c-format
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (opcional - valor default para <literal>true</"
 "literal>) sete isto para <literal>false</literal> se sua coluna "
@@ -2242,11 +2287,11 @@
 "literal>s)."
 
 #. Tag: para
-#: basic_mapping.xml:1088
-#, no-c-format
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (opcional) uma expressão SQL arbitraria que é e "
@@ -2254,7 +2299,7 @@
 "em conteúdo."
 
 #. Tag: para
-#: basic_mapping.xml:1096
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2266,30 +2311,30 @@
 "elementos da <literal>&lt;subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1102
-#, no-c-format
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "O atributo <literal>force</literal> é util (apenas) em tabelas contendo "
 "linhas com valores discriminadores \"extras\" que não estão mapeados para "
 "uma classe persistente. Este não é geralmente o caso."
 
 #. Tag: para
-#: basic_mapping.xml:1108
-#, no-c-format
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "Usando o atributo <literal>formula</literal> voce pode declarar uma "
 "expressão SQL arbitrária que sera utilizada para avaliar o tipo de uma "
 "linha :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1113
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2298,25 +2343,26 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1118
-#, no-c-format
-msgid "version (optional)"
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "version (optional)"
 
 #. Tag: para
-#: basic_mapping.xml:1120
-#, no-c-format
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "O elemento <literal>&lt;version&gt;</literal> é opcional e indica que a "
 "tabela possui dados versionados. Isto é particularmente útil se você planeja "
 "utilizar <emphasis>transações longas</emphasis> (veja abaixo):"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1136
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2332,41 +2378,85 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1139
-#, no-c-format
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal> (opcional - default a a propriedade name): O nome "
 "da coluna mantendo o numero da versão"
 
 #. Tag: para
-#: basic_mapping.xml:1145
-#, no-c-format
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr "<literal>name</literal>: O nome da propriedade da classe persistente."
 
 #. Tag: para
-#: basic_mapping.xml:1150
-#, no-c-format
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (opcional - valor default para <literal>integer</"
 "literal>): O tipo do numero da versão"
 
 #. Tag: para
-#: basic_mapping.xml:1162
-#, no-c-format
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estratégia que o Hiberante deve utilizar para acessar o valor "
+"da propriedade\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estartégia Hibernate que deve ser utilizada para acessar o "
+"valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estratégia Hibernate que deve ser usada para acessar o valor da "
+"propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default para <literal>property</"
+"literal>): A estretagia Hibernate que deve ser utilizada para acessar o "
+"valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o Hibernate deve utilizar para acessar o valor "
+"da propriedade\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default <literal>property</"
+"literal>): A estrategia que o Hibernate deve utilizar para acessar o valor "
+"da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional - valor default padrão "
+"<literal>property</literal>): A estratégia que o Hibernate pode usar para "
+"acessar o valor da propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o Hibernate pode usar para acessar o valor da "
+"propriedade.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (opcional – valor default <literal>property</"
+"literal>): A estratégia que o hibernate deve usar para acessar o valor da "
+"propriedade."
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional – valor default para "
 "<literal>undefined </literal>): Um valor para a propriedade versão que "
@@ -2376,13 +2466,13 @@
 "propriedade de identificação deve ser utilizado)."
 
 #. Tag: para
-#: basic_mapping.xml:1171
-#, no-c-format
+#: basic_mapping.xml:1193
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
 "literal>): Specifies that this version property value is actually generated "
@@ -2393,13 +2483,13 @@
 "da Seção <xref linkend=\"mapping-generated\">generated properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1178
-#, no-c-format
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "<literal>insert</literal> (opcional - valor default para <literal>true</"
 "literal>): Especifica se a coluna de versão deve ser incluída no comando SQL "
@@ -2407,10 +2497,10 @@
 "banco de dados está definida com um valor default de <literal>0</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1188
-#, no-c-format
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2419,16 +2509,16 @@
 "literal> ou <literal>calendar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1193
-#, no-c-format
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "A versão de uma propriedade timestamp nunca deve ser nula para uma instancia "
 "desconectada, assim o Hibernate irá identificar qualquer instância com uma "
@@ -2440,20 +2530,19 @@
 "chaves compostas!</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1204
-#, no-c-format
-msgid "timestamp (optional)"
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp (optional)"
 
 #. Tag: para
-#: basic_mapping.xml:1206
-#, no-c-format
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "O elemento opcional <literal>&lt;timestamp&gt;</literal> indica que uma "
 "tabela contém dados timestamped. Isso tem por objetivo dar uma alternativa "
@@ -2462,7 +2551,7 @@
 "timestamps em outros caminhos."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1222
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2477,20 +2566,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1225
-#, no-c-format
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr ""
 "<literal>column</literal> (opcional - valor default para a propriedade "
 "name): O nome da coluna que mantem o timestamp."
 
 #. Tag: para
-#: basic_mapping.xml:1231
-#, no-c-format
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2499,14 +2588,14 @@
 "persistente Java."
 
 #. Tag: para
-#: basic_mapping.xml:1244
-#, no-c-format
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (opcional - valor default <literal>null</"
 "literal>): Uma propriedade para a versão de que indica que uma instância é "
@@ -2516,17 +2605,17 @@
 "utilizado)"
 
 #. Tag: para
-#: basic_mapping.xml:1253
-#, no-c-format
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "<literal>source</literal> (opcional - valor default para <literal>vm</"
 "literal>): De onde o Hibernate deve recuperar o valor timestamp? Do banco de "
@@ -2539,26 +2628,32 @@
 "8 por exemplo)"
 
 #. Tag: para
-#: basic_mapping.xml:1265
-#, no-c-format
+#: basic_mapping.xml:1287
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (opcional - valor default <literal>never</"
 "literal>): Especifica que o valor da propriedade timestamp é gerado pelo "
 "banco de dados. Veja a discussão <xref linkend=\"mapping-generated"
 "\">generated properties</xref>."
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1274
-#, no-c-format
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "Observe que <literal>&lt;timestamp&gt;</literal> é equivalente a "
@@ -2567,23 +2662,23 @@
 "type=\"dbtimestamp\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:1284
-#, no-c-format
-msgid "property"
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1286
-#, no-c-format
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "O elemento <literal>&lt;property&gt;</literal> declara uma propriedade "
 "persistente de uma classe, no estilo JavaBean."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2609,7 +2704,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1311
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2619,11 +2714,11 @@
 "minúscula."
 
 #. Tag: para
-#: basic_mapping.xml:1317
-#, no-c-format
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal> (opcional - default para a propriedade name): o "
@@ -2631,23 +2726,15 @@
 "pelo(s) elemento(s) <literal>&lt;column&gt;</literal> aninhados."
 
 #. Tag: para
-#: basic_mapping.xml:1324
-#, no-c-format
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr ""
-"<literal>type</literal> (opcional): um nome que indica o tipo Hibernate."
-
-#. Tag: para
-#: basic_mapping.xml:1329
-#, no-c-format
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (opcional - valor default <literal>true</"
 "literal>): especifica que as colunas mapeadas devem ser incluidas nas "
@@ -2657,7 +2744,7 @@
 "a mesma coluna(s) ou por uma trigger ou outra aplicação."
 
 #. Tag: para
-#: basic_mapping.xml:1338
+#: basic_mapping.xml:1365
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2669,12 +2756,12 @@
 "nao tem uma coluna de mapeamento para elas."
 
 #. Tag: para
-#: basic_mapping.xml:1351
-#, no-c-format
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (opcional - valor default para <literal>false</"
 "literal>): Especifica que esta propriedade deve ser trazida de forma \"lazy"
@@ -2682,10 +2769,10 @@
 "instrumentação bytecode em tempo de criação)."
 
 #. Tag: para
-#: basic_mapping.xml:1358
-#, no-c-format
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2694,23 +2781,23 @@
 "<literal>property-ref</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1365
-#, no-c-format
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (opcional): Habilita a geração de DDL de uma "
 "constraint de nulidade para as colunas."
 
 #. Tag: para
-#: basic_mapping.xml:1371
-#, no-c-format
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - valor default <literal>true</"
 "literal>): Especifica se mudanças para esta propriedade requerem ou não "
@@ -2718,13 +2805,13 @@
 "deve ocorrer quando esta propriedade está suja."
 
 #. Tag: para
-#: basic_mapping.xml:1379
-#, no-c-format
+#: basic_mapping.xml:1406
+#, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (opcional - valor default <literal>never</"
 "literal>): Especifica que o valor da propriedade é na verdade gerado pelo "
@@ -2732,17 +2819,17 @@
 "\">generated properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1388
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis> pode ser:"
 
 #. Tag: para
-#: basic_mapping.xml:1394
-#, no-c-format
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "The name of a Hibernate basic type (eg. <literal>integer, string, character, "
 "date, timestamp, float, binary, serializable, object, blob</literal>). O "
@@ -2750,44 +2837,44 @@
 "date, timestamp, float, binary, serializable, object, blob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1400
-#, no-c-format
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "O nome da classe Java com um tipo básico default (ex. <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
 "literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1406
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "O nome da classe Java serializable"
 
 #. Tag: para
-#: basic_mapping.xml:1411
-#, no-c-format
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "O nome da classe de um tipo customizado (ex. <literal>com.illflow.type."
 "MyCustomType</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1417
-#, no-c-format
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "Se você não especificar um tipo, o Hibernate ira utilizar reflexão sobre a "
 "propriedade nomeada para ter uma idéia do tipo Hibernate correto. O "
@@ -2799,14 +2886,14 @@
 "ciustomizado.)"
 
 #. Tag: para
-#: basic_mapping.xml:1427
-#, no-c-format
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2820,14 +2907,13 @@
 "literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1436
-#, no-c-format
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "Um recurso especialmente poderoso é o de propriedades derivadas. Estas "
 "propriedades são por definição read-only, e o valor da propriedade é "
@@ -2836,7 +2922,7 @@
 "daquery SQL que carrega a instancia:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1443
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2849,13 +2935,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1445
-#, no-c-format
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "Observe que você pode referenciar as entidades da própria tabela, através da "
 "não declaração de um alias para uma coluna particular ( <literal>customerId</"
@@ -2864,18 +2950,18 @@
 "usar o atributo."
 
 #. Tag: title
-#: basic_mapping.xml:1455
-#, no-c-format
-msgid "many-to-one"
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "many-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1457
-#, no-c-format
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "Uma associação ordinária para outra classe persistente é declarada usando o "
@@ -2884,7 +2970,7 @@
 "a chave primaria da tabela destino."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1485
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2913,17 +2999,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1488 basic_mapping.xml:1669 basic_mapping.xml:1855
-#, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the name of the property."
 msgstr "<literal>name</literal>: O nome da propriedade."
 
 #. Tag: para
-#: basic_mapping.xml:1493 basic_mapping.xml:2284
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2936,11 +3022,11 @@
 "(s) <literal>&lt;column&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1500 basic_mapping.xml:1674
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>class</literal> (opcional – default para o tipo de propriedade "
@@ -2950,21 +3036,21 @@
 "definido via reflection): O nome da classe associada."
 
 #. Tag: para
-#: basic_mapping.xml:1506
-#, no-c-format
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade</literal> (opcional): Especifica quais operações dever ser "
-"em cascata do objeto pai para o objeto associado."
+"<literal>cascade</literal> (opcional): Especifica qual operação deve ser "
+"cascateada do objeto pai para o objeto associado."
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1695
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>fetch</literal> (opcional - default para <literal>select</"
@@ -2974,15 +3060,15 @@
 "literal>): Escolhe entre outer-join fetching ou sequential select fetching."
 
 #. Tag: para
-#: basic_mapping.xml:1518
-#, no-c-format
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (opcional - valor default <literal>true</"
 "literal>): especifica que as colunas mapeadas dever ser incluidas em "
@@ -2993,10 +3079,10 @@
 "aplicação."
 
 #. Tag: para
-#: basic_mapping.xml:1527
-#, no-c-format
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -3005,13 +3091,13 @@
 "primaria da classe associada será utilizada."
 
 #. Tag: para
-#: basic_mapping.xml:1540
-#, no-c-format
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal> (opcional): Habilita a geração DDL de uma "
 "constraint unique para a coluna foreign-key. Alem disso, permite ser o alvo "
@@ -3019,38 +3105,24 @@
 "efetivamente um para um."
 
 #. Tag: para
-#: basic_mapping.xml:1548
-#, no-c-format
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (opcional): Habilita a geração DDL de uma "
 "constraint de nulidade para as foreign keys."
 
 #. Tag: para
-#: basic_mapping.xml:1554
-#, no-c-format
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (opcional - valor default <literal>true</"
-"literal>): Especifica se mudanças desta propriedade requerem ou não "
-"travamento otimista. Em outras palavras, determina se um incremento de "
-"versão deve ocorrer quando esta propriedade está suja."
-
-#. Tag: para
-#: basic_mapping.xml:1562
-#, no-c-format
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal>(opcional – valor default <literal>proxy</literal>): "
@@ -3062,12 +3134,12 @@
 "recuperada fortemente."
 
 #. Tag: para
-#: basic_mapping.xml:1572
-#, no-c-format
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (opcional - valor default <literal>exception</"
@@ -3076,17 +3148,17 @@
 "ama associaççao de null"
 
 #. Tag: para
-#: basic_mapping.xml:1579 basic_mapping.xml:1733
-#, no-c-format
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr ""
 "<literal>entity-name</literal> (opcional): O nome da entidade da classe "
 "associada."
 
 #. Tag: para
-#: basic_mapping.xml:1585
+#: basic_mapping.xml:1611
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -3096,20 +3168,20 @@
 "para um foreign key <emphasis>computed</emphasis>."
 
 #. Tag: para
-#: basic_mapping.xml:1592
-#, no-c-format
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "Setar o valor do atributo <literal>cascade</literal> para qualquer valor "
 "significativo diferente de <literal>none</literal> irá propagar certas "
@@ -3124,15 +3196,15 @@
 "simples (associações muitos-pra-um, e um-pra-um) não suportam orphan delete."
 
 #. Tag: para
-#: basic_mapping.xml:1605
-#, no-c-format
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr ""
 "Uma típica declaração <literal>muitos-pra-um</literal> se parece com esta:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1609
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -3140,16 +3212,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1611
-#, no-c-format
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "O atributo <literal>property-ref</literal> deve apenas ser usado para mapear "
 "dados legados onde uma chave estrangeira se referencia a uma chave exclusiva "
@@ -3160,7 +3232,7 @@
 "com a ferramenta SchemaExport.)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1620
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -3168,13 +3240,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1622
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr "Então o mapeamento para <literal>OrderItem</literal> poderia usar:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1626
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -3182,13 +3254,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1628
-#, no-c-format
-msgid "This is certainly not encouraged, however."
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "Porém, isto obviamente não é indicado, nunca."
 
 #. Tag: para
-#: basic_mapping.xml:1632
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3200,17 +3272,17 @@
 "elemento chamado <literal>&lt;properties&gt;</literal>"
 
 #. Tag: para
-#: basic_mapping.xml:1637
-#, no-c-format
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr ""
 "Se a chave exclusiva referenciada é a propriedade de um componente, você "
 "pode especificar um caminho para a propriedade."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1641
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3218,13 +3290,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1646
-#, no-c-format
-msgid "one-to-one"
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "one-to-one (um-pra-um)"
 
 #. Tag: para
-#: basic_mapping.xml:1648
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3234,7 +3306,7 @@
 "elemento <literal>one-to-one </literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1666
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3255,26 +3327,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1680
-#, no-c-format
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>cascade</literal> (opcional): Especifica qual operação deve ser "
-"cascateada do objeto pai para o objeto associado."
-
-#. Tag: para
-#: basic_mapping.xml:1686
-#, no-c-format
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>constrained</literal> (opcional): Especifica que uma chave "
 "estrangeira constraint na chave primária da tabela mapeada referencia a "
 "tabela da classe associada, Esta opção afeta a ordem em queh <literal>save()"
@@ -3283,10 +3345,10 @@
 "export)."
 
 #. Tag: para
-#: basic_mapping.xml:1701
-#, no-c-format
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3295,14 +3357,14 @@
 "especificada, a chave primária da classe associada é utilizada."
 
 #. Tag: para
-#: basic_mapping.xml:1714
-#, no-c-format
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>formula</literal> (opcional): Quase todas associações um-pra-um "
 "mapeiam para a chave primária da entidade dona. No caso raro, que não é o "
@@ -3311,17 +3373,17 @@
 "onetooneformula</literal> para exemplo)."
 
 #. Tag: para
-#: basic_mapping.xml:1722
-#, no-c-format
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>lazy</literal> (opcional – valor default <literal>proxy</literal>): "
 "Por default, associações single point são proxied. <literal>lazy=\"no-proxy"
@@ -3333,32 +3395,31 @@
 "vai ávido fetch a associação!</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1740
-#, no-c-format
-msgid "There are two varieties of one-to-one association:"
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "Existem duas variedades de associações um-pra-um:"
 
 #. Tag: para
-#: basic_mapping.xml:1744
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "primary key associations"
 msgstr "associações de chave primária"
 
 #. Tag: para
-#: basic_mapping.xml:1747
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr "associações de chave estrangeira exclusiva"
 
 #. Tag: para
-#: basic_mapping.xml:1752
-#, no-c-format
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "Associações de chave primária não necessitam de uma coluna extra de tabela; "
 "se duas linhas são relacionadas pela associação então as duas linhas da "
@@ -3367,23 +3428,23 @@
 "ter certeza que eles são assinados com o mesmo valor identificador!"
 
 #. Tag: para
-#: basic_mapping.xml:1759
-#, no-c-format
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "Para uma associação de chave primária, adicione os seguintes mapeamentos em "
 "<literal>Employee</literal> e <literal>Person</literal>, respectivamente."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1765
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3391,19 +3452,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1767
-#, no-c-format
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "Agora nós devemos assegurar que as chaves primárias de linhas relacionadas "
 "nas tabelas PERSON e EMPLOYEE são iguais. Nós usamos uma estratégia especial "
 "de geração de identificador do Hibernate chamada <literal>foreign</literal>:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1773
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3420,13 +3481,12 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1775
-#, no-c-format
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "Uma nova instância de <literal>Person</literal> salva recentemente é então "
 "assinada com o mesmo valor da chave primária da instância de "
@@ -3434,11 +3494,11 @@
 "<literal>employee</literal> daquela <literal>Person</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1781
-#, no-c-format
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "Alternativamente, uma chave estrangeira com uma unique constraint, de "
@@ -3446,7 +3506,7 @@
 "expressa como:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1786
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3454,17 +3514,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1788
-#, no-c-format
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr ""
 "E esta associação pode ser feita de forma bi-direcional adicionando o "
 "seguinte no mapeamento de <literal>Person</literal>:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1793
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3472,13 +3532,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1798
-#, no-c-format
-msgid "natural-id"
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr "natural-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1800
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3489,15 +3549,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1802
-#, no-c-format
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "Embora nós recomendemos o uso de surrogate keys como chaves primárias, você "
@@ -3509,10 +3569,10 @@
 "nullability , e seu mapeamento será apropriadamente auto documentado."
 
 #. Tag: para
-#: basic_mapping.xml:1811
-#, no-c-format
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3521,40 +3581,41 @@
 "natural da entidade."
 
 #. Tag: para
-#: basic_mapping.xml:1816
-#, no-c-format
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr ""
 "Este mapeamento não tem o objetivo de uso com entidades com natural chaves "
 "primárias."
 
 #. Tag: para
-#: basic_mapping.xml:1822
-#, no-c-format
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr ""
 "<literal>mutable</literal> mutable (opcional, valor default<literal>false</"
 "literal>): Por default, propriedades naturais identificadoras são "
 "consideradas imutáveis (constante)."
 
 #. Tag: title
-#: basic_mapping.xml:1832
-#, no-c-format
-msgid "component, dynamic-component"
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr "componente, componente dinâmico"
 
 #. Tag: para
-#: basic_mapping.xml:1834
-#, no-c-format
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr ""
 "O elemento<literal>&lt;component&gt;</literal> mapeia propriedades de um "
 "objeto filho para colunas da tabela de uma classe pai. Componentes podem, um "
@@ -3562,7 +3623,7 @@
 "Veja \"Components\" abaixo."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1852
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3584,55 +3645,55 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1860
-#, no-c-format
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>class</literal> (opcional – valor default para o tipo de "
 "propriedade determinada por reflection): O nome da classe (filha) do "
 "componente."
 
 #. Tag: para
-#: basic_mapping.xml:1866 basic_mapping.xml:1955
-#, no-c-format
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "<literal>insert</literal>: As colunas mapeadas aparecem nos SQL de "
 "<literal>INSERT</literal>s?"
 
 #. Tag: para
-#: basic_mapping.xml:1872 basic_mapping.xml:1961
-#, no-c-format
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "<literal>update</literal>: As colunas mapeadas aparecem nos SQL de "
 "<literal>UPDATE</literal>s?"
 
 #. Tag: para
-#: basic_mapping.xml:1884
-#, no-c-format
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (opcional - valor default <literal>false</literal>): "
 "Especifica que este componente deve ser fetched lazily quando o atributo for "
 "acessado pela primeira vez (requer build-time bytecode instrumentation)."
 
 #. Tag: para
-#: basic_mapping.xml:1891
-#, no-c-format
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional – valor default <literal>true</"
@@ -3641,11 +3702,11 @@
 "de incremento deve ocorrer quando esta propriedade estiver modificada."
 
 #. Tag: para
-#: basic_mapping.xml:1899 basic_mapping.xml:1975
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
 #, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -3658,7 +3719,7 @@
 "mapeadas do componente."
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3668,7 +3729,7 @@
 "mapeamento da classe filha para colunas de uma tabela."
 
 #. Tag: para
-#: basic_mapping.xml:1913
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3680,12 +3741,13 @@
 "componente como uma referencia de volta para a entidade que o contém."
 
 #. Tag: para
-#: basic_mapping.xml:1919
-#, no-c-format
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr ""
 "O elemento <literal>&lt;dynamic-component&gt;</literal> permite que um "
 "<literal>Map</literal> possa ser mapeado como um componente onde os nomes "
@@ -3693,20 +3755,20 @@
 "\"components-dynamic\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:1928
-#, no-c-format
-msgid "properties"
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr "propriedades"
 
 #. Tag: para
-#: basic_mapping.xml:1930
-#, no-c-format
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "O elemento <literal>&lt;properties&gt;</literal> permite a definição de um "
 "grupo com nome, lógico de propriedades de uma classe. O uso mais importante "
@@ -3715,7 +3777,7 @@
 "conveninente para definir uma unique constraint de múltiplas colunas."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1946
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3733,22 +3795,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1949
-#, no-c-format
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>name</literal>:: O nome lógico do agrupamento – <emphasis>não </"
 "emphasis> é o nome atual de propriedade."
 
 #. Tag: para
-#: basic_mapping.xml:1967
-#, no-c-format
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional – valor default <literal>true</"
@@ -3758,7 +3820,7 @@
 "modificadas."
 
 #. Tag: para
-#: basic_mapping.xml:1984
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3768,11 +3830,12 @@
 "properties&gt;</literal>:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1988
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3784,18 +3847,18 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1990
-#, no-c-format
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "Então nós podemos ter uma associação de dados herdados que referem a esta "
 "chave exclusiva da tabela <literal>Person</literal>, ao invés de se "
 "referirem a chave primária:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1995
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3807,28 +3870,28 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1997
-#, no-c-format
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr ""
 "Nós não recomendamos o uso deste tipo de coisa fora do contexto de "
 "mapeamento de dados herdados."
 
 #. Tag: title
-#: basic_mapping.xml:2005
-#, no-c-format
-msgid "subclass"
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr "subclass (subclasse)"
 
 #. Tag: para
-#: basic_mapping.xml:2007
-#, no-c-format
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 "Finalmente, a persistência polimórfica requer a declaração de cada subclasse "
 "da classe de persistência raiz. Para a estratégia de mapeamento table-per-"
@@ -3836,7 +3899,7 @@
 "usada."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2020
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3856,10 +3919,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2023 basic_mapping.xml:2081 basic_mapping.xml:2144
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
 #, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>name</literal>: O nome de classe completamente qualificada da "
@@ -3871,21 +3934,21 @@
 "<literal>name</literal>: O nome da subclasse completamente qualificada."
 
 #. Tag: para
-#: basic_mapping.xml:2028
-#, no-c-format
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>discriminator-value</literal> (opcional – valor default o nome da "
 "classe): Um valor que distingue subclasses individuais."
 
 #. Tag: para
-#: basic_mapping.xml:2034 basic_mapping.xml:2091 basic_mapping.xml:2154
+#: basic_mapping.xml:2061
 #, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>proxy</literal> (opcional): Especifica a classe ou interface que "
@@ -3900,11 +3963,11 @@
 "atrasada."
 
 #. Tag: para
-#: basic_mapping.xml:2040 basic_mapping.xml:2097 basic_mapping.xml:2160
+#: basic_mapping.xml:2067
 #, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>lazy</literal> (opcional, valor default <literal>true</literal>): "
@@ -3922,14 +3985,14 @@
 "atrasada."
 
 #. Tag: para
-#: basic_mapping.xml:2048
-#, no-c-format
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "Cada subclasse deve declarar suas próprias propriedades persistentes e "
 "subclasses. As propriedades <literal>&lt;version&gt;</literal> e "
@@ -3939,11 +4002,11 @@
 "da classe Java completamente qualificada será usada."
 
 #. Tag: para
-#: basic_mapping.xml:2056 basic_mapping.xml:2114 basic_mapping.xml:2172
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
 #, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "Para informações sobre mapeamento de heranças, veja o <xref linkend="
@@ -3956,19 +4019,19 @@
 "\"inheritance\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:2063
-#, no-c-format
-msgid "joined-subclass"
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "joined-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2065
-#, no-c-format
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "Alternativamente, cada subclasse pode ser mapeada para sua própria tabela "
 "(Estratégia de mapeamento table-per-subclass). O estado herdado é devolvido "
@@ -3976,7 +4039,7 @@
 "<literal>&lt;joined-subclass&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2078
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -4002,27 +4065,68 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2086 basic_mapping.xml:2149
-#, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr "<literal>table</literal>: O nome da tabela da subclasse."
 
 #. Tag: para
-#: basic_mapping.xml:2105
-#, no-c-format
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (opcional): Especifica a classe ou interface que "
+"usará os proxies de inicialização atrasada.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (opcional): Especifica a classe ou interface para "
+"usar os proxies de recuperação atrasada.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (optional): Specifies a class or interface to use "
+"for lazy initializing proxies. <literal>proxy</literal> (opcional): "
+"Especifica a classe ou interface para usar os proxies de recuperação "
+"atrasada."
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (opcional, valor default <literal>true</literal>): "
+"Configurar <literal>lazy=\"false\"</literal> desabilitará o uso de "
+"inicialização atrasada.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (opcional, valor default <literal>true</literal>): "
+"Fixanr <literal>lazy=\"false\"</literal> desabilita o uso recuperação "
+"atrasada.\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching. "
+"<literal>lazy</literal> (opcional, valor default p<literal>true</literal>): "
+"Fixando <literal>lazy=\"false\"</literal> desabilita o uso da recuperação "
+"atrasada."
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "A coluna discriminator requerida para esta estratégia de mapeamento. Porém, "
 "cada subclasse deve declarar uma coluna de tabela com o identificador do "
 "objeto usando o elemento <literal>&lt;key&gt;</literal>. O mapeamento no "
 "início do capítulo poderia ser re-escrito assim:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2112
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -4060,24 +4164,24 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2121
-#, no-c-format
-msgid "union-subclass"
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "union-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2123
-#, no-c-format
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "Uma terceira opção é mapear para tabelas apenas as classes concretas de uma "
 "hierarquia de heranças, (a estratégia table-per-concrete-class) onde cada "
@@ -4090,7 +4194,7 @@
 "union-subclass&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2141
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -4115,7 +4219,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2168
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
@@ -4123,24 +4227,24 @@
 "A coluna discriminatõria não é requerida para esta estratégia de mapeamento."
 
 #. Tag: title
-#: basic_mapping.xml:2179
-#, no-c-format
-msgid "join"
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "join"
 
 #. Tag: para
-#: basic_mapping.xml:2181
-#, no-c-format
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "Usando o elemento <literal>&lt;join&gt;</literal>&gt;, é possível mapear "
 "propriedades de uma classe para várias tabelas."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2195
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -4159,22 +4263,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2199
-#, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal>: O nome da tabela associada."
 
 #. Tag: para
-#: basic_mapping.xml:2216
-#, no-c-format
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -4190,24 +4294,24 @@
 "pela classe e suas superclasses."
 
 #. Tag: para
-#: basic_mapping.xml:2229
-#, no-c-format
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (opcional – valor default <literal>false</"
 "literal>): Se habilitado, o Hibernate não irá tentar inserir ou atualizar as "
 "propriedades definidas por este join."
 
 #. Tag: para
-#: basic_mapping.xml:2236
-#, no-c-format
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optional</literal> (opcional – valor default <literal>false</"
@@ -4216,18 +4320,18 @@
 "outer join para recuperar as propriedades."
 
 #. Tag: para
-#: basic_mapping.xml:2245
-#, no-c-format
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "Por exemplo, a informação de endereço para uma pessoa pode ser mapeada para "
 "uma tabela separada (enquanto preservando o valor da semântica de tipos para "
 "todas as propriedades):"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2250
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -4245,10 +4349,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2252
-#, no-c-format
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4259,19 +4363,19 @@
 "de herança numa hierarquia simples, como explicado mais a frente."
 
 #. Tag: title
-#: basic_mapping.xml:2262
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2264
-#, no-c-format
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "Nós vimos que o elemento <literal>&lt;key&gt;</literal> surgiu algumas vezes "
 "até agora. Ele aparece em qualquer lugar que o elemento pai define uma "
@@ -4279,7 +4383,7 @@
 "associada, que referencia a chave primária da tabela original."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2280
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4293,11 +4397,11 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2291
-#, no-c-format
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (opcional, valor default <literal>noaction</"
@@ -4305,36 +4409,36 @@
 "esta habilitada para cascade delete ."
 
 #. Tag: para
-#: basic_mapping.xml:2298
-#, no-c-format
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (opcional): Especifica que a chave "
 "estrangeira se refere a colunas que não são chave primária da tabela "
 "original. (Util para base de dados legadas.)"
 
 #. Tag: para
-#: basic_mapping.xml:2305
-#, no-c-format
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (opcional): Especifica que a coluna da chave "
 "estrangeira não aceita valores nulos (isto é implícito em qualquer momento "
 "que a chave estrangeira também fizer parte da chave primária)."
 
 #. Tag: para
-#: basic_mapping.xml:2312
-#, no-c-format
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (optional): Specifies that the foreign key should "
 "never be updated (this is implied whenever the foreign key is also part of "
@@ -4343,27 +4447,27 @@
 "momento que a chave estrangeira também fizer parte da chave primária)."
 
 #. Tag: para
-#: basic_mapping.xml:2319
-#, no-c-format
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (opcional): Especifica que a chave estrangeira "
 "deve ter uma constraint unique (sto é implícito em qualquer momento que a "
 "chave estrangeira também fizer parte da chave primária)."
 
 #. Tag: para
-#: basic_mapping.xml:2327
-#, no-c-format
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "Nós recomendamos que para sistemas que a performance de delete seja "
 "importante, todas as chaves deve ser definida <literal>on-delete=\"cascade"
@@ -4374,12 +4478,12 @@
 "versionados."
 
 #. Tag: para
-#: basic_mapping.xml:2335
-#, no-c-format
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4390,19 +4494,19 @@
 "chave usando <literal>&lt;key not-null=\"true\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2345
-#, no-c-format
-msgid "column and formula elements"
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "elementos column e formula"
 
 #. Tag: para
-#: basic_mapping.xml:2346
-#, no-c-format
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "Qualquer elemento de mapeamente que aceita um atributo <literal>column</"
 "literal> irá aceitar alternativamente um subelemento <literal>&lt;column&gt;"
@@ -4410,7 +4514,7 @@
 "para o atributo <literal>formula</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2352
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4428,16 +4532,16 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2354
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2356
-#, no-c-format
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4446,7 +4550,7 @@
 "expressar, por exemplo, associações exóticas."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2362
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4457,20 +4561,20 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2367
-#, no-c-format
-msgid "import"
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "import"
 
 #. Tag: para
-#: basic_mapping.xml:2369
-#, no-c-format
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "Suponha que a sua aplicação tem duas classes persistentes com o mesmo nome, "
 "e você não quer especificar o nome qualificado (do pacote) nas queries do "
@@ -4479,13 +4583,13 @@
 "até importar classes e interfaces que não estão explicitamente mapeadas."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2383
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4495,43 +4599,42 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2386
-#, no-c-format
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr ""
 "<literal>class</literal>: O nome qualificado (do pacote) de qualquer classe "
 "Java."
 
 #. Tag: para
-#: basic_mapping.xml:2391
-#, no-c-format
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal> (opcional – valor default, o nome da classe não "
 "qualificada): Um nome que pode ser usado numa linguagem de consulta."
 
 #. Tag: title
-#: basic_mapping.xml:2402
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2404
-#, no-c-format
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "Existe mais um tipo de propriedade de mapeamento. O elemento de mapeamento "
 "<literal>&lt;any&gt;</literal> define uma associação polimórfica para "
@@ -4544,11 +4647,11 @@
 "especiais (exemplo: audit logs, dados de sessão do usuário, etc)."
 
 #. Tag: para
-#: basic_mapping.xml:2414
-#, no-c-format
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4560,7 +4663,7 @@
 "valores do meta-type para nome de classes."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2421
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4573,7 +4676,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2432
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4594,29 +4697,29 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2435
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>: o nome da propriedade."
 
 #. Tag: para
-#: basic_mapping.xml:2440
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>: o tipo identificador."
 
 #. Tag: para
-#: basic_mapping.xml:2445
-#, no-c-format
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal> (opcional – valor default <literal>string</"
 "literal>): Qualquer tipo que é permitido para um mapeamento discriminador."
 
 #. Tag: para
-#: basic_mapping.xml:2451
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4626,12 +4729,12 @@
 "literal>): o estilo do cascade."
 
 #. Tag: para
-#: basic_mapping.xml:2463
-#, no-c-format
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (opcional - valor default<literal>true</"
@@ -4640,40 +4743,37 @@
 "incremento deve ocorrer se esta propriedade está modificada."
 
 #. Tag: title
-#: basic_mapping.xml:2478
-#, no-c-format
-msgid "Hibernate Types"
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Tipos do Hibernate"
 
 #. Tag: title
-#: basic_mapping.xml:2481
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr "Entidades e valores"
 
 #. Tag: para
-#: basic_mapping.xml:2483
+#: basic_mapping.xml:2510
 #, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"Para entender o comportamento de vários objetos em nível de linguagem de "
-"Java a respeito do serviço de persistência, nós precisamos classificá-los em "
-"dois grupos."
 
 #. Tag: para
-#: basic_mapping.xml:2488
-#, no-c-format
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "Uma <emphasis>entidade </emphasis> existe independentemente de qualquer "
@@ -4688,16 +4788,16 @@
 "podem ser versionadas."
 
 #. Tag: para
-#: basic_mapping.xml:2499
-#, no-c-format
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4712,20 +4812,20 @@
 "podem ser comuns para duas entidades ou coleções."
 
 #. Tag: para
-#: basic_mapping.xml:2510
-#, no-c-format
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "Até agora, nós estivemos usando o termo \"classe persistente\" para referir "
 "a entidades. Nós iremos continuar a fazer isto. Falando a rigor, porém, nem "
@@ -4742,26 +4842,25 @@
 "traduz para um valor de tipo."
 
 #. Tag: para
-#: basic_mapping.xml:2524
-#, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr "Nós iremos rever ambos os conceitos durante toda a documentação."
 
 #. Tag: para
-#: basic_mapping.xml:2528
-#, no-c-format
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "O desafio pe mapear o sistema de tipo de Java (e a definição do "
 "desenvolvedor de entidades e tipos de valor) para o sistema de tipo SQL/"
@@ -4777,31 +4876,33 @@
 "verá adiante."
 
 #. Tag: para
-#: basic_mapping.xml:2541
-#, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr ""
 "Todos os tipos internos do hibernate exceto coleções suportam semânticas "
 "nulas."
 
 #. Tag: title
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr "Valores de tipos básicos"
 
 #. Tag: para
-#: basic_mapping.xml:2550
+#: basic_mapping.xml:2577
 #, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr ""
 "O tipos internos de mapeamentos básicos podem ser a grosso modo categorizado "
 "como: <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2555
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4811,7 +4912,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2558
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4825,13 +4926,13 @@
 "<literal>boolean</literal> ou <literal>java.lang.Boolean</literal> do Java."
 
 #. Tag: literal
-#: basic_mapping.xml:2567
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2569
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4841,13 +4942,13 @@
 "<literal>VARCHAR</literal> (ou <literal>VARCHAR2</literal> no Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2576
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2578
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4859,13 +4960,13 @@
 "<literal>TIMESTAMP</literal> (ou equivalente)."
 
 #. Tag: literal
-#: basic_mapping.xml:2586
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2588
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4875,13 +4976,13 @@
 "SQL <literal>TIMESTAMP</literal> e <literal>DATE</literal> (ou equivalente)."
 
 #. Tag: literal
-#: basic_mapping.xml:2596
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2598
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4893,13 +4994,13 @@
 "<literal>NUMBER</literal> no Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2606
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2608
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4917,13 +5018,13 @@
 "são mapeados para seu <literal>ID</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2620
-#, fuzzy, no-c-format
-msgid "<literal>class</literal>"
-msgstr "<literal>all</literal> cverifica todas as colunas"
+#: basic_mapping.xml:2647
+#, no-c-format
+msgid "class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4935,25 +5036,25 @@
 "<literal>Class</literal> é mapeada pelo seu nome qualificado (completo)."
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "Mapeia arrays de bytes para um tipo binário de SQL apropriado."
 
 #. Tag: literal
-#: basic_mapping.xml:2638
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2640
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4964,16 +5065,16 @@
 "literal> ou <literal>TEXT</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2647
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2649
-#, no-c-format
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4983,19 +5084,19 @@
 "tipo básico."
 
 #. Tag: literal
-#: basic_mapping.xml:2658
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2660
-#, no-c-format
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "Tipos de mapeamentos para as classes JDBC <literal>java.sql.Clob</literal> "
 "and <literal>java.sql.Blob</literal>. Estes tipos podem ser inconveniente "
@@ -5004,7 +5105,7 @@
 "e inconsistente.)"
 
 #. Tag: literal
-#: basic_mapping.xml:2670
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -5014,16 +5115,16 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2674
-#, no-c-format
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "Mapeando tipos para o que geralmente são consideradas tipos mutáveis de "
 "Java, onde o Hibernate faz determinadas otimizações apropriadas somente para "
@@ -5034,12 +5135,13 @@
 "um novo objeto (nonidentical) à propriedade."
 
 #. Tag: para
-#: basic_mapping.xml:2689
-#, no-c-format
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "Identificadores únicos das entidades e coleções podem ser de qualquer tipo "
 "básico exceto <literal>binary</literal>, <literal>blob</literal> ou "
@@ -5047,7 +5149,7 @@
 "veja abaixo.)"
 
 #. Tag: para
-#: basic_mapping.xml:2695
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -5061,20 +5163,20 @@
 "<literal>string</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2704
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr "Tipos de valores personalizados"
 
 #. Tag: para
-#: basic_mapping.xml:2706
-#, no-c-format
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -5092,14 +5194,14 @@
 "<literal>SURNAME</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:2717
-#, no-c-format
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "Para implementar um tipo personalizado, implemente <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> e "
@@ -5108,7 +5210,7 @@
 "coisas que são possíveis."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2725
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -5119,7 +5221,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2727
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -5129,7 +5231,7 @@
 "propriedade para colunas múltiplas."
 
 #. Tag: para
-#: basic_mapping.xml:2732
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -5143,10 +5245,10 @@
 "especializados."
 
 #. Tag: para
-#: basic_mapping.xml:2738
-#, no-c-format
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -5159,7 +5261,7 @@
 "o elemento <literal>&lt;type&gt;</literal> em seus arquivos de mapeamento."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2746
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -5170,7 +5272,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2748
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -5182,14 +5284,14 @@
 "passado a ele."
 
 #. Tag: para
-#: basic_mapping.xml:2753
-#, no-c-format
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "Se você usar freqüentemente um determinado <literal>UserType</literal>, pode "
 "ser útil definir um nome mais curto para ele. Você pode fazer isto usando o "
@@ -5198,7 +5300,7 @@
 "parâmetro se o tipo for parametrizado."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2760
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -5208,13 +5310,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2764
+#: basic_mapping.xml:2791
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -5224,18 +5326,17 @@
 "case-by-case basis by using type parameters on the property mapping."
 
 #. Tag: para
-#: basic_mapping.xml:2769
-#, no-c-format
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "Even though Hibernate's rich range of built-in types and support for "
 "components means you will very rarely <emphasis>need</emphasis> to use a "
@@ -5248,19 +5349,19 @@
 "your way of representing monetary values."
 
 #. Tag: title
-#: basic_mapping.xml:2785
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "Mapping a class more than once"
 
 #. Tag: para
-#: basic_mapping.xml:2786
-#, no-c-format
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -5272,7 +5373,7 @@
 "when mapping associations to the named entity."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2794
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -5295,30 +5396,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2796
-#, no-c-format
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "Notice how associations are now specified using <literal>entity-name</"
 "literal> instead of <literal>class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2804
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL quoted identifiers"
 
 #. Tag: para
-#: basic_mapping.xml:2805
-#, no-c-format
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "You may force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
@@ -5327,7 +5428,7 @@
 "for MySQL)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2812
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5339,36 +5440,36 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "Metadata alternatives"
 
 #. Tag: para
-#: basic_mapping.xml:2820
-#, no-c-format
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XML isn't for everyone, and so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 
 #. Tag: title
-#: basic_mapping.xml:2825
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "Using XDoclet markup"
 
 #. Tag: para
-#: basic_mapping.xml:2827
-#, no-c-format
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "Many Hibernate users prefer to embed mapping information directly in "
 "sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
@@ -5377,7 +5478,7 @@
 "literal> class with XDoclet mappings."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2834
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5487,30 +5588,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2836
-#, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr "See the Hibernate web site for more examples of XDoclet and Hibernate."
 
 #. Tag: title
-#: basic_mapping.xml:2843
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "Using JDK 5.0 Annotations"
 
 #. Tag: para
-#: basic_mapping.xml:2845
-#, no-c-format
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
@@ -5525,13 +5626,13 @@
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 
 #. Tag: para
-#: basic_mapping.xml:2856
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr "This is an example of a POJO class annotated as an EJB entity bean:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2860
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5559,35 +5660,34 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2862
-#, no-c-format
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
 "progress and not completed. Please refer to the Hibernate Annotations module "
 "for more details."
 
 #. Tag: title
-#: basic_mapping.xml:2871
-#, no-c-format
-msgid "Generated Properties"
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "Generated Properties"
 
 #. Tag: para
-#: basic_mapping.xml:2872
-#, no-c-format
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "Generated properties are properties which have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
@@ -5599,13 +5699,13 @@
 "the generated values."
 
 #. Tag: para
-#: basic_mapping.xml:2881
-#, no-c-format
+#: basic_mapping.xml:2911
+#, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "Properties marked as generated must additionally be non-insertable and non-"
@@ -5615,25 +5715,25 @@
 "can be marked as generated."
 
 #. Tag: para
-#: basic_mapping.xml:2888
-#, no-c-format
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr ""
 "<literal>never</literal> (the default) - means that the given property value "
 "is not generated within the database."
 
 #. Tag: para
-#: basic_mapping.xml:2892
-#, no-c-format
+#: basic_mapping.xml:2922
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - states that the given property value is "
 "generated on insert, but is not regenerated on subsequent updates. Things "
@@ -5643,32 +5743,33 @@
 "marked as generated, this option is not available there..."
 
 #. Tag: para
-#: basic_mapping.xml:2900
-#, no-c-format
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr ""
 "<literal>always</literal> - states that the property value is generated both "
 "on insert and on update."
 
 #. Tag: title
-#: basic_mapping.xml:2907
-#, no-c-format
-msgid "Auxiliary Database Objects"
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "Auxiliary Database Objects"
 
 #. Tag: para
-#: basic_mapping.xml:2908
-#, no-c-format
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Allows CREATE and DROP of arbitrary database objects, in conjunction with "
 "Hibernate's schema evolution tools, to provide the ability to fully define a "
@@ -5679,17 +5780,17 @@
 "There are essentially two modes for defining auxiliary database objects..."
 
 #. Tag: para
-#: basic_mapping.xml:2917
-#, no-c-format
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr ""
 "The first mode is to explicitly list the CREATE and DROP commands out in the "
 "mapping file:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2921
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5702,19 +5803,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2922
-#, no-c-format
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "The second mode is to supply a custom class which knows how to construct the "
 "CREATE and DROP commands. This custom class must implement the <literal>org."
 "hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2927
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5726,32 +5827,67 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2928
-#, no-c-format
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr ""
 "Additionally, these database objects can be optionally scoped such that they "
 "only apply when certain dialects are used."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
-#~ msgid "class"
-#~ msgstr "class"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr ""
+#~ "<literal>type</literal> (opcional): Um nome que indica o tipo no "
+#~ "Hibernate."
 
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade</literal> (opcional): Especifica quais operações dever "
+#~ "ser em cascata do objeto pai para o objeto associado."
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (opcional - valor default "
+#~ "<literal>true</literal>): Especifica se mudanças desta propriedade "
+#~ "requerem ou não travamento otimista. Em outras palavras, determina se um "
+#~ "incremento de versão deve ocorrer quando esta propriedade está suja."
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "Para entender o comportamento de vários objetos em nível de linguagem de "
+#~ "Java a respeito do serviço de persistência, nós precisamos classificá-los "
+#~ "em dois grupos."
+
+#, fuzzy
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>all</literal> cverifica todas as colunas"
+
 #~ msgid "id"
 #~ msgstr "id"
 

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: batch.xml:5
+#: batch.xml:29
 #, no-c-format
 msgid "Batch processing"
 msgstr "Processamento de lotes"
 
 #. Tag: para
-#: batch.xml:7
-#, no-c-format
+#: batch.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "Uma alternativa para inserir 100.000 linhas no banco de dados usando o "
 "Hibernate pode ser a seguinte:"
 
 #. Tag: programlisting
-#: batch.xml:12
+#: batch.xml:36
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -41,13 +41,13 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:14
-#, no-c-format
+#: batch.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "Isto irá falhar em algum lugar próximo a linha 50.000, lançando uma "
 "<literal>OutOfMemoryException</literal>. Isso ocorre devido ao fato do "
@@ -55,13 +55,13 @@
 "inseridas num cachê em nível de sessão."
 
 #. Tag: para
-#: batch.xml:20
-#, no-c-format
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "Neste capítulo veremos como contornar esse problema. Entretanto, se você vai "
 "realizar processamento de lotes, é muito importante que você habilite o uso "
@@ -69,39 +69,39 @@
 "tamanho do lote JDBC em um valor razoável (algo entre 10-50):"
 
 #. Tag: programlisting
-#: batch.xml:27
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:29
-#, no-c-format
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "Você também pode querer rodar esse tipo de processamento de lotes com o "
 "cache secundário completamente desabilitado:"
 
 #. Tag: para
-#: batch.xml:34
-#, no-c-format
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr ""
 "Note that Hibernate disables insert batching at the JDBC level transparently "
 "if you use an <literal>identiy</literal> identifier generator."
 
 #. Tag: programlisting
-#: batch.xml:39
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:41
+#: batch.xml:66
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -113,25 +113,25 @@
 "secundário."
 
 #. Tag: title
-#: batch.xml:47
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr "Inserção de lotes"
 
 #. Tag: para
-#: batch.xml:49
-#, no-c-format
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "Quando você estiver inserindo novos objetos persistentes, vocês deve "
 "executar os métodos <literal>flush()</literal> e <literal>clear()</literal> "
 "regularmente na sessão, para controlar o tamanho do cache primário."
 
 #. Tag: programlisting
-#: batch.xml:55
+#: batch.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -152,25 +152,25 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:60
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr "Batch updates"
 
 #. Tag: para
-#: batch.xml:62
-#, no-c-format
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "Para recuperar e atualizar informações a mesma idéia é válida. "
 "Adicionalmente, pode precisar usar o <literal>scroll()</literal> para usar "
 "recursos no lado do servidor em queries que retornam muita informação."
 
 #. Tag: programlisting
-#: batch.xml:68
+#: batch.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -195,28 +195,28 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:73
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr "A interface StatelessSession"
 
 #. Tag: para
-#: batch.xml:74
-#, no-c-format
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "Alternativamente, o Hibernate provê uma API orientada à comandos, usada para "
 "transmitir um fluxo de dados de e para o banco de dados na forma de objetos "
@@ -234,7 +234,7 @@
 "próxima do JDBC."
 
 #. Tag: programlisting
-#: batch.xml:89
+#: batch.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -253,29 +253,28 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:91
-#, no-c-format
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr ""
 "Veja neste exempo, as instancias de <literal>Customer</literal> retornadas "
 "pela query são imediatamente desvinculadas. Elas nunca serão assossiadas à "
 "um contexto persistente."
 
 #. Tag: para
-#: batch.xml:97
-#, no-c-format
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "As operações <literal>insert(), update()</literal> e <literal>delete()</"
 "literal> definidos pela interface <literal>StatelessSession</literal> são "
@@ -287,24 +286,24 @@
 "interface <literal>Session</literal>."
 
 #. Tag: title
-#: batch.xml:110
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr "Operações no estilo DML"
 
 #. Tag: para
-#: batch.xml:112
-#, no-c-format
+#: batch.xml:137
+#, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr ""
 "Como já discutido, mapeamento objeto/relacional automático e transparente é "
 "conseguido com a gerência do estado do objeto. Com isto o estado daquele "
@@ -317,31 +316,37 @@
 "Language) (<xref linkend=\"queryhql\">HQL</xref>)."
 
 #. Tag: para
-#: batch.xml:122
-#, no-c-format
+#: batch.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "A pseudo-sintaxe para expressões <literal>UPDATE</literal> e "
 "<literal>DELETE</literal> é: <literal>( UPDATE | DELETE ) FROM? NomeEntidade "
 "(WHERE condições_where)?</literal>. Algumas observações:"
 
 #. Tag: para
-#: batch.xml:130
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "Na clausula from, a palavra chave FROM é opcional;"
 
 #. Tag: para
-#: batch.xml:135
-#, no-c-format
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr ""
 "Somente uma entidade pode ser chamada na clausula from; opcionalmente pode "
 "ter um alias. Se o nome da entidade for possuir um alias, então qualquer "
@@ -350,31 +355,31 @@
 "acesso qualificado."
 
 #. Tag: para
-#: batch.xml:143
-#, no-c-format
+#: batch.xml:170
+#, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "Na <xref linkend=\"queryhql-joins-forms\">joins</xref> (ambas implícita ou "
 "explicita) pode ser especificada em um bulk HQL query. Sub-queries podem ser "
 "usadas na clausula where; as subqueries podem conter joins."
 
 #. Tag: para
-#: batch.xml:150
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr "A clausula where também é opcional."
 
 #. Tag: para
-#: batch.xml:156
-#, no-c-format
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "Como exemplo para executar um HQL <literal>UPDATE</literal>, use o método "
 "<literal>Query.executeUpdate()</literal>(o método ganhou o nome devido a sua "
@@ -382,7 +387,7 @@
 "literal>):"
 
 #. Tag: programlisting
-#: batch.xml:162
+#: batch.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -401,16 +406,16 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:164
-#, no-c-format
+#: batch.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -425,7 +430,7 @@
 "keyword."
 
 #. Tag: programlisting
-#: batch.xml:174
+#: batch.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -441,19 +446,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:176
-#, no-c-format
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "Note that custom version types (<literal>org.hibernate.usertype."
 "UserVersionType</literal>) are not allowed in conjunction with a "
 "<literal>update versioned</literal> statement."
 
 #. Tag: para
-#: batch.xml:181
+#: batch.xml:208
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -463,7 +468,7 @@
 "<literal>Query.executeUpdate()</literal>:"
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:213
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -479,19 +484,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
-#, no-c-format
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "O valor <literal>int</literal> retornado pelo método <literal>Query."
 "executeUpdate()</literal> indica o numero de entidade afetadas pela "
@@ -506,7 +511,7 @@
 "imediatamente abaixo."
 
 #. Tag: para
-#: batch.xml:199
+#: batch.xml:226
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -518,7 +523,7 @@
 "observar:"
 
 #. Tag: para
-#: batch.xml:207
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -528,14 +533,14 @@
 "VALUES ... não é suportada."
 
 #. Tag: para
-#: batch.xml:210
-#, no-c-format
+#: batch.xml:237
+#, fuzzy, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 "A lista de propriedade é análoga à <literal>especificação da coluna</"
@@ -546,15 +551,15 @@
 "palavras, os comandos <literal>INSERT</literal> não são polimorficos."
 
 #. Tag: para
-#: batch.xml:220
-#, no-c-format
+#: batch.xml:247
+#, fuzzy, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
@@ -572,22 +577,22 @@
 "não possa fazer uma distinção ou possa ser capaz de manusear a conversão."
 
 #. Tag: para
-#: batch.xml:232
-#, no-c-format
+#: batch.xml:259
+#, fuzzy, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 "Para a propriedade id, a expressão insert oferece duas opções. Você pode "
 "especificar qualquer propriedade id explicitamente no properties_list (em "
@@ -604,15 +609,15 @@
 "de mecanismos para recuperar o seu valor."
 
 #. Tag: para
-#: batch.xml:247
-#, no-c-format
+#: batch.xml:274
+#, fuzzy, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
@@ -629,13 +634,15 @@
 "literal>)."
 
 #. Tag: para
-#: batch.xml:257
-#, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+#: batch.xml:284
+#, fuzzy, no-c-format
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr "Exemplo da execução de um HQL <literal>INSERT</literal>:"
 
 #. Tag: programlisting
-#: batch.xml:261
+#: batch.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,23 +11,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: best_practices.xml:5
+#: best_practices.xml:29
 #, no-c-format
 msgid "Best Practices"
 msgstr "Boas práticas"
 
 #. Tag: term
-#: best_practices.xml:9
-#, no-c-format
+#: best_practices.xml:33
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "Escreva classes compactas e mapeie-as usando <literal>&lt;component&gt;</"
 "literal>."
 
 #. Tag: para
-#: best_practices.xml:11
+#: best_practices.xml:35
 #, no-c-format
 msgid ""
 "Use an <literal>Address</literal> class to encapsulate <literal>street</"
@@ -41,18 +41,18 @@
 "refactoring."
 
 #. Tag: term
-#: best_practices.xml:19
-#, no-c-format
-msgid "Declare identifier properties on persistent classes."
+#: best_practices.xml:43
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "Declare propriedades identificadoras em classes persistentes."
 
 #. Tag: para
-#: best_practices.xml:21
-#, no-c-format
+#: best_practices.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "O Hibernate constrói propriedades identificadoras opcionais. Existem todos "
 "os tipos de razões que explicam porquê você deveria utilizá-las. Nós "
@@ -60,13 +60,13 @@
 "significado para o negocio)."
 
 #. Tag: term
-#: best_practices.xml:29
-#, no-c-format
-msgid "Identify natural keys."
+#: best_practices.xml:53
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "Identifique chaves naturais."
 
 #. Tag: para
-#: best_practices.xml:31
+#: best_practices.xml:55
 #, no-c-format
 msgid ""
 "Identify natural keys for all entities, and map them using <literal>&lt;"
@@ -80,85 +80,85 @@
 "compõem a chave natural."
 
 #. Tag: term
-#: best_practices.xml:39
-#, no-c-format
-msgid "Place each class mapping in its own file."
+#: best_practices.xml:63
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "Coloque cada classe de mapeamento em seu próprio arquivo."
 
 #. Tag: para
-#: best_practices.xml:41
-#, no-c-format
+#: best_practices.xml:65
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "Não use um único código de mapeamento monolítico. Mapeie <literal>com.eg."
 "Foo</literal> no arquivo <literal>com/eg/Foo.hbm.xml</literal>. Isto promove "
 "particularmente o bom senso no time de desenvolvimento."
 
 #. Tag: term
-#: best_practices.xml:49
-#, no-c-format
-msgid "Load mappings as resources."
+#: best_practices.xml:73
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "Carregue os mapeamentos como recursos."
 
 #. Tag: para
-#: best_practices.xml:51
+#: best_practices.xml:75
 #, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr "Faça o deploy dos mapeamentos junto com as classes que eles mapeiam."
 
 #. Tag: term
-#: best_practices.xml:57
-#, no-c-format
-msgid "Consider externalising query strings."
+#: best_practices.xml:81
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "Considere externalizar as strings de consultas."
 
 #. Tag: para
-#: best_practices.xml:59
-#, no-c-format
+#: best_practices.xml:83
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "Esta é uma boa prática se suas consultas chamam funções SQL que não sejam "
 "ANSI. Externalizar as strings de consultas para mapear arquivos irão tornar "
 "a aplicação mais portável."
 
 #. Tag: term
-#: best_practices.xml:67
+#: best_practices.xml:91
 #, no-c-format
 msgid "Use bind variables."
 msgstr "Use bind variables."
 
 #. Tag: para
-#: best_practices.xml:69
-#, no-c-format
+#: best_practices.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "Assim como em JDBC, sempre substitua valores não constantes por \"?\". Nunca "
 "use a manipulação de strings para concatenar valores não constantes em uma "
 "consulta! Até melhor, considere usar parâmetros nomeados nas consultas."
 
 #. Tag: term
-#: best_practices.xml:77
-#, no-c-format
-msgid "Don't manage your own JDBC connections."
+#: best_practices.xml:101
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "Não gerencie suas conexões JDBC."
 
 #. Tag: para
-#: best_practices.xml:79
-#, no-c-format
+#: best_practices.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "O Hibernate permite que a aplicação gerencie conexões JDBC. Esta abordagem "
 "deve ser considerada um último recurso. Se você não pode usar os provedores "
@@ -166,20 +166,20 @@
 "<literal>org.hibernate.connection.ConnectionProvider</literal>."
 
 #. Tag: term
-#: best_practices.xml:87
-#, no-c-format
-msgid "Consider using a custom type."
+#: best_practices.xml:111
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "Considere usar tipos customizados."
 
 #. Tag: para
-#: best_practices.xml:89
-#, no-c-format
+#: best_practices.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "Suponha que você tenha um tipo Java, de alguma biblioteca, que precisa ser "
 "persistido mas não provê os acessórios necessários para mapeá-lo como um "
@@ -188,22 +188,22 @@
 "para o tipo Hibernate."
 
 #. Tag: term
-#: best_practices.xml:98
-#, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+#: best_practices.xml:122
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "Use código manual JDBC nos gargalos."
 
 #. Tag: para
-#: best_practices.xml:100
-#, no-c-format
+#: best_practices.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "Nas áreas de desempenho crítico do sistema, alguns tipos de operações podem "
 "se beneficiar do uso direto do JDBC. Mas por favor, espere até você "
@@ -214,19 +214,19 @@
 "transação e ocultar o provedor a conexão"
 
 #. Tag: term
-#: best_practices.xml:110
-#, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+#: best_practices.xml:134
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "Entenda o <literal>Session</literal> flushing."
 
 #. Tag: para
-#: best_practices.xml:112
-#, no-c-format
+#: best_practices.xml:136
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "De tempos em tempos a sessão sincroniza seu estado persistente com o banco "
@@ -236,21 +236,21 @@
 "operações em uma transação particular."
 
 #. Tag: term
-#: best_practices.xml:121
-#, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+#: best_practices.xml:145
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr ""
 "Em uma arquitetura de três camadas, considere o uso de objetos separados."
 
 #. Tag: para
-#: best_practices.xml:123
-#, no-c-format
+#: best_practices.xml:147
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "When using a servlet / session bean architecture, you could pass persistent "
 "objects loaded in the session bean to and from the servlet / JSP layer. Use "
@@ -259,27 +259,27 @@
 "with the database."
 
 #. Tag: term
-#: best_practices.xml:132
-#, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#: best_practices.xml:156
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr ""
 "In a two tiered architecture, consider using long persistence contexts."
 
 #. Tag: para
-#: best_practices.xml:134
-#, no-c-format
+#: best_practices.xml:158
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "Database Transactions have to be as short as possible for best scalability. "
@@ -296,20 +296,20 @@
 "stale data."
 
 #. Tag: term
-#: best_practices.xml:148
-#, no-c-format
-msgid "Don't treat exceptions as recoverable."
+#: best_practices.xml:172
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "Don't treat exceptions as recoverable."
 
 #. Tag: para
-#: best_practices.xml:150
-#, no-c-format
+#: best_practices.xml:174
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -322,22 +322,22 @@
 "<literal>Session.get()</literal> or a query instead."
 
 #. Tag: term
-#: best_practices.xml:160
-#, no-c-format
-msgid "Prefer lazy fetching for associations."
+#: best_practices.xml:184
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "Prefer lazy fetching for associations."
 
 #. Tag: para
-#: best_practices.xml:162
-#, no-c-format
+#: best_practices.xml:186
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
@@ -348,18 +348,18 @@
 "fetch</literal>."
 
 #. Tag: term
-#: best_practices.xml:172
-#, no-c-format
+#: best_practices.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
 "<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
 
 #. Tag: para
-#: best_practices.xml:177
-#, no-c-format
+#: best_practices.xml:201
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -367,12 +367,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -388,21 +388,21 @@
 "fundamental requirement of safe transactional data access."
 
 #. Tag: term
-#: best_practices.xml:191
-#, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+#: best_practices.xml:215
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "Consider abstracting your business logic from Hibernate."
 
 #. Tag: para
-#: best_practices.xml:193
-#, no-c-format
+#: best_practices.xml:217
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "Hide (Hibernate) data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
@@ -412,21 +412,21 @@
 "an application with five tables!)"
 
 #. Tag: term
-#: best_practices.xml:203
-#, no-c-format
-msgid "Don't use exotic association mappings."
+#: best_practices.xml:227
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "Don't use exotic association mappings."
 
 #. Tag: para
-#: best_practices.xml:205
-#, no-c-format
+#: best_practices.xml:229
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "Good usecases for a real many-to-many associations are rare. Most of the "
 "time you need additional information stored in the \"link table\". In this "
@@ -436,13 +436,13 @@
 "style and ask yourself if it is really neccessary."
 
 #. Tag: term
-#: best_practices.xml:215
-#, no-c-format
-msgid "Prefer bidirectional associations."
+#: best_practices.xml:239
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "Prefer bidirectional associations."
 
 #. Tag: para
-#: best_practices.xml:217
+#: best_practices.xml:241
 #, no-c-format
 msgid ""
 "Unidirectional associations are more difficult to query. In a large "

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: collection_mapping.xml:5
-#, no-c-format
-msgid "Collection Mapping"
-msgstr "Mapeamento de Coleções"
+#: collection_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Collection mapping"
+msgstr "Collection mappings"
 
 #. Tag: title
-#: collection_mapping.xml:8
+#: collection_mapping.xml:32
 #, no-c-format
 msgid "Persistent collections"
 msgstr "Persistent collections"
 
 #. Tag: para
-#: collection_mapping.xml:10
-#, no-c-format
+#: collection_mapping.xml:34
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "Hibernate requires that persistent collection-valued fields be declared as "
 "an interface type, for example:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:15
+#: collection_mapping.xml:39
 #, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
@@ -48,15 +48,15 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:17
-#, no-c-format
+#: collection_mapping.xml:41
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
@@ -66,16 +66,16 @@
 "<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
 
 #. Tag: para
-#: collection_mapping.xml:26
-#, no-c-format
+#: collection_mapping.xml:50
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "Notice how we initialized the instance variable with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
@@ -86,7 +86,7 @@
 "literal>. Watch out for errors like this:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:36
+#: collection_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -101,13 +101,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:38
-#, no-c-format
+#: collection_mapping.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
@@ -115,16 +115,16 @@
 "depending upon the interface type."
 
 #. Tag: para
-#: collection_mapping.xml:45
-#, no-c-format
+#: collection_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "Collections instances have the usual behavior of value types. They are "
@@ -137,37 +137,51 @@
 "distinguish between a null collection reference and an empty collection."
 
 #. Tag: para
-#: collection_mapping.xml:56
-#, no-c-format
+#: collection_mapping.xml:80
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "You shouldn't have to worry much about any of this. Use persistent "
 "collections the same way you use ordinary Java collections. Just make sure "
 "you understand the semantics of bidirectional associations (discussed later)."
 
 #. Tag: title
-#: collection_mapping.xml:65
+#: collection_mapping.xml:89
 #, no-c-format
 msgid "Collection mappings"
 msgstr "Collection mappings"
 
 #. Tag: para
-#: collection_mapping.xml:67
-#, no-c-format
+#: collection_mapping.xml:92
+#, fuzzy, no-c-format
 msgid ""
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
+msgstr ""
+"There are quite a range of mappings that can be generated for collections, "
+"covering many common relational models. We suggest you experiment with the "
+"schema generation tool to get a feeling for how various mapping declarations "
+"translate to database tables."
+
+#. Tag: para
+#: collection_mapping.xml:99
+#, fuzzy, no-c-format
+msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
 "type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
 "is used for mapping properties of type <literal>Set</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:73
+#: collection_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Product\">\n"
@@ -180,7 +194,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:75
+#: collection_mapping.xml:107
 #, no-c-format
 msgid ""
 "Apart from <literal>&lt;set&gt;</literal>, there is also <literal>&lt;"
@@ -196,7 +210,7 @@
 "element is representative:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:100
+#: collection_mapping.xml:132
 #, no-c-format
 msgid ""
 "<![CDATA[<map\n"
@@ -225,39 +239,40 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:103
-#, no-c-format
-msgid "<literal>name</literal> the collection property name"
+#: collection_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr "<literal>name</literal> the collection property name"
 
 #. Tag: para
-#: collection_mapping.xml:108
-#, no-c-format
+#: collection_mapping.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (optional - defaults to property name) the name of "
 "the collection table (not used for one-to-many associations)"
 
 #. Tag: para
-#: collection_mapping.xml:114
-#, no-c-format
+#: collection_mapping.xml:146
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (optional) the name of a table schema to override "
 "the schema declared on the root element"
 
 #. Tag: para
-#: collection_mapping.xml:120
-#, no-c-format
+#: collection_mapping.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
 "be used to disable lazy fetching and specify that the association is always "
@@ -265,43 +280,44 @@
 "do not initialize the collection (suitable for very large collections)"
 
 #. Tag: para
-#: collection_mapping.xml:129
-#, no-c-format
+#: collection_mapping.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
 "mark this collection as the \"inverse\" end of a bidirectional association"
 
 #. Tag: para
-#: collection_mapping.xml:135
-#, no-c-format
+#: collection_mapping.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
 "enable operations to cascade to child entities"
 
 #. Tag: para
-#: collection_mapping.xml:141
-#, no-c-format
+#: collection_mapping.xml:173
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal> (optional) specify a sorted collection with "
 "<literal>natural</literal> sort order, or a given comparator class"
 
 #. Tag: para
-#: collection_mapping.xml:147
-#, no-c-format
+#: collection_mapping.xml:179
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
 "(or columns) that define the iteration order of the <literal>Map</literal>, "
@@ -309,23 +325,24 @@
 "literal> or <literal>desc</literal>"
 
 #. Tag: para
-#: collection_mapping.xml:154
-#, no-c-format
+#: collection_mapping.xml:186
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
 "literal> condition to be used when retrieving or removing the collection "
 "(useful if the collection should contain only a subset of the available data)"
 
 #. Tag: para
-#: collection_mapping.xml:161
-#, no-c-format
+#: collection_mapping.xml:193
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
@@ -333,35 +350,35 @@
 "fetching by sequential subselect."
 
 #. Tag: para
-#: collection_mapping.xml:168
-#, no-c-format
+#: collection_mapping.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
 "specify a \"batch size\" for lazily fetching instances of this collection."
 
 #. Tag: para
-#: collection_mapping.xml:174
-#, no-c-format
+#: collection_mapping.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
 "literal>): The strategy Hibernate should use for accessing the collection "
 "property value."
 
 #. Tag: para
-#: collection_mapping.xml:180
-#, no-c-format
+#: collection_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
 "literal>): Species that changes to the state of the collection results in "
@@ -369,30 +386,31 @@
 "is often reasonable to disable this setting.)"
 
 #. Tag: para
-#: collection_mapping.xml:188
-#, no-c-format
+#: collection_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
 "A value of <literal>false</literal> specifies that the elements of the "
 "collection never change (a minor performance optimization in some cases)."
 
 #. Tag: title
-#: collection_mapping.xml:198
+#: collection_mapping.xml:230
 #, no-c-format
 msgid "Collection foreign keys"
 msgstr "Collection foreign keys"
 
 #. Tag: para
-#: collection_mapping.xml:200
-#, no-c-format
+#: collection_mapping.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -403,12 +421,12 @@
 "literal> element."
 
 #. Tag: para
-#: collection_mapping.xml:208
-#, no-c-format
+#: collection_mapping.xml:240
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "There may be a nullability constraint on the foreign key column. For most "
@@ -417,27 +435,27 @@
 "<literal>not-null=\"true\"</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:215
+#: collection_mapping.xml:247
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:217
-#, no-c-format
+#: collection_mapping.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr ""
 "The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:221
+#: collection_mapping.xml:253
 #, no-c-format
 msgid "<![CDATA[<key column=\"productSerialNumber\" on-delete=\"cascade\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:223
+#: collection_mapping.xml:255
 #, no-c-format
 msgid ""
 "See the previous chapter for a full definition of the <literal>&lt;key&gt;</"
@@ -447,22 +465,22 @@
 "literal> element."
 
 #. Tag: title
-#: collection_mapping.xml:231
+#: collection_mapping.xml:263
 #, no-c-format
 msgid "Collection elements"
 msgstr "Collection elements"
 
 #. Tag: para
-#: collection_mapping.xml:233
-#, no-c-format
+#: collection_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "Collections may contain almost any other Hibernate type, including all basic "
 "types, custom types, components, and of course, references to other "
@@ -473,7 +491,7 @@
 "considered to be state held by the collection."
 
 #. Tag: para
-#: collection_mapping.xml:242
+#: collection_mapping.xml:274
 #, no-c-format
 msgid ""
 "The contained type is referred to as the <emphasis>collection element type</"
@@ -491,26 +509,26 @@
 "value semantics, the next two are used to map entity associations."
 
 #. Tag: title
-#: collection_mapping.xml:254
+#: collection_mapping.xml:286
 #, no-c-format
 msgid "Indexed collections"
 msgstr "Indexed collections"
 
 #. Tag: para
-#: collection_mapping.xml:256
-#, no-c-format
+#: collection_mapping.xml:288
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "All collection mappings, except those with set and bag semantics, need an "
 "<emphasis>index column</emphasis> in the collection table - a column that "
@@ -525,7 +543,7 @@
 "by default)."
 
 #. Tag: sect2
-#: collection_mapping.xml:267
+#: collection_mapping.xml:299
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -533,10 +551,10 @@
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -547,11 +565,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -561,24 +579,24 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:348
-#, no-c-format
+#: collection_mapping.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "If your table doesn't have an index column, and you still wish to use "
 "<literal>List</literal> as the property type, you should map the property as "
@@ -586,33 +604,19 @@
 "order when it is retrieved from the database, but it may be optionally "
 "sorted or ordered."
 
-#. Tag: para
-#: collection_mapping.xml:357
-#, no-c-format
-msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
-msgstr ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
-
 #. Tag: title
-#: collection_mapping.xml:364
+#: collection_mapping.xml:390
 #, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "Collections of values and many-to-many associations"
 
 #. Tag: para
-#: collection_mapping.xml:366
-#, no-c-format
+#: collection_mapping.xml:392
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr ""
 "Any collection of values or many-to-many association requires a dedicated "
@@ -621,17 +625,17 @@
 "index column or columns."
 
 #. Tag: para
-#: collection_mapping.xml:373
-#, no-c-format
+#: collection_mapping.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr ""
 "For a collection of values, we use the <literal>&lt;element&gt;</literal> "
 "tag."
 
 #. Tag: sect2
-#: collection_mapping.xml:375
+#: collection_mapping.xml:401
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"element1b\" coords=\"2 50\"/> <area "
@@ -647,11 +651,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -672,43 +676,49 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:480
+#: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
-msgstr "Some examples, first, a set of strings:"
+msgid "Here are some examples."
+msgstr ""
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:484
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -718,17 +728,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:486
-#, no-c-format
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "A bag containing integers (with an iteration order determined by the "
 "<literal>order-by</literal> attribute):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:491
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -740,13 +750,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:493
-#, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr "An array of entities - in this case, a many to many association:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:497
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -759,13 +769,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:499
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "A map from string indices to dates:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:503
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -779,13 +789,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:505
-#, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr "A list of components (discussed in the next chapter):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:509
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -801,51 +811,51 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:514
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr "One-to-many associations"
 
 #. Tag: para
-#: collection_mapping.xml:516
-#, no-c-format
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr ""
 "A <emphasis>one to many association</emphasis> links the tables of two "
 "classes via a foreign key, with no intervening collection table. This "
 "mapping loses certain semantics of normal Java collections:"
 
 #. Tag: para
-#: collection_mapping.xml:524
-#, no-c-format
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr ""
 "An instance of the contained entity class may not belong to more than one "
 "instance of the collection"
 
 #. Tag: para
-#: collection_mapping.xml:530
-#, no-c-format
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "An instance of the contained entity class may not appear at more than one "
 "value of the collection index"
 
 #. Tag: para
-#: collection_mapping.xml:537
-#, no-c-format
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
 "requires existence of a foreign key column and possibly an index column to "
@@ -853,7 +863,7 @@
 "tag indicates that this is a one to many association."
 
 #. Tag: programlisting
-#: collection_mapping.xml:550
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -866,18 +876,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:553
-#, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+#: collection_mapping.xml:582
+#, fuzzy, no-c-format
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr "<literal>class</literal> (required): The name of the associated class."
 
 #. Tag: para
-#: collection_mapping.xml:558
-#, no-c-format
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
@@ -886,38 +896,37 @@
 "association."
 
 #. Tag: para
-#: collection_mapping.xml:565
-#, no-c-format
+#: collection_mapping.xml:594
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "<literal>entity-name</literal> (optional): The entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:573
-#, no-c-format
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
 "to declare any columns. Nor is it necessary to specify the <literal>table</"
 "literal> name anywhere."
 
 #. Tag: para
-#: collection_mapping.xml:579
-#, no-c-format
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>Very important note:</emphasis> If the foreign key column of a "
 "<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
@@ -928,19 +937,19 @@
 "in this chapter."
 
 #. Tag: para
-#: collection_mapping.xml:588
-#, no-c-format
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "This example shows a map of <literal>Part</literal> entities by name (where "
 "<literal>partName</literal> is a persistent property of <literal>Part</"
 "literal>). Notice the use of a formula-based index."
 
 #. Tag: programlisting
-#: collection_mapping.xml:594
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -952,19 +961,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:600
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "Advanced collection mappings"
 
 #. Tag: title
-#: collection_mapping.xml:603
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr "Sorted collections"
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -976,7 +985,7 @@
 "comparator in the mapping file:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:610
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -994,7 +1003,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:612
+#: collection_mapping.xml:643
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -1006,7 +1015,7 @@
 "class implementing <literal>java.util.Comparator</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:618
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -1016,15 +1025,15 @@
 "or <literal>java.util.TreeMap</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:623
-#, no-c-format
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "If you want the database itself to order the collection elements use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
@@ -1034,7 +1043,7 @@
 "performs the ordering in the SQL query, not in memory."
 
 #. Tag: programlisting
-#: collection_mapping.xml:632
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1050,28 +1059,34 @@
 "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:634
-#, no-c-format
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "Note that the value of the <literal>order-by</literal> attribute is an SQL "
 "ordering, not a HQL ordering!"
 
 #. Tag: para
-#: collection_mapping.xml:639
-#, no-c-format
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "Associations may even be sorted by some arbitrary criteria at runtime using "
 "a collection <literal>filter()</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:644
+#: collection_mapping.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1079,13 +1094,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:649
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "Bidirectional associations"
 
 #. Tag: para
-#: collection_mapping.xml:651
+#: collection_mapping.xml:685
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1097,37 +1112,36 @@
 "supported: <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:658
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr "one-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:660
-#, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "set or bag valued at one end, single-valued at the other"
 
 #. Tag: term
-#: collection_mapping.xml:666
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr "many-to-many"
 
 #. Tag: para
-#: collection_mapping.xml:668
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "set or bag valued at both ends"
 
 #. Tag: para
-#: collection_mapping.xml:677
-#, no-c-format
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "You may specify a bidirectional many-to-many association simply by mapping "
 "two many-to-many associations to the same database table and declaring one "
@@ -1135,17 +1149,18 @@
 "not be an indexed collection)."
 
 #. Tag: para
-#: collection_mapping.xml:684
-#, no-c-format
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "Here's an example of a bidirectional many-to-many association; each category "
 "can have many items and each item can be in many categories:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:689
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1170,14 +1185,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:691
-#, no-c-format
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "As mudanças feitas somente de um lado da associação <emphasis>não</emphasis> "
 "são persistidas. Isto significa que o Hibernate tem duas representações na "
@@ -1187,7 +1202,7 @@
 "muitos para muitos em Java:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:699
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1202,7 +1217,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:701
+#: collection_mapping.xml:735
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1211,10 +1226,10 @@
 "A outra ponta é usada salvar a representação em memória à base de dados."
 
 #. Tag: para
-#: collection_mapping.xml:705
-#, no-c-format
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1224,7 +1239,7 @@
 "\"</literal>"
 
 #. Tag: programlisting
-#: collection_mapping.xml:711
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1247,30 +1262,30 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:713
-#, no-c-format
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "Mapear apenas uma das pontas da associação com <literal>inverse=\"true\"</"
 "literal> não afeta as operações em cascata, isso é um conceito ortogonal."
 
 #. Tag: title
-#: collection_mapping.xml:721
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "Associações bidirecionais com coleções indexadas"
 
 #. Tag: para
-#: collection_mapping.xml:722
-#, no-c-format
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "Uma associação bidirecional onde uma dos lados e representa pôr uma "
 "<literal>&lt;list&gt;</literal> ou <literal>&lt;map&gt;</literal> requer uma "
@@ -1279,7 +1294,7 @@
 "<literal>inverse=\"true\"</literal> no mapeamento da coleção."
 
 #. Tag: programlisting
-#: collection_mapping.xml:729
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1306,14 +1321,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
-#, no-c-format
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "Mas, se não houver nenhuma propriedade na classe filha, não podemos ver essa "
 "associação como verdadeiramente bidirecional (há uma informação disponível "
@@ -1322,7 +1337,7 @@
 "literal>. Nos devemos usar o seguinte mapeamento:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:738
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1350,35 +1365,34 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:740
-#, no-c-format
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "Veja que neste mapeamento, que um dos lado da associação, a coleção, é "
 "responsável pela atualização da chave estrangeira. TODO: Isso realmente "
 "resulta em updates desnecessários ?."
 
 #. Tag: title
-#: collection_mapping.xml:748
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr "Associações Ternárias"
 
 #. Tag: para
-#: collection_mapping.xml:750
-#, no-c-format
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "Há três meios possíveis de se mapear uma associação ternária. Uma é usar um "
 "<literal>Map</literal> com uma associação como seu índice:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1389,7 +1403,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:757
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1400,44 +1414,43 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:759
-#, no-c-format
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "A segunda maneira é simplesmente remodelar a associação das classes da "
 "entidade. Esta é a maneira que nós usamos de uma maneira geral."
 
 #. Tag: para
-#: collection_mapping.xml:764
-#, no-c-format
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr ""
 "Uma alternativa final é usar os elementos compostos, que nós discutiremos "
 "mais tarde."
 
 #. Tag: literal
-#: collection_mapping.xml:771
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "Usando o &lt;idbag&gt;"
 
 #. Tag: para
-#: collection_mapping.xml:773
-#, no-c-format
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "Se você concorda com nossa visão que chaves compostas são uma coisa ruim e "
 "que as entidades devem ter identificadores sintéticos (surrogate keys), "
@@ -1450,17 +1463,17 @@
 "para muitos com uma coleção de valores para uma tabela com uma surrogate key."
 
 #. Tag: para
-#: collection_mapping.xml:784
-#, no-c-format
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "O elemento <literal>&lt;idbag&gt;</literal> permite mapear um <literal>List</"
 "literal> (ou uma <literal>Collection</literal> com uma semântica de bag."
 
 #. Tag: programlisting
-#: collection_mapping.xml:789
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1473,13 +1486,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:791
-#, no-c-format
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "Como você pode ver, um <literal>&lt;idbag&gt;</literal> possui um gerador de "
 "id sintético, igual uma classe de entidade! Uma surrogate key diferente é "
@@ -1487,13 +1500,13 @@
 "mecanismo para descobrir qual a surrogate key de uma linha em particular."
 
 #. Tag: para
-#: collection_mapping.xml:798
-#, no-c-format
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "Note que o desempenho de atualização de um <literal>&lt;idbag&gt;</literal> "
 "é <emphasis>much</emphasis> melhor que um <literal>&lt;bag&gt;</literal> "
@@ -1501,7 +1514,7 @@
 "atualizar ou deletar individualmente, como um list, map ou set."
 
 #. Tag: para
-#: collection_mapping.xml:805
+#: collection_mapping.xml:837
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1513,23 +1526,26 @@
 "usando o <literal>&lt;idbag&gt;</literal>."
 
 #. Tag: title
-#: collection_mapping.xml:829
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr "Exemplos de coleções"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "Exemplos de coleções"
+
+#. Tag: para
+#: collection_mapping.xml:867
 #, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
+"The following class has a collection of <literal>Child</literal> instances:"
 msgstr ""
-"As seções anteriores são uma grande confusão. Assim sendo vejamos uma "
-"exemplo. Essa classe:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:836
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1551,18 +1567,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:838
-#, no-c-format
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "tem uma coleção de instancias de <literal>Child</literal>. Se cada Child "
 "tiver no máximo um parent, o mapeamento natural é uma associação um para "
 "muitos:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:844
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1588,13 +1604,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:846
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "Esse mapeamento gera a seguinte definição de tabelas"
 
 #. Tag: programlisting
-#: collection_mapping.xml:850
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1604,7 +1620,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:852
+#: collection_mapping.xml:887
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1614,7 +1630,7 @@
 "bidirecional um para muitos:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:857
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1642,13 +1658,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:859
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "Repare na constraint <literal>NOT NULL</literal>:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:863
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1660,19 +1676,19 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:865
-#, no-c-format
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "Uma outra alternativa, no caso de você insistir que esta associação devea "
 "ser unidirecional, você pode declarar a constraint como <literal>NOT NULL</"
 "literal> na tag <literal>&lt;key&gt;</literal> do mapeamento:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:871
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1698,17 +1714,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:873
-#, no-c-format
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr ""
 "Por outro lado, se uma child puder ter os múltiplos parents, a associação "
 "apropriada é muitos-para-muitos:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:878
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1734,13 +1750,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:880
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr "Definições das tabelas:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:884
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1755,11 +1771,11 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:886
-#, no-c-format
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "For more examples and a complete walk-through a parent/child relationship "
 "mapping, see <xref linkend=\"example-parentchild\"/>. Para mais exemplos e "
@@ -1767,16 +1783,27 @@
 "<xref linkend=\"example-parentchild\"/>."
 
 #. Tag: para
-#: collection_mapping.xml:891
-#, no-c-format
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr ""
 "Até mesmo o mapeamento de associações mais exóticas são possíveis, nós "
 "catalogaremos todas as possibilidades no próximo capítulo."
 
+#~ msgid "Collection Mapping"
+#~ msgstr "Mapeamento de Coleções"
+
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr "Some examples, first, a set of strings:"
+
 #~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr ""
+#~ "As seções anteriores são uma grande confusão. Assim sendo vejamos uma "
+#~ "exemplo. Essa classe:"
+
+#~ msgid ""
 #~ "<literal>column_name</literal> (required): The name of the column holding "
 #~ "the collection index values."
 #~ msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: component_mapping.xml:5
+#: component_mapping.xml:29
 #, no-c-format
 msgid "Component Mapping"
 msgstr "Mapeamento de Componentes"
 
 #. Tag: para
-#: component_mapping.xml:7
-#, no-c-format
+#: component_mapping.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "A noção de <emphasis>componente</emphasis> é reusada em vários contextos "
 "diferentes, para propósitos diferentes, pelo Hibernate."
 
 #. Tag: title
-#: component_mapping.xml:13
+#: component_mapping.xml:37
 #, no-c-format
 msgid "Dependent objects"
 msgstr "Objetos dependentes"
 
 #. Tag: para
-#: component_mapping.xml:15
-#, no-c-format
+#: component_mapping.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "Um componente é um objeto contido que é persistido como um tipo de valor, "
 "não uma referência de entidade. O termo \"componente\" refere-se à noção de "
@@ -47,7 +47,7 @@
 "arquitetura). Por exemplo, você pode modelar uma pessoa desta maneira:"
 
 #. Tag: programlisting
-#: component_mapping.xml:21
+#: component_mapping.xml:45
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:23
+#: component_mapping.xml:47
 #, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
@@ -107,13 +107,13 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:25
-#, no-c-format
+#: component_mapping.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "Agora <literal>Name</literal> pode ser persistido como um componente de "
 "<literal>Person</literal>. Note que <literal>Name</literal> define métodos "
@@ -121,13 +121,13 @@
 "declarar nenhuma interface ou propriedades identificadoras."
 
 #. Tag: para
-#: component_mapping.xml:32
-#, no-c-format
-msgid "Our Hibernate mapping would look like:"
+#: component_mapping.xml:56
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "Nosso mapeamento do Hibernate seria semelhante a isso"
 
 #. Tag: programlisting
-#: component_mapping.xml:36
+#: component_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -145,7 +145,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:38
+#: component_mapping.xml:62
 #, no-c-format
 msgid ""
 "The person table would have the columns <literal>pid</literal>, "
@@ -157,16 +157,16 @@
 "literal> and <literal>last</literal>."
 
 #. Tag: para
-#: component_mapping.xml:46
-#, no-c-format
+#: component_mapping.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "Assim como todos tipos por valor, componentes não suportam referencias "
 "cruzadas. Em outras palavras, duas pessoas poderiam possuir o mesmo nome, "
@@ -178,13 +178,13 @@
 "propósitos."
 
 #. Tag: para
-#: component_mapping.xml:55
-#, no-c-format
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "As propriedades de um componente podem ser de qualquer tipo do Hibernate"
 "(collections, associações muitos-para-um, outros componentes, etc). "
@@ -193,7 +193,7 @@
 "bem granulado."
 
 #. Tag: para
-#: component_mapping.xml:62
+#: component_mapping.xml:85
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -205,7 +205,7 @@
 "componente como uma referência de volta para a entidade que a contém."
 
 #. Tag: programlisting
-#: component_mapping.xml:68
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -224,19 +224,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:73
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "Collections de objetos dependentes"
 
 #. Tag: para
-#: component_mapping.xml:75
-#, no-c-format
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "Collections de componentes são suportadadas(ex. uma array de tipo "
 "<literal>Name</literal>). Declare a sua collection de componentes "
@@ -244,7 +244,7 @@
 "composite-element&gt;</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:82
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -258,29 +258,28 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:84
-#, no-c-format
+#: component_mapping.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "Nota: se você definir um <literal>Set</literal> de elementos compostos, é "
 "muito importante implementar <literal>equals()</literal> e <literal>hashCode"
 "()</literal> corretamente."
 
 #. Tag: para
-#: component_mapping.xml:90
-#, no-c-format
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "Elementos compostos podem conter componentes mas não collections. Se o seu "
 "elemento composto contiver componentes , use a tag <literal>&lt;nested-"
@@ -292,17 +291,16 @@
 "relacional e a semântica de persistência ainda são diferentes."
 
 #. Tag: para
-#: component_mapping.xml:102
-#, no-c-format
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "Por favor, note que um mapeamento de elemento composto não suporta "
 "propriedades capazes de serem null se você estiver usando um <literal>&lt;"
@@ -315,14 +313,14 @@
 "<literal>&lt;idbag&gt;</literal>."
 
 #. Tag: para
-#: component_mapping.xml:113
-#, no-c-format
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -335,7 +333,7 @@
 "<literal>quantity</literal> são propriedades da associação:"
 
 #. Tag: programlisting
-#: component_mapping.xml:123
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -354,14 +352,14 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:125
-#, no-c-format
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "Claro, que não pode ter uma referência para purchase no outro lado, para a "
 "navegação da associação bidirecional. Lembre-se que componentes são tipos "
@@ -371,13 +369,13 @@
 "<literal>Item</literal> no mesmo momento."
 
 #. Tag: para
-#: component_mapping.xml:133
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "Até mesmo associações ternárias (ou quaternária, etc) são possíveis:"
 
 #. Tag: programlisting
-#: component_mapping.xml:135
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -393,27 +391,27 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
-#, no-c-format
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr ""
 "Elementos compostos podem aparecer em pesquisas usando a mesma sintaxe assim "
 "como associações para outras entidades."
 
 #. Tag: title
-#: component_mapping.xml:145
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "Componentes como índices de Map"
 
 #. Tag: para
-#: component_mapping.xml:147
-#, no-c-format
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -423,53 +421,59 @@
 "()</literal> corretamente na classe componente."
 
 #. Tag: title
-#: component_mapping.xml:156
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr ". Componentes como identificadores compostos"
 
 #. Tag: para
-#: component_mapping.xml:158
-#, no-c-format
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "Você pode usar um componente como um identificador de uma classe entidade. "
 "Sua classe componente deve satisfazer certos requisitos:"
 
 #. Tag: para
-#: component_mapping.xml:165
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "Ele deve implementar <literal>java.io.Serializable</literal>."
 
 #. Tag: para
-#: component_mapping.xml:170
-#, no-c-format
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "Ele deve re-implementar <literal>equals()</literal> e <literal>hashCode()</"
 "literal>, consistentemente com a noção de igualdade de chave composta do "
 "banco de dados."
 
-#. Tag: emphasis
-#: component_mapping.xml:179
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "Nota: no Hibernate 3, o segundo requisito não é um requisito absolutamente "
 "necessário. Mas atenda ele de qualquer forma."
 
 #. Tag: para
-#: component_mapping.xml:183
-#, no-c-format
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "Você não pode usar um <literal>IdentifierGenerator</literal> para gerar "
@@ -477,11 +481,11 @@
 "identificadores."
 
 #. Tag: para
-#: component_mapping.xml:188
-#, no-c-format
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -493,36 +497,36 @@
 "primária (composta) de <literal>Order</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:196
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:198
-#, no-c-format
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "Agora, qualquer chave estrangeira referenciando a tabela <literal>OrderLine</"
 "literal> também serão compostas. Você deve declarar isto em seus mapeamentos "
@@ -530,7 +534,7 @@
 "mapeada dessa forma:"
 
 #. Tag: programlisting
-#: component_mapping.xml:204
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -542,17 +546,17 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:206
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(Note que a tag <literal>&lt;column&gt;</literal> é uma alternativa para o "
-"atributo <literal>column</literal> por toda a parte.)"
 
 #. Tag: para
-#: component_mapping.xml:211
+#: component_mapping.xml:244
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -562,7 +566,7 @@
 "literal> também usa a chave estrangeira composta:"
 
 #. Tag: programlisting
-#: component_mapping.xml:216
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -576,7 +580,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:218
+#: component_mapping.xml:251
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -586,7 +590,7 @@
 "usaria:"
 
 #. Tag: programlisting
-#: component_mapping.xml:223
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -599,17 +603,15 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:225
-#, no-c-format
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr ""
 "(O elemento <literal>&lt;one-to-many&gt;</literal>, como de costume, não "
 "declara colunas.)"
 
 #. Tag: para
-#: component_mapping.xml:229
+#: component_mapping.xml:262
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -619,7 +621,7 @@
 "chave estrangeira composta."
 
 #. Tag: programlisting
-#: component_mapping.xml:234
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -640,20 +642,20 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:239
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr "Componentes Dinâmicos"
 
 #. Tag: para
-#: component_mapping.xml:241
-#, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr ""
 "Você pode até mesmo mapear uma propriedade do tipo <literal>Map</literal>:"
 
 #. Tag: programlisting
-#: component_mapping.xml:245
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -664,16 +666,16 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:247
-#, no-c-format
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "A semântica de um mapeamento <literal>&lt;dynamic-component&gt;</literal> é "
 "idêntica à <literal>&lt;component&gt;</literal>. A vantagem deste tipo de "
@@ -683,3 +685,10 @@
 "parser DOM. Até melhor, você pode acessar (e mudar) o metamodelo "
 "configuration-time do Hibernate através do objeto <literal>Configuration</"
 "literal>."
+
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(Note que a tag <literal>&lt;column&gt;</literal> é uma alternativa para "
+#~ "o atributo <literal>column</literal> por toda a parte.)"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: configuration.xml:5
+#: configuration.xml:29
 #, no-c-format
 msgid "Configuration"
 msgstr "Configuração"
 
 #. Tag: para
-#: configuration.xml:7
-#, no-c-format
+#: configuration.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "Devido ao fato de o Hibernate ser projetado para operar em vários ambientes "
 "diferentes, há um grande número de parâmetros de configuração. Felizmente, a "
@@ -35,20 +35,20 @@
 "seu classpath e personalize-o."
 
 #. Tag: title
-#: configuration.xml:16
+#: configuration.xml:40
 #, no-c-format
 msgid "Programmatic configuration"
 msgstr "1.11 Configuração programática"
 
 #. Tag: para
-#: configuration.xml:18
-#, no-c-format
+#: configuration.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"An instance of <literal>org.hibernate.cfg.Configuration</literal> represents "
-"an entire set of mappings of an application's Java types to an SQL database. "
-"The <literal>Configuration</literal> is used to build an (immutable) "
-"<literal>SessionFactory</literal>. The mappings are compiled from various "
-"XML mapping files."
+"An instance of <classname>org.hibernate.cfg.Configuration</classname> "
+"represents an entire set of mappings of an application's Java types to an "
+"SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
+"interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "Uma instância de <literal>org.hibernate.cfg.Configuration</literal> "
 "representa um conjunto inteiro de mapeamentos de tipos Java da aplicação "
@@ -57,19 +57,20 @@
 "são compilados a partir de arquivos de mapeamento XML."
 
 #. Tag: para
-#: configuration.xml:26
-#, no-c-format
+#: configuration.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"You may obtain a <literal>Configuration</literal> instance by instantiating "
-"it directly and specifying XML mapping documents. If the mapping files are "
-"in the classpath, use <literal>addResource()</literal>:"
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"instance by instantiating it directly and specifying XML mapping documents. "
+"If the mapping files are in the classpath, use <literal>addResource()</"
+"literal>. For example:"
 msgstr ""
 "Você pode obter uma instância <literal>Configuration</literal> intanciando- "
 "o diretamente e especificando documentos de mapeamento XML. Se o arquivo de "
 "mapeamento estão no classpath, use use <literal>addResource()</literal>:"
 
 #. Tag: programlisting
-#: configuration.xml:32
+#: configuration.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -78,17 +79,17 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:34
-#, no-c-format
+#: configuration.xml:57
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "Uma alternativa (às vezes melhor) é especificar a classe mapeada, e permitir "
 "que o Hibernate encontre o documento de mapeamento para você:"
 
 #. Tag: programlisting
-#: configuration.xml:39
+#: configuration.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -97,12 +98,12 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:41
-#, no-c-format
+#: configuration.xml:64
+#, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <literal>/org/hibernate/"
-"auction/Item.hbm.xml</literal> and <literal>/org/hibernate/auction/Bid.hbm."
-"xml</literal> in the classpath. This approach eliminates any hardcoded "
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
+"auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
+"xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
 msgstr ""
 "Então o Hibernate procurará pelos arquivos de mapeamento chamados <literal>/"
@@ -111,17 +112,17 @@
 "nome de arquivo de difícil compreensão."
 
 #. Tag: para
-#: configuration.xml:48
-#, no-c-format
+#: configuration.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Configuration</literal> also allows you to specify configuration "
-"properties:"
+"A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
+"specify configuration properties. For example:"
 msgstr ""
 "Uma <literal>Configuration</literal> também permite você especificar "
 "propriedades de configuração:"
 
 #. Tag: programlisting
-#: configuration.xml:53
+#: configuration.xml:75
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -135,37 +136,37 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:55
-#, no-c-format
+#: configuration.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr ""
 "Este não é o único caminho para passar as propriedades de configuração para "
 "o Hibernate. As várias opções incluem:"
 
 #. Tag: para
-#: configuration.xml:62
-#, no-c-format
+#: configuration.xml:84
+#, fuzzy, no-c-format
 msgid ""
-"Pass an instance of <literal>java.util.Properties</literal> to "
+"Pass an instance of <classname>java.util.Properties</classname> to "
 "<literal>Configuration.setProperties()</literal>."
 msgstr ""
 "Passar uma instância de <literal>java.util.Properties</literal> para "
 "<literal>Configuration.setProperties()</literal>."
 
 #. Tag: para
-#: configuration.xml:68
-#, no-c-format
+#: configuration.xml:90
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>hibernate.properties</literal> in a root directory of the "
-"classpath."
+"Place a file named <filename>hibernate.properties</filename> in a root "
+"directory of the classpath."
 msgstr ""
 "Colocar <literal>hibernate.properties</literal> no diretório raiz do "
 "classpath."
 
 #. Tag: para
-#: configuration.xml:74
+#: configuration.xml:95
 #, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
@@ -175,11 +176,11 @@
 "-Dproperty=value</literal>."
 
 #. Tag: para
-#: configuration.xml:80
-#, no-c-format
+#: configuration.xml:100
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
 "cfg.xml</literal> (discussed later). Incluir elementos <literal>&lt;"
@@ -187,38 +188,38 @@
 "mais tarde)."
 
 #. Tag: para
-#: configuration.xml:87
+#: configuration.xml:107
 #, no-c-format
 msgid ""
-"<literal>hibernate.properties</literal> is the easiest approach if you want "
-"to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
-"<literal>hibernate.properties</literal> é o caminho mais facil se você quer "
-"começar mais rápido."
 
 #. Tag: para
-#: configuration.xml:92
-#, no-c-format
+#: configuration.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Configuration</literal> is intended as a startup-time object, "
-"to be discarded once a <literal>SessionFactory</literal> is created."
+"The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
+"startup-time object that will be discarded once a <literal>SessionFactory</"
+"literal> is created."
 msgstr ""
 "O <literal>Configuration</literal> é entendido como um objeto startup-time, "
 "é descartado uma vez que a <literal>SessionFactory</literal> é criada."
 
 #. Tag: title
-#: configuration.xml:100
+#: configuration.xml:119
 #, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "Obtendo uma SessionFactory"
 
 #. Tag: para
-#: configuration.xml:102
-#, no-c-format
+#: configuration.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"When all mappings have been parsed by the <literal>Configuration</literal>, "
-"the application must obtain a factory for <literal>Session</literal> "
-"instances. This factory is intended to be shared by all application threads:"
+"When all mappings have been parsed by the <classname>org.hibernate.cfg."
+"Configuration</classname>, the application must obtain a factory for "
+"<interfacename>org.hibernate.Session</interfacename> instances. This factory "
+"is intended to be shared by all application threads:"
 msgstr ""
 "Quando todos os mapeamentos têm sido analisados pelo <literal>Configuration</"
 "literal>, a aplicação deve obter uma factory para as instâncias da "
@@ -226,66 +227,68 @@
 "todas as threads da aplicação:"
 
 #. Tag: programlisting
-#: configuration.xml:108
+#: configuration.xml:127
 #, no-c-format
 msgid "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:110
-#, no-c-format
+#: configuration.xml:129
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does allow your application to instantiate more than one "
-"<literal>SessionFactory</literal>. This is useful if you are using more than "
-"one database."
+"<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful "
+"if you are using more than one database."
 msgstr ""
 "Hibernate permite sua aplicação instanciar mais do que uma "
 "<literal>SessionFactory</literal>. Isto é útil se você está usando mais do "
 "que um banco de dados."
 
 #. Tag: title
-#: configuration.xml:119
+#: configuration.xml:138
 #, no-c-format
 msgid "JDBC connections"
 msgstr "Conexões JDBC"
 
 #. Tag: para
-#: configuration.xml:121
-#, no-c-format
+#: configuration.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <literal>SessionFactory</literal> create and "
-"pool JDBC connections for you. If you take this approach, opening a "
-"<literal>Session</literal> is as simple as:"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
+"interfacename> create and pool JDBC connections for you. If you take this "
+"approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
+"as simple as:"
 msgstr ""
 "Normalmente, você quer mandar criar a <literal>SessionFactory</literal> "
 "criar um pool de conexões JDBC para você. Se você seguir essa abordagem, a "
 "abertura de uma <literal>Session</literal> é tão simples quanto:"
 
 #. Tag: programlisting
-#: configuration.xml:127
+#: configuration.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:129
-#, no-c-format
+#: configuration.xml:148
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "Assim que você fizer algo que requer o acesso ao banco de dados, uma conexão "
 "JDBC será obtida do pool."
 
 #. Tag: para
-#: configuration.xml:134
-#, no-c-format
+#: configuration.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <literal>org.hibernate.cfg.Environment</literal>. We will now describe "
-"the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "Para esse trabalho, nós necessitamos passar algumas propriedades da conexão "
 "JDBC para o Hibernate. Todos os nomes de propriedades Hibernate e semânticas "
@@ -293,108 +296,108 @@
 "descrever agora o mais importantes configurações de conexão JDBC."
 
 #. Tag: para
-#: configuration.xml:141
-#, no-c-format
+#: configuration.xml:159
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <literal>java.sql."
-"DriverManager</literal> if you set the following properties:"
+"Hibernate will obtain and pool connections using <classname>java.sql."
+"DriverManager</classname> if you set the following properties:"
 msgstr ""
 "O Hibernate obterá conexões( e pool) usando <literal>java.sql.DriverManager</"
 "literal> se você determinar as seguintes propriedades:"
 
 #. Tag: title
-#: configuration.xml:147
+#: configuration.xml:165
 #, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Propriedades JDBC Hibernate"
 
 #. Tag: entry
-#: configuration.xml:153 configuration.xml:241 configuration.xml:338
-#: configuration.xml:529 configuration.xml:725 configuration.xml:832
-#: configuration.xml:920
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353
+#: configuration.xml:548 configuration.xml:743 configuration.xml:850
+#: configuration.xml:938
 #, no-c-format
 msgid "Property name"
 msgstr "Nome da Propriedade"
 
 #. Tag: entry
-#: configuration.xml:154 configuration.xml:242 configuration.xml:339
-#: configuration.xml:530 configuration.xml:726 configuration.xml:833
-#: configuration.xml:921
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354
+#: configuration.xml:549 configuration.xml:744 configuration.xml:851
+#: configuration.xml:939
 #, no-c-format
 msgid "Purpose"
 msgstr "Propósito"
 
-#. Tag: literal
-#: configuration.xml:160
+#. Tag: property
+#: configuration.xml:178
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: emphasis
-#: configuration.xml:163
+#: configuration.xml:181
 #, no-c-format
 msgid "JDBC driver class"
 msgstr "Classe driver jdbc"
 
-#. Tag: literal
-#: configuration.xml:168
+#. Tag: property
+#: configuration.xml:186
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: emphasis
-#: configuration.xml:171
+#: configuration.xml:189
 #, no-c-format
 msgid "JDBC URL"
 msgstr "URL jdbc"
 
-#. Tag: literal
-#: configuration.xml:176 configuration.xml:272
+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: emphasis
-#: configuration.xml:179
+#: configuration.xml:197
 #, no-c-format
 msgid "database user"
 msgstr "Usuário do banco de dados"
 
-#. Tag: literal
-#: configuration.xml:184 configuration.xml:280
+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: emphasis
-#: configuration.xml:187
+#: configuration.xml:205
 #, no-c-format
 msgid "database user password"
 msgstr "Senha do usuário do banco de dados"
 
-#. Tag: literal
-#: configuration.xml:192
+#. Tag: property
+#: configuration.xml:210
 #, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr "hibernate.connection.pool_size"
 
 #. Tag: emphasis
-#: configuration.xml:195
+#: configuration.xml:213
 #, no-c-format
 msgid "maximum number of pooled connections"
 msgstr "Número máximo de connecxões no pool"
 
 #. Tag: para
-#: configuration.xml:202
-#, no-c-format
+#: configuration.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
-"replace the <literal>hibernate.connection.pool_size</literal> property with "
-"connection pool specific settings. This will turn off Hibernate's internal "
-"pool. For example, you might like to use C3P0."
+"replace the <property>hibernate.connection.pool_size</property> property "
+"with connection pool specific settings. This will turn off Hibernate's "
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "O algoritmo de pool de conexões do próprio Hibernate entretanto é "
 "completamente rudimentar. A intenção dele e ajudar a iniciar e <emphasis>não "
@@ -406,15 +409,16 @@
 "pode gostar de usar C3P0."
 
 #. Tag: para
-#: configuration.xml:212
-#, no-c-format
+#: configuration.xml:230
+#, fuzzy, no-c-format
 msgid ""
 "C3P0 is an open source JDBC connection pool distributed along with Hibernate "
-"in the <literal>lib</literal> directory. Hibernate will use its "
-"<literal>C3P0ConnectionProvider</literal> for connection pooling if you set "
-"<literal>hibernate.c3p0.*</literal> properties. If you'd like to use Proxool "
-"refer to the packaged <literal>hibernate.properties</literal> and the "
-"Hibernate web site for more information."
+"in the <filename>lib</filename> directory. Hibernate will use its "
+"<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
+"connection pooling if you set <property>hibernate.c3p0.*</property> "
+"properties. If you would like to use Proxool, refer to the packaged "
+"<filename>hibernate.properties</filename> and the Hibernate web site for "
+"more information."
 msgstr ""
 "O C3P0 é um pool conexão JDBC de código aberto distribuído junto com "
 "Hibernate no diretório <literal>lib</literal>. O Hibernate usará o "
@@ -424,16 +428,17 @@
 "o web site do Hibernate para mais informações."
 
 #. Tag: para
-#: configuration.xml:221
-#, no-c-format
+#: configuration.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Here is an example <literal>hibernate.properties</literal> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr ""
 "Aqui é um exemplo de arquivo <literal>hibernate.properties</literal> para "
 "C3P0:"
 
 #. Tag: programlisting
-#: configuration.xml:225
+#: configuration.xml:242
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
@@ -448,13 +453,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:227
-#, no-c-format
+#: configuration.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<literal>Datasource</literal> registered in JNDI. You'll need to set at "
-"least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "Para usar dentro de um servidor de aplicação, você deve configurar o "
 "Hibernate para obter conexões de um application server <literal>Datasource</"
@@ -462,43 +467,43 @@
 "seguintes propriedades:"
 
 #. Tag: title
-#: configuration.xml:235
+#: configuration.xml:251
 #, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Propriedades do Datasource do Hibernate"
 
-#. Tag: literal
-#: configuration.xml:248
+#. Tag: property
+#: configuration.xml:264
 #, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr "hibernate.connection.datasource"
 
 #. Tag: emphasis
-#: configuration.xml:251
+#: configuration.xml:267
 #, no-c-format
 msgid "datasource JNDI name"
 msgstr "Nome datasource JNDI"
 
-#. Tag: literal
-#: configuration.xml:256
+#. Tag: property
+#: configuration.xml:272
 #, no-c-format
 msgid "hibernate.jndi.url"
 msgstr "hibernate.jndi.url"
 
 #. Tag: entry
-#: configuration.xml:258
+#: configuration.xml:274
 #, fuzzy, no-c-format
 msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr "URL do fornecedor JNDI"
 
-#. Tag: literal
-#: configuration.xml:264
+#. Tag: property
+#: configuration.xml:280
 #, no-c-format
 msgid "hibernate.jndi.class"
 msgstr "hibernate.jndi.class"
 
 #. Tag: entry
-#: configuration.xml:266
+#: configuration.xml:282
 #, no-c-format
 msgid ""
 "<emphasis>class of the JNDI <literal>InitialContextFactory</literal></"
@@ -506,29 +511,29 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:274
+#: configuration.xml:290
 #, no-c-format
 msgid "<emphasis>database user</emphasis> (optional)"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:282
+#: configuration.xml:298
 #, no-c-format
 msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:290
-#, no-c-format
+#: configuration.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example <literal>hibernate.properties</literal> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "Eis um exemplo de arquivo <literal>hibernate.properties</literal> para um "
 "servidor de aplicação fornecedor de datasources JNDI:"
 
 #. Tag: programlisting
-#: configuration.xml:295
+#: configuration.xml:311
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
@@ -540,7 +545,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:297
+#: configuration.xml:313
 #, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
@@ -551,13 +556,13 @@
 "aplicação."
 
 #. Tag: para
-#: configuration.xml:302
-#, no-c-format
+#: configuration.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
-"\"<literal>hibernate.connection</literal>\" to the property name. For "
-"example, you may specify a <literal>charSet</literal> using "
-"<literal>hibernate.connection.charSet</literal>."
+"Arbitrary connection properties can be given by prepending "
+"\"<literal>hibernate.connection</literal>\" to the connection property name. "
+"For example, you can specify a <property>charSet</property> connection "
+"property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "Arbitrariamente as propriedades de conexão podem ser acrescentandas ao "
 "\"<literal>hibernate.connnection</literal>\" ao nome da propriedade. Por "
@@ -565,13 +570,14 @@
 "<literal>hibernate.connection.charSet</literal>.t."
 
 #. Tag: para
-#: configuration.xml:308
-#, no-c-format
+#: configuration.xml:324
+#, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
-"implementing the interface <literal>org.hibernate.connection."
-"ConnectionProvider</literal>. You may select a custom implementation by "
-"setting <literal>hibernate.connection.provider_class</literal>."
+"You can define your own plugin strategy for obtaining JDBC connections by "
+"implementing the interface <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>, and specifying your custom "
+"implementation via the <property>hibernate.connection.provider_class</"
+"property> property."
 msgstr ""
 "Você pode definir sua própria estratégia de plugin para obter conexões JDBC "
 "implementando a interface <literal>org.hibernate.connection."
@@ -579,30 +585,30 @@
 "customizada setando <literal>hibernate.connection.provider_class</literal>."
 
 #. Tag: title
-#: configuration.xml:317
+#: configuration.xml:333
 #, no-c-format
 msgid "Optional configuration properties"
 msgstr "Propriedades opcionais de configuração"
 
 #. Tag: para
-#: configuration.xml:319
-#, no-c-format
+#: configuration.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "Há um grande número de outras propriedades que controlam o comportamento do "
 "Hibernate em tempo de execução. Todos são opcionais e tem valores default "
 "lógicos."
 
-#. Tag: para
-#: configuration.xml:324
-#, no-c-format
+#. Tag: warning
+#: configuration.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <literal>hibernate.properties</literal>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>Aviso: algumas destas propriedades são somente a \"nível de sistema"
 "\".</emphasis> Propriedades nível de sistema podem ser determinados somente "
@@ -611,33 +617,34 @@
 "por outras técnicas descritas abaixo."
 
 #. Tag: title
-#: configuration.xml:332
+#: configuration.xml:347
 #, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Hibernate Configuration Properties"
 
-#. Tag: literal
-#: configuration.xml:345
+#. Tag: property
+#: configuration.xml:360
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: configuration.xml:347
+#: configuration.xml:362
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a Hibernate <literal>Dialect</literal> which allows "
-"Hibernate to generate SQL optimized for a particular relational database."
+"The classname of a Hibernate <classname>org.hibernate.dialect.Dialect</"
+"classname> which allows Hibernate to generate SQL optimized for a particular "
+"relational database."
 msgstr ""
 "O nome da classe de um <placeholder-1/> que permite o Hibernate gerar SQL "
 "otimizado para um banco de dados relacional em particular. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:351
+#: configuration.xml:365
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -679,14 +686,23 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:359
+#. Tag: para
+#: configuration.xml:369
 #, no-c-format
+msgid ""
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
+msgstr ""
+
+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr "hibernate.show_sql"
 
 #. Tag: entry
-#: configuration.xml:361
+#: configuration.xml:380
 #, fuzzy, no-c-format
 msgid ""
 "Write all SQL statements to console. This is an alternative to setting the "
@@ -698,14 +714,14 @@
 "<placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:365 configuration.xml:377 configuration.xml:471
-#: configuration.xml:484 configuration.xml:497 configuration.xml:510
-#: configuration.xml:564 configuration.xml:591 configuration.xml:605
-#: configuration.xml:660 configuration.xml:888 configuration.xml:903
-#: configuration.xml:993
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490
+#: configuration.xml:503 configuration.xml:516 configuration.xml:529
+#: configuration.xml:583 configuration.xml:610 configuration.xml:623
+#: configuration.xml:678 configuration.xml:906 configuration.xml:921
+#: configuration.xml:1011
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -748,26 +764,26 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:373
+#. Tag: property
+#: configuration.xml:392
 #, no-c-format
 msgid "hibernate.format_sql"
 msgstr "hibernate.format_sql"
 
 #. Tag: entry
-#: configuration.xml:375
+#: configuration.xml:394
 #, fuzzy, no-c-format
 msgid "Pretty print the SQL in the log and console."
 msgstr "Imprime o SQL formatado no log e console. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:385
+#. Tag: property
+#: configuration.xml:404
 #, no-c-format
 msgid "hibernate.default_schema"
 msgstr "hibernate.default_schema"
 
 #. Tag: entry
-#: configuration.xml:387
+#: configuration.xml:406
 #, fuzzy, no-c-format
 msgid ""
 "Qualify unqualified table names with the given schema/tablespace in "
@@ -777,9 +793,10 @@
 "tablespace dado <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:390
+#: configuration.xml:409
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -821,26 +838,26 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:398
+#. Tag: property
+#: configuration.xml:417
 #, no-c-format
 msgid "hibernate.default_catalog"
 msgstr "hibernate.default_catalog"
 
 #. Tag: entry
-#: configuration.xml:400
+#: configuration.xml:419
 #, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 "Qualifica no sql gerado, os nome das tabelas sem qualificar com catálogo "
 "dado <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:403
+#: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -882,27 +899,27 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:411
+#. Tag: property
+#: configuration.xml:430
 #, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr "hibernate.session_factory_name"
 
 #. Tag: entry
-#: configuration.xml:413
+#: configuration.xml:432
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>SessionFactory</literal> will be automatically bound to this "
-"name in JNDI after it has been created."
+"The <interfacename>org.hibernate.SessionFactory</interfacename> will be "
+"automatically bound to this name in JNDI after it has been created."
 msgstr ""
 "O <placeholder-1/> irá automaticamente se ligar a este nome no JNDI depois "
 "de ter sido criado. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:416 configuration.xml:859
+#: configuration.xml:435 configuration.xml:877
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -945,17 +962,17 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:424
+#. Tag: property
+#: configuration.xml:443
 #, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr "hibernate.max_fetch_depth"
 
 #. Tag: entry
-#: configuration.xml:426
+#: configuration.xml:445
 #, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -964,57 +981,57 @@
 "desativa por default a busca outer join. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:430
-#, no-c-format
+#: configuration.xml:449
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">eg.</emphasis> Valores recomendados "
 "entre<literal>0</literal> e <literal>3</literal>"
 
-#. Tag: literal
-#: configuration.xml:439
+#. Tag: property
+#: configuration.xml:458
 #, no-c-format
 msgid "hibernate.default_batch_fetch_size"
 msgstr "hibernate.default_batch_fetch_size"
 
 #. Tag: entry
-#: configuration.xml:441
+#: configuration.xml:460
 #, fuzzy, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr ""
 "Determina um tamanho default para busca de associações em lotes do Hibernate "
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:443
-#, no-c-format
+#: configuration.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">eg.</emphasis> Valores recomendados <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 
-#. Tag: literal
-#: configuration.xml:452
+#. Tag: property
+#: configuration.xml:471
 #, no-c-format
 msgid "hibernate.default_entity_mode"
 msgstr "hibernate.default_entity_mode"
 
 #. Tag: entry
-#: configuration.xml:454
+#: configuration.xml:473
 #, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "Determina um modo default para representação de entidades para todas as "
 "sessões abertas desta <placeholder-1/><placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:457
+#: configuration.xml:476
 #, no-c-format
 msgid ""
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
@@ -1023,17 +1040,17 @@
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
 "literal>"
 
-#. Tag: literal
-#: configuration.xml:465
+#. Tag: property
+#: configuration.xml:484
 #, no-c-format
 msgid "hibernate.order_updates"
 msgstr "hibernate.order_updates"
 
 #. Tag: entry
-#: configuration.xml:467
+#: configuration.xml:486
 #, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
@@ -1041,14 +1058,14 @@
 "itens a serem atualizados. Isto resultará em menos deadlocks nas transações "
 "em sistemas altamente concorrente. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:479
+#. Tag: property
+#: configuration.xml:498
 #, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr "hibernate.generate_statistics"
 
 #. Tag: entry
-#: configuration.xml:481
+#: configuration.xml:500
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, Hibernate will collect statistics useful for performance tuning."
@@ -1057,14 +1074,14 @@
 "Se habilitado, o Hibernate coletará estatísticas úties para performance "
 "tuning dos bancos. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:492
+#. Tag: property
+#: configuration.xml:511
 #, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr "hibernate.use_identifer_rollback"
 
 #. Tag: entry
-#: configuration.xml:494
+#: configuration.xml:513
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, generated identifier properties will be reset to default values "
@@ -1073,14 +1090,14 @@
 "Se habilitado, propriedades identificadoras geradas serão zeradas para os "
 "valores default quando os objetos forem apagados. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:505
+#. Tag: property
+#: configuration.xml:524
 #, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr "hibernate.use_sql_comments"
 
 #. Tag: entry
-#: configuration.xml:507
+#: configuration.xml:526
 #, fuzzy, no-c-format
 msgid ""
 "If turned on, Hibernate will generate comments inside the SQL, for easier "
@@ -1090,19 +1107,19 @@
 "debugging, o valor default é <placeholder-1/>. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:521
+#: configuration.xml:540
 #, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "JDBC Hibernate e Propriedades de Conexão"
 
-#. Tag: literal
-#: configuration.xml:536
+#. Tag: property
+#: configuration.xml:555
 #, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr "hibernate.jdbc.fetch_size"
 
 #. Tag: entry
-#: configuration.xml:538
+#: configuration.xml:557
 #, fuzzy, no-c-format
 msgid ""
 "A non-zero value determines the JDBC fetch size (calls <literal>Statement."
@@ -1111,14 +1128,14 @@
 "Um valor maior que zero determina o tamanho do fetch do JDBC( chamadas "
 "<placeholder-1/>)."
 
-#. Tag: literal
-#: configuration.xml:545
+#. Tag: property
+#: configuration.xml:564
 #, no-c-format
 msgid "hibernate.jdbc.batch_size"
 msgstr "hibernate.jdbc.batch_size"
 
 #. Tag: entry
-#: configuration.xml:547
+#: configuration.xml:566
 #, fuzzy, no-c-format
 msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr ""
@@ -1126,28 +1143,28 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:549
-#, no-c-format
+#: configuration.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">Ex.</emphasis> valores recomentados entre "
 "<literal>5</literal> e <literal>30</literal>"
 
-#. Tag: literal
-#: configuration.xml:557
+#. Tag: property
+#: configuration.xml:576
 #, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr "hibernate.jdbc.batch_versioned_data"
 
 #. Tag: entry
-#: configuration.xml:559
+#: configuration.xml:578
 #, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "Sete esta propriedade como <placeholder-1/> se seu driver JDBC retorna o "
@@ -1156,27 +1173,27 @@
 "automaticamente versionar dados. <placeholder-3/> por default. <placeholder-"
 "4/>"
 
-#. Tag: literal
-#: configuration.xml:572
+#. Tag: property
+#: configuration.xml:591
 #, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr "hibernate.jdbc.factory_class"
 
 #. Tag: entry
-#: configuration.xml:574
+#: configuration.xml:593
 #, fuzzy, no-c-format
 msgid ""
-"Select a custom <literal>Batcher</literal>. Most applications will not need "
-"this configuration property."
+"Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfacename>. "
+"Most applications will not need this configuration property."
 msgstr ""
 "Escolher um <placeholder-1/> customizado. Muitas aplicações não irão "
 "necessitar desta propriedade de configuração <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:577
+#: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1219,18 +1236,18 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:585
+#. Tag: property
+#: configuration.xml:604
 #, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr "hibernate.jdbc.use_scrollable_resultset"
 
 #. Tag: entry
-#: configuration.xml:587
+#: configuration.xml:606
 #, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "Habilita o uso de JDBC2 scrollable resultsets pelo Hibernate. Essa "
@@ -1238,36 +1255,37 @@
 "usuário, caso contrário o Hibernate os os metadados da conexão. <placeholder-"
 "1/>"
 
-#. Tag: literal
-#: configuration.xml:599
+#. Tag: property
+#: configuration.xml:618
 #, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr "hibernate.jdbc.use_streams_for_binary"
 
 #. Tag: entry
-#: configuration.xml:601
+#: configuration.xml:620
 #, fuzzy, no-c-format
 msgid ""
 "Use streams when writing/reading <literal>binary</literal> or "
-"<literal>serializable</literal> types to/from JDBC (system-level property)."
+"<literal>serializable</literal> types to/from JDBC. <emphasis>*system-level "
+"property*</emphasis>"
 msgstr ""
 "Use streams para escrever/ler tipos <placeholder-1/> ou <placeholder-2/> "
 "para/a o JDBC( propriedade a nível de sistema). <placeholder-3/>"
 
-#. Tag: literal
-#: configuration.xml:613
+#. Tag: property
+#: configuration.xml:631
 #, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr "hibernate.jdbc.use_get_generated_keys"
 
 #. Tag: entry
-#: configuration.xml:615
+#: configuration.xml:633
 #, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "Possibilita o uso <placeholder-1/> do JDBC3 para recuperar chaves geradas "
@@ -1277,10 +1295,10 @@
 "conexão. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:621 configuration.xml:751 configuration.xml:763
-#: configuration.xml:777 configuration.xml:815
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781
+#: configuration.xml:795 configuration.xml:833
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -1322,27 +1340,28 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:629
+#. Tag: property
+#: configuration.xml:647
 #, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr "hibernate.connection.provider_class"
 
 #. Tag: entry
-#: configuration.xml:631
+#: configuration.xml:649
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a custom <literal>ConnectionProvider</literal> which "
-"provides JDBC connections to Hibernate."
+"The classname of a custom <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename> which provides JDBC connections to "
+"Hibernate."
 msgstr ""
 "O nome da classe de um <placeholder-1/> personalizado o qual proverá "
 "conexões JDBC para o Hibernate. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:634
+#: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1385,28 +1404,29 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:642
+#. Tag: property
+#: configuration.xml:660
 #, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr "hibernate.connection.isolation"
 
 #. Tag: entry
-#: configuration.xml:644
+#: configuration.xml:662
 #, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <literal>java.sql."
-"Connection</literal> for meaningful values but note that most databases do "
-"not support all isolation levels."
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
+"databases do not support all isolation levels and some define additional, "
+"non-standard isolations."
 msgstr ""
 "Determina o nível de isolamento de uma transação JDBC. Verifique "
 "<placeholder-1/> para valores siginificativos mas note que a maior parte dos "
 "bancos de dados não suportam todos os níveis de isolamento. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:648
+#: configuration.xml:666
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -1448,40 +1468,39 @@
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:656
+#. Tag: property
+#: configuration.xml:674
 #, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr "hibernate.connection.autocommit"
 
 #. Tag: entry
-#: configuration.xml:658
+#: configuration.xml:676
 #, fuzzy, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "Habilita autocommit para conexões no pool JDBC( não recomendado). "
 "<placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:668
+#. Tag: property
+#: configuration.xml:686
 #, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr "hibernate.connection.release_mode"
 
 #. Tag: entry
-#: configuration.xml:670
+#: configuration.xml:688
 #, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "Especifica quando o Hibernate deve liberar conexões JDBC. Por default, uma "
 "conexão JDBC é retida até a sessão está explicitamente fechada ou "
@@ -1494,11 +1513,11 @@
 "><placeholder-7/>"
 
 #. Tag: para
-#: configuration.xml:681
+#: configuration.xml:699
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">Ex.</emphasis><literal>auto</literal> (default) | "
@@ -1506,11 +1525,11 @@
 "<literal>after_statement</literal>"
 
 #. Tag: para
-#: configuration.xml:686
+#: configuration.xml:704
 #, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -1525,15 +1544,15 @@
 "\"/>"
 
 #. Tag: entry
-#: configuration.xml:697
+#: configuration.xml:715
 #, no-c-format
 msgid ""
-"<literal>hibernate.connection.</literal><emphasis>&lt;propertyName&gt;</"
+"<property>hibernate.connection.</property><emphasis>&lt;propertyName&gt;</"
 "emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:700
+#: configuration.xml:718
 #, no-c-format
 msgid ""
 "Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to "
@@ -1541,14 +1560,14 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:706
+#: configuration.xml:724
 #, no-c-format
 msgid ""
-"<literal>hibernate.jndi.</literal><emphasis>&lt;propertyName&gt;</emphasis>"
+"<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;</emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:709
+#: configuration.xml:727
 #, no-c-format
 msgid ""
 "Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI "
@@ -1556,28 +1575,28 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:719
+#: configuration.xml:737
 #, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Propriedades de Cachê do Hibernate"
 
 #. Tag: literal
-#: configuration.xml:732
+#: configuration.xml:750
 #, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr "hibernate.cache.provider_class"
 
 #. Tag: entry
-#: configuration.xml:734
+#: configuration.xml:752
 #, fuzzy, no-c-format
 msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr "O nome da classe de um <placeholder-1/> customizado. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:736
+#: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1621,16 +1640,16 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:744
+#: configuration.xml:762
 #, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr "hibernate.cache.use_minimal_puts"
 
 #. Tag: entry
-#: configuration.xml:746
+#: configuration.xml:764
 #, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1640,31 +1659,31 @@
 "de cachê clusterizar. <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:759
+#: configuration.xml:777
 #, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr "hibernate.cache.use_query_cache"
 
 #. Tag: entry
-#: configuration.xml:761
+#: configuration.xml:779
 #, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr ""
 "Habilita a cache de consultas, Mesmo assim, consultas individuais ainda tem "
 "que ser habilitadas para o cache. <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:771
+#: configuration.xml:789
 #, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr "hibernate.cache.use_second_level_cache"
 
 #. Tag: entry
-#: configuration.xml:773
+#: configuration.xml:791
 #, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1673,13 +1692,13 @@
 "<placeholder-1/>. <placeholder-2/>"
 
 #. Tag: literal
-#: configuration.xml:785
+#: configuration.xml:803
 #, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr "hibernate.cache.query_cache_factory"
 
 #. Tag: entry
-#: configuration.xml:787
+#: configuration.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a custom <literal>QueryCache</literal> interface, defaults "
@@ -1690,10 +1709,10 @@
 "<placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:790
+#: configuration.xml:808
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1737,13 +1756,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:798
+#: configuration.xml:816
 #, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr "hibernate.cache.region_prefix"
 
 #. Tag: entry
-#: configuration.xml:800
+#: configuration.xml:818
 #, fuzzy, no-c-format
 msgid "A prefix to use for second-level cache region names."
 msgstr ""
@@ -1751,9 +1770,9 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:802
+#: configuration.xml:820
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">Ex.</emphasis><literal>true</literal> | "
@@ -1796,13 +1815,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:810
+#: configuration.xml:828
 #, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr "hibernate.cache.use_structured_entries"
 
 #. Tag: entry
-#: configuration.xml:812
+#: configuration.xml:830
 #, fuzzy, no-c-format
 msgid ""
 "Forces Hibernate to store data in the second-level cache in a more human-"
@@ -1813,19 +1832,19 @@
 "em um formato mais legivel. <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:826
+#: configuration.xml:844
 #, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Propriedades de Transação do Hibernate"
 
 #. Tag: literal
-#: configuration.xml:839
+#: configuration.xml:857
 #, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr "hibernate.transaction.factory_class"
 
 #. Tag: entry
-#: configuration.xml:841
+#: configuration.xml:859
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a <literal>TransactionFactory</literal> to use with "
@@ -1836,10 +1855,10 @@
 "( por default <placeholder-3/>). <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:845
+#: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1883,13 +1902,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:853
+#: configuration.xml:871
 #, no-c-format
 msgid "jta.UserTransaction"
 msgstr "jta.UserTransaction"
 
 #. Tag: entry
-#: configuration.xml:855
+#: configuration.xml:873
 #, fuzzy, no-c-format
 msgid ""
 "A JNDI name used by <literal>JTATransactionFactory</literal> to obtain the "
@@ -1899,28 +1918,28 @@
 "a partir do servidor de aplicação. <placeholder-3/>"
 
 #. Tag: literal
-#: configuration.xml:867
+#: configuration.xml:885
 #, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr "hibernate.transaction.manager_lookup_class"
 
 #. Tag: entry
-#: configuration.xml:869
+#: configuration.xml:887
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "O nome da classe de um <placeholder-1/> – requerido quando caching a nível "
 "JVM esta habilitado ou quando estivermos usando um generator hilo em um "
 "ambiente JTA. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:873
+#: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1964,13 +1983,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:881
+#: configuration.xml:899
 #, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr "hibernate.transaction.flush_before_completion"
 
 #. Tag: entry
-#: configuration.xml:883
+#: configuration.xml:901
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically flushed during the before "
@@ -1984,17 +2003,17 @@
 "><placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:896
+#: configuration.xml:914
 #, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr "hibernate.transaction.auto_close_session"
 
 #. Tag: entry
-#: configuration.xml:898
+#: configuration.xml:916
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -2004,22 +2023,22 @@
 "><placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:914
+#: configuration.xml:932
 #, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "Propriedades Variadas"
 
 #. Tag: literal
-#: configuration.xml:927
+#: configuration.xml:945
 #, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr "hibernate.current_session_context_class"
 
 #. Tag: entry
-#: configuration.xml:929
+#: configuration.xml:947
 #, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -2028,10 +2047,10 @@
 "mais informação sobre estratégias internas. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:934
+#: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -2040,22 +2059,22 @@
 "Class</literal>"
 
 #. Tag: literal
-#: configuration.xml:943
+#: configuration.xml:961
 #, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr "hibernate.query.factory_class"
 
 #. Tag: entry
-#: configuration.xml:945
+#: configuration.xml:963
 #, fuzzy, no-c-format
 msgid "Chooses the HQL parser implementation."
 msgstr "Escolha a implementação de análise HQL. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:947
+#: configuration.xml:965
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -2064,26 +2083,26 @@
 "ClassicQueryTranslatorFactory</literal>"
 
 #. Tag: literal
-#: configuration.xml:956
+#: configuration.xml:974
 #, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr "hibernate.query.substitutions"
 
 #. Tag: entry
-#: configuration.xml:958
+#: configuration.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "Mapeamento a partir de símbolos em consultas HQL para símbolos SQL( símbolos "
 "devem ser funções ou nome literais , por exemplo). <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:961
+#: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2127,16 +2146,16 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:969
+#: configuration.xml:987
 #, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr "hibernate.hbm2ddl.auto"
 
 #. Tag: entry
-#: configuration.xml:971
+#: configuration.xml:989
 #, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -2147,10 +2166,10 @@
 "<placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:977
+#: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
@@ -2159,19 +2178,19 @@
 "drop</literal>"
 
 #. Tag: literal
-#: configuration.xml:986
+#: configuration.xml:1004
 #, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr "hibernate.cglib.use_reflection_optimizer"
 
 #. Tag: entry
-#: configuration.xml:988
+#: configuration.xml:1006
 #, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "Habilita o uso de CGLIB em vez de reflexão em tempo de execução "
 "( propriedade a nível de sistema). Reflexão pode algumas vezes ser ú til "
@@ -2180,20 +2199,20 @@
 "propriedade no <placeholder-1/>. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:1004
+#: configuration.xml:1022
 #, no-c-format
 msgid "SQL Dialects"
 msgstr "Dialetos SQL"
 
 #. Tag: para
-#: configuration.xml:1006
-#, no-c-format
+#: configuration.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "Você deve sempre determinar a propriedade <literal>hibernate.dialect</"
 "literal> para a subclasse de <literal>org.hibernate.dialect.Dialect</"
@@ -2202,19 +2221,19 @@
 "listadas abaixo, reduzindo o esforço de especificá-los manualmente."
 
 #. Tag: title
-#: configuration.xml:1014
+#: configuration.xml:1032
 #, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 
 #. Tag: entry
-#: configuration.xml:1022
+#: configuration.xml:1040
 #, no-c-format
 msgid "RDBMS"
 msgstr "RDBMS"
 
 #. Tag: entry
-#: configuration.xml:1023
+#: configuration.xml:1041
 #, fuzzy, no-c-format
 msgid "Dialect"
 msgstr ""
@@ -2224,286 +2243,298 @@
 "Dialect"
 
 #. Tag: entry
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "<entry>DB2</entry>"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr "org.hibernate.dialect.DB2Dialect"
 
 #. Tag: entry
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "DB2 AS/400"
 msgstr "DB2 AS/400"
 
 #. Tag: literal
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr "org.hibernate.dialect.DB2400Dialect"
 
 #. Tag: entry
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "DB2 OS390"
 msgstr "DB2 OS390"
 
 #. Tag: literal
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr "org.hibernate.dialect.DB2390Dialect"
 
 #. Tag: entry
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "PostgreSQL"
 msgstr "PostgreSQL"
 
 #. Tag: literal
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr "org.hibernate.dialect.PostgreSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "MySQL"
 msgstr "MySQL"
 
 #. Tag: literal
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr "org.hibernate.dialect.MySQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "MySQL with InnoDB"
 msgstr "MySQL with InnoDB"
 
 #. Tag: literal
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr "org.hibernate.dialect.MySQLInnoDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "MySQL with MyISAM"
 msgstr "MySQL with MyISAM"
 
 #. Tag: literal
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr "org.hibernate.dialect.MySQLMyISAMDialect"
 
 #. Tag: entry
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "Oracle (any version)"
 msgstr "Oracle (any version)"
 
 #. Tag: literal
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr "org.hibernate.dialect.OracleDialect"
 
 #. Tag: entry
-#: configuration.xml:1052
-#, no-c-format
-msgid "Oracle 9i/10g"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
-#: configuration.xml:1052
-#, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
-#: configuration.xml:1055
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1055
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1100
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "Recuperação por união externa (Outer Join Fetching)"
 
 #. Tag: para
-#: configuration.xml:1102
-#, no-c-format
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "Se seu banco de dados suporta Recuperação por união externa (Outer Join "
 "Fetching) no estilo ANSI, Oracle ou Sybase, A recuperação por união externa "
@@ -2516,13 +2547,13 @@
 "instrução SQL SELECT ."
 
 #. Tag: para
-#: configuration.xml:1111
-#, no-c-format
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "A recuperação por união externa (Outer Join Fetching) pode ser desabilitado "
@@ -2532,23 +2563,23 @@
 "umos cujos quais tem sido mapeado com <literal>fetch=\"join\"</literal>."
 
 #. Tag: para
-#: configuration.xml:1119
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr "Veja <xref linkend=\"performance-fetching\"/> para mais informações."
 
 #. Tag: title
-#: configuration.xml:1126
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr "Fluxos Binários (Binary Streams)"
 
 #. Tag: para
-#: configuration.xml:1128
-#, no-c-format
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -2561,18 +2592,18 @@
 "emphasis>"
 
 #. Tag: title
-#: configuration.xml:1139
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "Cachê de segundo nível e query"
 
 #. Tag: para
-#: configuration.xml:1141
-#, no-c-format
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "As propriedades prefixadas pelo <literal>hibernate.cache</literal> permite "
 "você usar um sistema de cachê de segundo nível em um processo executado em "
@@ -2580,62 +2611,63 @@
 "detalhes."
 
 #. Tag: title
-#: configuration.xml:1151
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "Substituições na Linguagem de Consulta"
 
 #. Tag: para
-#: configuration.xml:1153
-#, no-c-format
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "Você pode definir novos símbolos de consulta Hibernate usando "
 "<literal>hibernate.query.substitutions</literal>. Por exemplo:"
 
 #. Tag: programlisting
-#: configuration.xml:1158
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions true=1, false=0"
 
 #. Tag: para
-#: configuration.xml:1160
-#, no-c-format
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "Faria com que os símbolos <literal>true</literal> e <literal>false</literal> "
 "passasem a ser traduzidos para literais inteiro no SQL gerado."
 
 #. Tag: programlisting
-#: configuration.xml:1165
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1167
-#, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr "permitirá você renomear a função <literal>LOWER</literal> no SQL."
 
 #. Tag: title
-#: configuration.xml:1174
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Estatísticas do Hibernate"
 
 #. Tag: para
-#: configuration.xml:1176
-#, no-c-format
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -2651,42 +2683,34 @@
 "interface <literal>org.hibernate.stats</literal> para mais informações."
 
 #. Tag: title
-#: configuration.xml:1188
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr "Logging"
 
 #. Tag: para
-#: configuration.xml:1190
+#: configuration.xml:1211
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr "Hibernate registra vários eventos usando Apache commons-logging."
-
-#. Tag: para
-#: configuration.xml:1194
-#, no-c-format
 msgid ""
-"The commons-logging service will direct output to either Apache Log4j (if "
-"you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
-"logging (if running under JDK1.4 or above). You may download Log4j from "
-"<literal>http://jakarta.apache.org</literal>. To use Log4j you will need to "
-"place a <literal>log4j.properties</literal> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
+"Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
+"can direct your logging output to several logging frameworks (NOP, Simple, "
+"log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
-"O serviço commons-logging direcionará a saída para o Apache Log4j ( se você "
-"incluir <literal>log4j.jar</literal>r no seu classpath) ou JDK1.4 logging"
-"( se estiver em uso JDK1.4 ou maior). Você pode fazer o download do Log4j a "
-"partir de <literal>http://jakarta.apache.org</literal>. Para usar Log4j você "
-"necessitará colocar um arquivo <literal>log4j.properties</literal> no seu "
-"classpath, um exemplo de arquivo de propriedades é distribuído com o "
-"Hibernate no diretório <literal>src/</literal>."
 
 #. Tag: para
-#: configuration.xml:1204
-#, no-c-format
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -2703,67 +2727,67 @@
 "interessantes são as seguintes:"
 
 #. Tag: title
-#: configuration.xml:1213
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Categorias de Log do Hibernate"
 
 #. Tag: entry
-#: configuration.xml:1219
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr "Categoria"
 
 #. Tag: entry
-#: configuration.xml:1220
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr "Função"
 
 #. Tag: literal
-#: configuration.xml:1225
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1226
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr "Registra todas as instruções SQL DML a medida que elas são executadas"
 
 #. Tag: literal
-#: configuration.xml:1229
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1230
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "Registra todos os parâmetros JDBC"
 
 #. Tag: literal
-#: configuration.xml:1233
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr "Registra todas as instruções SQL DDL a medida que elas são executadas"
 
 #. Tag: literal
-#: configuration.xml:1237
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1256
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2774,82 +2798,83 @@
 "associadas a session no momento da limpeza (flush)."
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "Registra todas as atividades de cachê de segundo nível"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "Registra atividades relacionada a transação"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "Registra todas as requisições de recursos JDBC"
 
 #. Tag: literal
-#: configuration.xml:1256
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast.AST"
 
 #. Tag: entry
-#: configuration.xml:1257
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr "Registra instruções SQL e HQL durante a análise da consultas"
 
 #. Tag: literal
-#: configuration.xml:1262
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "Registra todas as requisições de autorização JAAS"
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1267
-#, no-c-format
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr ""
 "Registra tudo ( uma parte das informações, mas muito útil para controle de "
 "erros )"
 
 #. Tag: para
-#: configuration.xml:1276
+#: configuration.xml:1294
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2863,13 +2888,13 @@
 "<literal>hibernate.show_sql</literal> habilitada."
 
 #. Tag: title
-#: configuration.xml:1286
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "Implementado uma <literal>NamingStrategy</literal>"
 
 #. Tag: para
-#: configuration.xml:1288
+#: configuration.xml:1306
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2880,10 +2905,10 @@
 "elementos schema."
 
 #. Tag: para
-#: configuration.xml:1293
-#, no-c-format
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -2899,10 +2924,10 @@
 "pelo Hibernate é completamente mínima."
 
 #. Tag: para
-#: configuration.xml:1302
-#, no-c-format
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "Você pode especificar uma estratégia diferente ao chamar "
@@ -2910,7 +2935,7 @@
 "mapeamentos:"
 
 #. Tag: programlisting
-#: configuration.xml:1307
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2921,7 +2946,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1309
+#: configuration.xml:1327
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2931,13 +2956,13 @@
 "interna que pode ser um ponto de começo útil para algumas aplicações."
 
 #. Tag: title
-#: configuration.xml:1317
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr "Arquivo de configuração XML"
 
 #. Tag: para
-#: configuration.xml:1319
+#: configuration.xml:1337
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -2951,10 +2976,10 @@
 "properties</literal> ou, se ambos estão presentes, sobrescrever propriedades."
 
 #. Tag: para
-#: configuration.xml:1326
-#, no-c-format
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "The XML configuration file is by default expected to be in the root o your "
@@ -2963,7 +2988,7 @@
 "<literal>CLASSPATH</literal>. Veja um exemplo:"
 
 #. Tag: programlisting
-#: configuration.xml:1331
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -3007,15 +3032,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1333
-#, no-c-format
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "Como você pode ver, a vantagem deste enfoque é a externalização dos nomes "
 "dos arquivos de mapeamento para configuração. O <literal>hibernate.cfg.xml</"
@@ -3025,14 +3050,14 @@
 "exceção dos benefícios acima mencionados de usar a sintaxe de XML."
 
 #. Tag: para
-#: configuration.xml:1342
-#, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr ""
 "Com a configuração do XML, iniciar o Hibernate é então tão simples como"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1364
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -3040,13 +3065,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
-#, no-c-format
-msgid "You can pick a different XML configuration file using"
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "You can pick a different XML configuration file using"
 
 #. Tag: programlisting
-#: configuration.xml:1352
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -3055,13 +3080,13 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1357
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "Integração com servidores de aplicação J2EE"
 
 #. Tag: para
-#: configuration.xml:1359
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr ""
@@ -3069,16 +3094,16 @@
 "J2EE:"
 
 #. Tag: para
-#: configuration.xml:1365
-#, no-c-format
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>DataSources gerenciados pelo container</emphasis>: O Hibernate "
@@ -3092,7 +3117,7 @@
 "código portável."
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1398
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -3102,15 +3127,15 @@
 "associar sua <literal>SessionFactory</literal> a JNDI depois de iniciado."
 
 #. Tag: para
-#: configuration.xml:1389
-#, no-c-format
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>Ligação (binding) Session na JTA:</emphasis> A <literal>Session</"
@@ -3122,16 +3147,16 @@
 "(CMT) ou programática(BMT/Transação do usuário)."
 
 #. Tag: para
-#: configuration.xml:1402
-#, no-c-format
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>JMX deployment:</emphasis> Se você usa um JMX servidor de "
 "aplicações capaz (ex. Jboss AS), você pode fazer a instação do Hibernate "
@@ -3143,7 +3168,7 @@
 "Hibernate iniciar, etc.)."
 
 #. Tag: para
-#: configuration.xml:1413
+#: configuration.xml:1431
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -3156,18 +3181,18 @@
 "de conecção\"."
 
 #. Tag: title
-#: configuration.xml:1420
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "Configuração de estratégia de transação"
 
 #. Tag: para
-#: configuration.xml:1422
-#, no-c-format
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -3181,7 +3206,7 @@
 "necessário."
 
 #. Tag: para
-#: configuration.xml:1430
+#: configuration.xml:1448
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -3198,73 +3223,73 @@
 "configuração do <literal>hibernate.transaction.factory_class</literal>."
 
 #. Tag: para
-#: configuration.xml:1437
-#, no-c-format
-msgid "There are three standard (built-in) choices:"
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "Existem três escolhas (internas) padrões:"
 
 #. Tag: literal
-#: configuration.xml:1443
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "org.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr "delegada as transações (JDBC)a bases de dados (Padrão)"
 
 #. Tag: literal
-#: configuration.xml:1449
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1451
-#, no-c-format
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "delegada a transação a um container gerenciador se a transação existente "
 "estiver de acordo neste contexto (ex: método bean sessão EJB), se não uma "
 "nova transação é iniciada e uma transação controlado por um bean é usada."
 
 #. Tag: literal
-#: configuration.xml:1459
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1461
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "delega para um container gerenciador de transações JTA"
 
 #. Tag: para
-#: configuration.xml:1466
-#, no-c-format
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr ""
 "Você também pode definir suas próprias estratégias de transação ( para um "
 "serviço de transação CORBA por exemplo)."
 
 #. Tag: para
-#: configuration.xml:1471
-#, no-c-format
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Algumas características no Hibernate (ex., o cache de segundo nível, sessões "
 "contextuais com JTA, etc.) requerem acesso a JTA "
@@ -3274,157 +3299,157 @@
 "padronize um mecanismo simples :"
 
 #. Tag: title
-#: configuration.xml:1479
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "Gerenciadores de transações JTA"
 
 #. Tag: entry
-#: configuration.xml:1485
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "Transaction Factory"
 
 #. Tag: entry
-#: configuration.xml:1486
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr "Application Server"
 
 #. Tag: literal
-#: configuration.xml:1491
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1492
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1495
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1496
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1499
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1503
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1507
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1508
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1511
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1512
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1515
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1516
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1519
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1520
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1523
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1524
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1527
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1528
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1537
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "<literal>SessionFactory</literal> ligada a JNDI"
 
 #. Tag: para
-#: configuration.xml:1539
-#, no-c-format
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "Uma <literal>SessionFactory</literal> de Hibernate ligada a JNDI pode "
 "simplificar a localização da fabrica e a criação de novas <literal>Session</"
@@ -3432,15 +3457,15 @@
 "literal> ligado a JNDI, simplemente ambos usam o mesmo registro!"
 
 #. Tag: para
-#: configuration.xml:1546
-#, no-c-format
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
 "namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
@@ -3450,7 +3475,7 @@
 "read-only JNDI default implementation, e.g. Tomcat.)"
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1572
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -3464,14 +3489,15 @@
 "specified, the default <literal>InitialContext</literal> will be used."
 
 #. Tag: para
-#: configuration.xml:1561
-#, no-c-format
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
@@ -3480,21 +3506,22 @@
 "<literal>HibernateService</literal> (discussed later)."
 
 #. Tag: para
-#: configuration.xml:1568
-#, no-c-format
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
 "class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
 
 #. Tag: para
-#: configuration.xml:1573
-#, no-c-format
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -3510,33 +3537,34 @@
 "Hibernate&mdash;see chapter 1."
 
 #. Tag: title
-#: configuration.xml:1585
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "Current Session context management with JTA"
 
 #. Tag: para
-#: configuration.xml:1587
-#, no-c-format
+#: configuration.xml:1605
+#, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <link linkend=\"architecture-current-session\">current "
-"sessions</link>. Using the <literal>\"jta\"</literal> session context, if "
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
 "there is no Hibernate <literal>Session</literal> associated with the current "
 "JTA transaction, one will be started and associated with that JTA "
 "transaction the first time you call <literal>sessionFactory.getCurrentSession"
 "()</literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "The easiest way to handle <literal>Session</literal>s and transactions is "
 "Hibernates automatic \"current\" <literal>Session</literal> management. See "
@@ -3558,20 +3586,20 @@
 "declarative transaction demarcation with CMT is preferred."
 
 #. Tag: title
-#: configuration.xml:1610
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr "JMX deployment"
 
 #. Tag: para
-#: configuration.xml:1612
-#, no-c-format
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
@@ -3580,12 +3608,12 @@
 "<emphasis>managed service</emphasis>."
 
 #. Tag: para
-#: configuration.xml:1620
-#, no-c-format
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
@@ -3594,7 +3622,7 @@
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 
 #. Tag: programlisting
-#: configuration.xml:1627
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3645,15 +3673,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1629
-#, no-c-format
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
@@ -3668,6 +3696,33 @@
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
 
+#~ msgid ""
+#~ "<literal>hibernate.properties</literal> is the easiest approach if you "
+#~ "want to get started quickly."
+#~ msgstr ""
+#~ "<literal>hibernate.properties</literal> é o caminho mais facil se você "
+#~ "quer começar mais rápido."
+
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr "Hibernate registra vários eventos usando Apache commons-logging."
+
+#~ msgid ""
+#~ "The commons-logging service will direct output to either Apache Log4j (if "
+#~ "you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
+#~ "logging (if running under JDK1.4 or above). You may download Log4j from "
+#~ "<literal>http://jakarta.apache.org</literal>. To use Log4j you will need "
+#~ "to place a <literal>log4j.properties</literal> file in your classpath, an "
+#~ "example properties file is distributed with Hibernate in the <literal>src/"
+#~ "</literal> directory."
+#~ msgstr ""
+#~ "O serviço commons-logging direcionará a saída para o Apache Log4j ( se "
+#~ "você incluir <literal>log4j.jar</literal>r no seu classpath) ou JDK1.4 "
+#~ "logging( se estiver em uso JDK1.4 ou maior). Você pode fazer o download "
+#~ "do Log4j a partir de <literal>http://jakarta.apache.org</literal>. Para "
+#~ "usar Log4j você necessitará colocar um arquivo <literal>log4j.properties</"
+#~ "literal> no seu classpath, um exemplo de arquivo de propriedades é "
+#~ "distribuído com o Hibernate no diretório <literal>src/</literal>."
+
 #~ msgid "<placeholder-1/> (optional)"
 #~ msgstr "<placeholder-1/> (opcional)"
 

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,18 +11,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:5
+#: events.xml:29
 #, no-c-format
 msgid "Interceptors and events"
 msgstr "Interceptadores e Eventos"
 
 #. Tag: para
-#: events.xml:7
-#, no-c-format
+#: events.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "É muito útil quando a aplicação precisa executar alguma \"coisa\" no momento "
 "em que o Hibernate executa uma de suas ações. Isso permite a implementação "
@@ -30,17 +30,17 @@
 "do Hibernate"
 
 #. Tag: title
-#: events.xml:14
+#: events.xml:38
 #, no-c-format
 msgid "Interceptors"
 msgstr "Interceptadores"
 
 #. Tag: para
-#: events.xml:16
-#, no-c-format
+#: events.xml:40
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -60,18 +60,18 @@
 "literal> é atualizado."
 
 #. Tag: para
-#: events.xml:27
-#, no-c-format
+#: events.xml:51
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "Você pode implementar <literal>Auditable</literal> diretamente ou pode "
 "estender <literal>EmptyInterceptor</literal>, sendo que a segunda é "
 "considerada a melhor opção."
 
 #. Tag: programlisting
-#: events.xml:32
+#: events.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
@@ -160,17 +160,17 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:34
-#, no-c-format
+#: events.xml:58
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "Os interceptadores podem ser aplicados em dois diferentes escopos: No escopo "
 "da <literal>Session</literal> e no escopo <literal>SessionFactory</literal>."
 
 #. Tag: para
-#: events.xml:39
+#: events.xml:63
 #, no-c-format
 msgid ""
 "A <literal>Session</literal>-scoped interceptor is specified when a session "
@@ -182,23 +182,23 @@
 "openSession() que aceita um <literal>Interceptor</literal> como parâmetro."
 
 #. Tag: programlisting
-#: events.xml:45
+#: events.xml:69
 #, no-c-format
 msgid "<![CDATA[Session session = sf.openSession( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: para
-#: events.xml:47
-#, no-c-format
+#: events.xml:71
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "Um interceptador no escopo da <literal>SessionFactory</literal> é definido "
 "no objeto <literal>Configuration</literal> antes da <literal>SessionFactory</"
@@ -212,25 +212,25 @@
 "simultaneamente."
 
 #. Tag: programlisting
-#: events.xml:56
+#: events.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor() );]]>"
 msgstr ""
 
 #. Tag: title
-#: events.xml:61
+#: events.xml:85
 #, no-c-format
 msgid "Event system"
 msgstr "Sistema de Eventos"
 
 #. Tag: para
-#: events.xml:63
-#, no-c-format
+#: events.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "Se você precisa executar uma ação em determinados eventos da camada de "
 "persistência, você também pode usar a arquitetura de <emphasis>event</"
@@ -238,20 +238,20 @@
 "complemento ou em substituição a um interceptador."
 
 #. Tag: para
-#: events.xml:69
-#, no-c-format
+#: events.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -272,28 +272,27 @@
 "feita pela <literal>Session</literal>."
 
 #. Tag: para
-#: events.xml:84
-#, no-c-format
+#: events.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "Para todos os efeitos esses listeners deve ser considerados singletons; ou "
 "seja, eles são compartilhados entre as requisições, e assim sendo, não devem "
 "salvar nenhum estado das variáveis instanciadas."
 
 #. Tag: para
-#: events.xml:89
-#, no-c-format
+#: events.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "Um listener personalizado deve implementar a interface referente ao evento a "
@@ -306,7 +305,7 @@
 "carregar um listener personalizado:"
 
 #. Tag: programlisting
-#: events.xml:99
+#: events.xml:123
 #, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
@@ -323,7 +322,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:101
+#: events.xml:125
 #, no-c-format
 msgid ""
 "You also need a configuration entry telling Hibernate to use the listener in "
@@ -334,7 +333,7 @@
 "conjunto com o listener padrão:"
 
 #. Tag: programlisting
-#: events.xml:106
+#: events.xml:130
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
@@ -350,13 +349,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:108
-#, no-c-format
-msgid "Instead, you may register it programmatically:"
+#: events.xml:132
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "Ou, você pode registrar o listener programaticamente:"
 
 #. Tag: programlisting
-#: events.xml:112
+#: events.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
@@ -366,14 +365,14 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:114
-#, no-c-format
+#: events.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "Listeners registrados declarativamente não compartilham da mesma instancia. "
 "Se o mesmo nome da classe é utilizado em vários elementos e <literal>&lt;"
@@ -383,12 +382,12 @@
 "programaticamente."
 
 #. Tag: para
-#: events.xml:122
-#, no-c-format
+#: events.xml:146
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -398,19 +397,19 @@
 "listeners personalizados durante a configuração."
 
 #. Tag: title
-#: events.xml:132
+#: events.xml:156
 #, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Hibernate declarative security"
 
 #. Tag: para
-#: events.xml:133
-#, no-c-format
+#: events.xml:157
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "Usually, declarative security in Hibernate applications is managed in a "
 "session facade layer. Now, Hibernate3 allows certain actions to be "
@@ -418,7 +417,7 @@
 "functionality built on top of the event architecture."
 
 #. Tag: para
-#: events.xml:139
+#: events.xml:163
 #, no-c-format
 msgid ""
 "First, you must configure the appropriate event listeners, to enable the use "
@@ -428,7 +427,7 @@
 "of JAAS authorization."
 
 #. Tag: programlisting
-#: events.xml:144
+#: events.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
@@ -442,13 +441,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:146
-#, no-c-format
+#: events.xml:170
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
 "just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
@@ -456,17 +455,17 @@
 "a particular event type."
 
 #. Tag: para
-#: events.xml:152
-#, no-c-format
+#: events.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
 "roles:"
 
 #. Tag: programlisting
-#: events.xml:156
+#: events.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[<grant role=\"admin\" entity-name=\"User\" actions=\"insert,update,"
@@ -475,7 +474,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:158
+#: events.xml:182
 #, no-c-format
 msgid "The role names are the roles understood by your JACC provider."
 msgstr "The role names are the roles understood by your JACC provider."

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,32 +11,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_mappings.xml:20
+#: example_mappings.xml:29
 #, no-c-format
 msgid "Example: Various Mappings"
 msgstr "Exemplo: Vários Mapeamentos"
 
 #. Tag: para
-#: example_mappings.xml:22
-#, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr "Este capitulo mostra algums mapeamentos de associações mais complexos."
 
 #. Tag: title
-#: example_mappings.xml:27
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employer/Employee"
 
 #. Tag: para
-#: example_mappings.xml:29
-#, no-c-format
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "O modelo de seguinte relacionamento entre <literal>Employer</literal> e "
 "<literal>Employee</literal> utiliza uma entidade de classe atual "
@@ -46,13 +46,13 @@
 "os nomes do empregado."
 
 #. Tag: para
-#: example_mappings.xml:46
-#, no-c-format
-msgid "Heres a possible mapping document:"
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "Abaixo o código de um possível mapeamento:"
 
 #. Tag: programlisting
-#: example_mappings.xml:50
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -108,15 +108,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:52
-#, no-c-format
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr ""
 "E abaixo o esquema da tabela gerado pelo <literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:56
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -157,22 +156,22 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:61
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr "Author/Work"
 
 #. Tag: para
-#: example_mappings.xml:63
-#, no-c-format
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "Considere o seguinte modelo de relacionamento entre <literal>Work</literal>, "
 "<literal>Author</literal> e <literal>Person</literal>. Nós representamos o "
@@ -183,7 +182,7 @@
 "<literal>Author</literal> extendendo <literal>Person</literal>."
 
 #. Tag: para
-#: example_mappings.xml:81
+#: example_mappings.xml:91
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
@@ -192,7 +191,7 @@
 "relacionamentos:"
 
 #. Tag: programlisting
-#: example_mappings.xml:85
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -249,14 +248,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:87
-#, no-c-format
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "There are four tables in this mapping. <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
@@ -270,7 +269,7 @@
 "<literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:95
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -311,24 +310,24 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:100
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Customer/Order/Product"
 
 #. Tag: para
-#: example_mappings.xml:102
-#, no-c-format
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "Agora considere um modelo de relacionamento entre <literal>Customer</"
 "literal>, <literal>Order</literal> e <literal>LineItem</literal> e "
@@ -341,13 +340,13 @@
 "é conhecido como um elemento composto."
 
 #. Tag: para
-#: example_mappings.xml:122
-#, no-c-format
-msgid "The mapping document:"
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "O código do mapeamento:"
 
 #. Tag: programlisting
-#: example_mappings.xml:126
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -390,7 +389,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:128
+#: example_mappings.xml:138
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -405,7 +404,7 @@
 "ligando orders com products."
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -445,37 +444,31 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:140
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "Exemplos variados de mapeamento"
 
 #. Tag: para
-#: example_mappings.xml:142
-#, no-c-format
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "Todos estes exemplos são retirados do conjunto de testes do Hibernate. Lá, "
 "você encontrará vários outros exemplos úteis de mapeamentos. Verifique o "
 "diretorio <literal>test</literal> da distribuição do Hibernate."
 
-#. Tag: para
-#: example_mappings.xml:148
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr "TODO: put words around this stuff"
-
 #. Tag: title
-#: example_mappings.xml:151
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "Associação um-para-um \"Tipadas\""
 
 #. Tag: programlisting
-#: example_mappings.xml:152
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -507,13 +500,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:156
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr "Exemplo de chave composta"
 
 #. Tag: programlisting
-#: example_mappings.xml:157
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -632,13 +625,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:161
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr "Mmuitos-para-muitos com atributo de chave composta compartilhada"
 
 #. Tag: programlisting
-#: example_mappings.xml:162
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -679,13 +672,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:166
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "Conteúdo baseado em descriminação"
 
 #. Tag: programlisting
-#: example_mappings.xml:167
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -741,13 +734,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:171
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Associações em chaves alternativas"
 
 #. Tag: programlisting
-#: example_mappings.xml:172
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -800,3 +793,6 @@
 "    \n"
 "</class>]]>"
 msgstr ""
+
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "TODO: put words around this stuff"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,29 +11,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_parentchild.xml:5
+#: example_parentchild.xml:29
 #, no-c-format
 msgid "Example: Parent/Child"
 msgstr "Example: Parent/Child"
 
 #. Tag: para
-#: example_parentchild.xml:7
-#, no-c-format
+#: example_parentchild.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "One of the very first things that new users try to do with Hibernate is to "
 "model a parent / child type relationship. There are two different approaches "
@@ -51,39 +50,39 @@
 "all difficult!"
 
 #. Tag: title
-#: example_parentchild.xml:21
+#: example_parentchild.xml:45
 #, no-c-format
 msgid "A note about collections"
 msgstr "A note about collections"
 
 #. Tag: para
-#: example_parentchild.xml:23
-#, no-c-format
+#: example_parentchild.xml:47
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Hibernate collections are considered to be a logical part of their owning "
 "entity; never of the contained entities. This is a crucial distinction! It "
 "has the following consequences:"
 
 #. Tag: para
-#: example_parentchild.xml:30
-#, no-c-format
+#: example_parentchild.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr ""
 "When we remove / add an object from / to a collection, the version number of "
 "the collection owner is incremented."
 
 #. Tag: para
-#: example_parentchild.xml:36
-#, no-c-format
+#: example_parentchild.xml:60
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -95,15 +94,14 @@
 "persistent."
 
 #. Tag: para
-#: example_parentchild.xml:44
-#, no-c-format
+#: example_parentchild.xml:68
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "On the other hand, if an entity is removed from a collection (a one-to-many "
 "or many-to-many association), it will not be deleted, by default. This "
@@ -113,14 +111,14 @@
 "persistent, by default."
 
 #. Tag: para
-#: example_parentchild.xml:54
-#, no-c-format
+#: example_parentchild.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "Instead, the default behaviour is that adding an entity to a collection "
 "merely creates a link between the two entities, while removing it removes "
@@ -129,13 +127,13 @@
 "life of the child is bound to the life cycle of the parent."
 
 #. Tag: title
-#: example_parentchild.xml:64
+#: example_parentchild.xml:88
 #, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr "Bidirectional one-to-many"
 
 #. Tag: para
-#: example_parentchild.xml:66
+#: example_parentchild.xml:90
 #, no-c-format
 msgid ""
 "Suppose we start with a simple <literal>&lt;one-to-many&gt;</literal> "
@@ -145,7 +143,7 @@
 "association from <literal>Parent</literal> to <literal>Child</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:71
+#: example_parentchild.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -155,13 +153,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:73
-#, no-c-format
-msgid "If we were to execute the following code"
+#: example_parentchild.xml:97
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "If we were to execute the following code"
 
 #. Tag: programlisting
-#: example_parentchild.xml:77
+#: example_parentchild.xml:101
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = .....;\n"
@@ -172,13 +170,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:79
+#: example_parentchild.xml:103
 #, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr "Hibernate would issue two SQL statements:"
 
 #. Tag: para
-#: example_parentchild.xml:85
+#: example_parentchild.xml:109
 #, no-c-format
 msgid ""
 "an <literal>INSERT</literal> to create the record for <literal>c</literal>"
@@ -186,7 +184,7 @@
 "an <literal>INSERT</literal> to create the record for <literal>c</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:88
+#: example_parentchild.xml:112
 #, no-c-format
 msgid ""
 "an <literal>UPDATE</literal> to create the link from <literal>p</literal> to "
@@ -196,11 +194,11 @@
 "<literal>c</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:95
-#, no-c-format
+#: example_parentchild.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -210,7 +208,7 @@
 "\"</literal> in the collection mapping:"
 
 #. Tag: programlisting
-#: example_parentchild.xml:101
+#: example_parentchild.xml:125
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -220,19 +218,19 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:103
+#: example_parentchild.xml:127
 #, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr "However, this is not the recommended solution."
 
 #. Tag: para
-#: example_parentchild.xml:106
-#, no-c-format
+#: example_parentchild.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "The underlying cause of this behaviour is that the link (the foreign key "
@@ -242,7 +240,7 @@
 "solution is to make the link part of the <literal>Child</literal> mapping."
 
 #. Tag: programlisting
-#: example_parentchild.xml:113
+#: example_parentchild.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"parent\" column=\"parent_id\" not-null=\"true\"/"
@@ -250,29 +248,29 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:115
-#, no-c-format
+#: example_parentchild.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(We also need to add the <literal>parent</literal> property to the "
 "<literal>Child</literal> class.)"
 
 #. Tag: para
-#: example_parentchild.xml:119
-#, no-c-format
+#: example_parentchild.xml:143
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
 "<literal>inverse</literal> attribute."
 
 #. Tag: programlisting
-#: example_parentchild.xml:124
+#: example_parentchild.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
@@ -282,13 +280,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:126
-#, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#: example_parentchild.xml:150
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr "The following code would be used to add a new <literal>Child</literal>"
 
 #. Tag: programlisting
-#: example_parentchild.xml:130
+#: example_parentchild.xml:154
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -300,23 +298,23 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:132
-#, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#: example_parentchild.xml:156
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr "And now, only one SQL <literal>INSERT</literal> would be issued!"
 
 #. Tag: para
-#: example_parentchild.xml:136
-#, no-c-format
+#: example_parentchild.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "To tighten things up a bit, we could create an <literal>addChild()</literal> "
 "method of <literal>Parent</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:141
+#: example_parentchild.xml:165
 #, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
@@ -326,13 +324,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:143
-#, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#: example_parentchild.xml:167
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr "Now, the code to add a <literal>Child</literal> looks like"
 
 #. Tag: programlisting
-#: example_parentchild.xml:147
+#: example_parentchild.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -343,23 +341,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_parentchild.xml:152
+#: example_parentchild.xml:176
 #, no-c-format
 msgid "Cascading life cycle"
 msgstr "Cascading life cycle"
 
 #. Tag: para
-#: example_parentchild.xml:154
-#, no-c-format
+#: example_parentchild.xml:178
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "The explicit call to <literal>save()</literal> is still annoying. We will "
 "address this by using cascades."
 
 #. Tag: programlisting
-#: example_parentchild.xml:159
+#: example_parentchild.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
@@ -369,13 +367,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:161
-#, no-c-format
-msgid "This simplifies the code above to"
+#: example_parentchild.xml:185
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "This simplifies the code above to"
 
 #. Tag: programlisting
-#: example_parentchild.xml:165
+#: example_parentchild.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -385,10 +383,10 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:167
-#, no-c-format
+#: example_parentchild.xml:191
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -397,7 +395,7 @@
 "literal> and all its children from the database."
 
 #. Tag: programlisting
-#: example_parentchild.xml:172
+#: example_parentchild.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -406,13 +404,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:174
-#, no-c-format
-msgid "However, this code"
+#: example_parentchild.xml:198
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "However, this code"
 
 #. Tag: programlisting
-#: example_parentchild.xml:178
+#: example_parentchild.xml:202
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -423,12 +421,12 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:180
-#, no-c-format
+#: example_parentchild.xml:204
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "will not remove <literal>c</literal> from the database; it will ony remove "
@@ -437,7 +435,7 @@
 "</literal> the <literal>Child</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:186
+#: example_parentchild.xml:210
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -448,13 +446,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:188
-#, no-c-format
+#: example_parentchild.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "Now, in our case, a <literal>Child</literal> can't really exist without its "
 "parent. So if we remove a <literal>Child</literal> from the collection, we "
@@ -462,7 +460,7 @@
 "\"all-delete-orphan\"</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:194
+#: example_parentchild.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all-delete-orphan"
@@ -473,14 +471,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:196
-#, no-c-format
+#: example_parentchild.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "Note: even though the collection mapping specifies <literal>inverse=\"true"
 "\"</literal>, cascades are still processed by iterating the collection "
@@ -489,27 +487,28 @@
 "<literal>setParent()</literal>."
 
 #. Tag: title
-#: example_parentchild.xml:206
+#: example_parentchild.xml:230
 #, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr "Cascades and <literal>unsaved-value</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:208
-#, no-c-format
+#: example_parentchild.xml:232
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
 "literal>, made some changes in a UI action and wish to persist these changes "
@@ -525,17 +524,17 @@
 "<literal>unsaved-value</literal> explicitly.</emphasis>"
 
 #. Tag: para
-#: example_parentchild.xml:220
-#, no-c-format
+#: example_parentchild.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "The following code will update <literal>parent</literal> and <literal>child</"
 "literal> and insert <literal>newChild</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:225
+#: example_parentchild.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[//parent and child were both loaded in a previous session\n"
@@ -547,17 +546,16 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:227
-#, no-c-format
+#: example_parentchild.xml:251
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "Well, that's all very well for the case of a generated identifier, but what "
 "about assigned identifiers and composite identifiers? This is more "
@@ -569,32 +567,32 @@
 "exists."
 
 #. Tag: title
-#: example_parentchild.xml:260
+#: example_parentchild.xml:284
 #, no-c-format
 msgid "Conclusion"
 msgstr "Conclusion"
 
 #. Tag: para
-#: example_parentchild.xml:262
-#, no-c-format
+#: example_parentchild.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "There is quite a bit to digest here and it might look confusing first time "
 "around. However, in practice, it all works out very nicely. Most Hibernate "
 "applications use the parent / child pattern in many places."
 
 #. Tag: para
-#: example_parentchild.xml:267
-#, no-c-format
+#: example_parentchild.xml:291
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "We mentioned an alternative in the first paragraph. None of the above issues "

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,31 +11,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_weblog.xml:5
+#: example_weblog.xml:29
 #, no-c-format
 msgid "Example: Weblog Application"
 msgstr "Example: Weblog Application"
 
 #. Tag: title
-#: example_weblog.xml:8
+#: example_weblog.xml:32
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "Persistent Classes"
 
 #. Tag: para
-#: example_weblog.xml:10
-#, no-c-format
+#: example_weblog.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "The persistent classes represent a weblog, and an item posted in a weblog. "
 "They are to be modelled as a standard parent/child relationship, but we will "
 "use an ordered bag, instead of a set."
 
 #. Tag: programlisting
-#: example_weblog.xml:16
+#: example_weblog.xml:40
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -69,7 +69,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:18
+#: example_weblog.xml:42
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -118,19 +118,19 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:23
+#: example_weblog.xml:47
 #, no-c-format
 msgid "Hibernate Mappings"
 msgstr "Hibernate Mappings"
 
 #. Tag: para
-#: example_weblog.xml:25
-#, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+#: example_weblog.xml:49
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "The XML mappings should now be quite straightforward."
 
 #. Tag: programlisting
-#: example_weblog.xml:29
+#: example_weblog.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:31
+#: example_weblog.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -224,23 +224,23 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:36
+#: example_weblog.xml:60
 #, no-c-format
 msgid "Hibernate Code"
 msgstr "Hibernate Code"
 
 #. Tag: para
-#: example_weblog.xml:38
-#, no-c-format
+#: example_weblog.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr ""
 "The following class demonstrates some of the kinds of things we can do with "
 "these classes, using Hibernate."
 
 #. Tag: programlisting
-#: example_weblog.xml:43
+#: example_weblog.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,18 +11,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: filters.xml:5
+#: filters.xml:29
 #, no-c-format
 msgid "Filtering data"
 msgstr "Filtrando dados"
 
 #. Tag: para
-#: filters.xml:7
-#, no-c-format
+#: filters.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "O Hibernate3 provê um novo método inovador para manusear dados com regras de "
@@ -31,23 +31,23 @@
 "Session do Hibernate."
 
 #. Tag: title
-#: filters.xml:14
+#: filters.xml:38
 #, no-c-format
 msgid "Hibernate filters"
 msgstr "Filtros do Hibernate"
 
 #. Tag: para
-#: filters.xml:16
-#, no-c-format
+#: filters.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "O Hibernate tem a habilidade de pré definir os critérios do filtro e anexar "
 "esses filtros no nível da classe e no nível da coleção. Um critério do "
@@ -60,7 +60,7 @@
 "à aplicação."
 
 #. Tag: para
-#: filters.xml:26
+#: filters.xml:50
 #, no-c-format
 msgid ""
 "In order to use filters, they must first be defined and then attached to the "
@@ -74,7 +74,7 @@
 "<literal>&lt;hibernate-mapping/&gt;</literal>:"
 
 #. Tag: programlisting
-#: filters.xml:32
+#: filters.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\">\n"
@@ -83,13 +83,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:34
-#, no-c-format
-msgid "Then, this filter can be attached to a class:"
+#: filters.xml:58
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "Então esse filtro pode ser anexo à uma classe:"
 
 #. Tag: programlisting
-#: filters.xml:38
+#: filters.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"myClass\" ...>\n"
@@ -100,13 +100,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:40
-#, no-c-format
-msgid "or, to a collection:"
+#: filters.xml:64
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "ou em uma coleção:"
 
 #. Tag: programlisting
-#: filters.xml:44
+#: filters.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
@@ -116,23 +116,23 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:46
-#, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+#: filters.xml:70
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr "ou mesmo para ambos (ou muitos de cada) ao mesmo tempo."
 
 #. Tag: para
-#: filters.xml:50
-#, no-c-format
+#: filters.xml:74
+#, fuzzy, no-c-format
 msgid ""
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enabledFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "Os métodos na <literal>Session</literal> são: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
@@ -143,7 +143,7 @@
 "Usando o filtro simples definido acima, o código se pareceria com o seguinte:"
 
 #. Tag: programlisting
-#: filters.xml:59
+#: filters.xml:83
 #, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
@@ -151,26 +151,27 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:61
-#, no-c-format
+#: filters.xml:85
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "Veja que os métodos da interface org.hibernate.Filter permite o encadeamento "
 "de funções, comum à maioria das funções do Hibernate."
 
 #. Tag: para
-#: filters.xml:65
-#, no-c-format
+#: filters.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr ""
 "Um exemplo completo, usando dados temporais com um padrão efetivo de "
 "registro de datas:"
 
 #. Tag: programlisting
-#: filters.xml:69
+#: filters.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"effectiveDate\">\n"
@@ -208,18 +209,17 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:71
-#, no-c-format
+#: filters.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "Para garantir que você sempre tenha registro efetivos, simplesmente habilite "
 "o filtro na session antes de recuperar os dados dos empregados:"
 
 #. Tag: programlisting
-#: filters.xml:76
+#: filters.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
@@ -233,26 +233,26 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:78
-#, no-c-format
+#: filters.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "No HQL acima, mesmo que mencionamos apenas uma restrição de salário nos "
 "resultados, por causa do filtro habilitado, a consulta retornará apenas os "
 "funcionários ativos cujo salário é maior que um milhão de dólares."
 
 #. Tag: para
-#: filters.xml:84
-#, no-c-format
+#: filters.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "Nota: se você planeja usar filtros com outer join (por HQL ou por load "
 "fetching) seja cuidadoso na direção da expressão de condição. É mais seguro "
@@ -260,18 +260,18 @@
 "primeiro seguido pelo nome da coluna após o operador."
 
 #. Tag: para
-#: filters.xml:91
-#, no-c-format
+#: filters.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr "translator-credits"
 
 #. Tag: programlisting
-#: filters.xml:98
+#: filters.xml:122
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
@@ -280,11 +280,11 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:100
+#: filters.xml:124
 #, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,32 +11,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: inheritance_mapping.xml:5
-#, no-c-format
-msgid "Inheritance Mapping"
+#: inheritance_mapping.xml:29
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "Mapeamento de Herança"
 
 #. Tag: title
-#: inheritance_mapping.xml:8
-#, no-c-format
-msgid "The Three Strategies"
+#: inheritance_mapping.xml:32
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "As três estratégias"
 
 #. Tag: para
-#: inheritance_mapping.xml:10
+#: inheritance_mapping.xml:34
 #, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr ""
 "O Hibernate suporta as três estratégias básicas de mapeamento de herança:"
 
 #. Tag: para
-#: inheritance_mapping.xml:16
+#: inheritance_mapping.xml:40
 #, no-c-format
 msgid "table per class hierarchy"
 msgstr "tabela por hierarquia de classes"
 
 #. Tag: para
-#: inheritance_mapping.xml:21
+#: inheritance_mapping.xml:45
 #, fuzzy, no-c-format
 msgid "<para>table per subclass</para>"
 msgstr ""
@@ -46,13 +46,13 @@
 "table per subclass"
 
 #. Tag: para
-#: inheritance_mapping.xml:26
+#: inheritance_mapping.xml:50
 #, no-c-format
 msgid "table per concrete class"
 msgstr "tabela por classe concreta"
 
 #. Tag: para
-#: inheritance_mapping.xml:32
+#: inheritance_mapping.xml:56
 #, no-c-format
 msgid ""
 "In addition, Hibernate supports a fourth, slightly different kind of "
@@ -62,25 +62,25 @@
 "de polimorfismo:"
 
 #. Tag: para
-#: inheritance_mapping.xml:39
+#: inheritance_mapping.xml:63
 #, no-c-format
 msgid "implicit polymorphism"
 msgstr "polimorfismo implícito"
 
 #. Tag: para
-#: inheritance_mapping.xml:45
-#, no-c-format
+#: inheritance_mapping.xml:69
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "É possível usar diferentes estratégias de mapeamento para diferentes "
 "ramificações da mesma hierarquia de herança, e então fazer uso do "
@@ -95,19 +95,19 @@
 "abaixo)."
 
 #. Tag: para
-#: inheritance_mapping.xml:59
-#, no-c-format
+#: inheritance_mapping.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "É possível definir mapeamentos <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, e <literal>joined-subclass</literal> em documentos de "
@@ -123,7 +123,7 @@
 "subclasse."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:70
+#: inheritance_mapping.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -136,19 +136,19 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:74
+#: inheritance_mapping.xml:98
 #, no-c-format
 msgid "Table per class hierarchy"
 msgstr "Tabela por hierarquia de classes"
 
 #. Tag: para
-#: inheritance_mapping.xml:76
-#, no-c-format
+#: inheritance_mapping.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "Suponha que tenhamos uma interface <literal>Payment</literal>, com sua "
 "implementação <literal>CreditCardPayment</literal>, <literal>CashPayment</"
@@ -156,7 +156,7 @@
 "hierarquia seria parecido com:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:83
+#: inheritance_mapping.xml:107
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -180,31 +180,31 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:85
-#, no-c-format
+#: inheritance_mapping.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "Exactly one table is required. There is one big limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
 "literal>, may not have <literal>NOT NULL</literal> constraints."
 
 #. Tag: title
-#: inheritance_mapping.xml:94
+#: inheritance_mapping.xml:118
 #, no-c-format
 msgid "Table per subclass"
 msgstr "Tabela por subclasse"
 
 #. Tag: para
-#: inheritance_mapping.xml:96
-#, no-c-format
-msgid "A table per subclass mapping would look like:"
+#: inheritance_mapping.xml:120
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "Um mapeamento de tabela por subclasse seria parecido com:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:100
+#: inheritance_mapping.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -230,35 +230,35 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:102
-#, no-c-format
+#: inheritance_mapping.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "Quatro tabelas são necessárias. As três tabelas subclasses possuem "
 "associação de chave primária para a tabela de superclasse (então o modelo "
 "relacional é atualmente uma associação de um-para-um)."
 
 #. Tag: title
-#: inheritance_mapping.xml:111
-#, no-c-format
-msgid "Table per subclass, using a discriminator"
+#: inheritance_mapping.xml:135
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "Tabela por subclasse, usando um discriminador"
 
 #. Tag: para
-#: inheritance_mapping.xml:113
-#, no-c-format
+#: inheritance_mapping.xml:137
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "Note que a implementação de tabela por subclasse do Hibernate não necessita "
 "de coluna de discriminador. Outro mapeador objeto/relacional usa uma "
@@ -271,7 +271,7 @@
 "<literal>&lt;join&gt;</literal>, dessa maneira:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:125
+#: inheritance_mapping.xml:149
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -304,7 +304,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:127
+#: inheritance_mapping.xml:151
 #, no-c-format
 msgid ""
 "The optional <literal>fetch=\"select\"</literal> declaration tells Hibernate "
@@ -318,23 +318,23 @@
 "ChequePayment, quando usar um outer join pesquisando pela superclasse."
 
 #. Tag: title
-#: inheritance_mapping.xml:136
+#: inheritance_mapping.xml:160
 #, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr ". Misturando tabela por hierarquia de classes com tabela por subclasse"
 
 #. Tag: para
-#: inheritance_mapping.xml:138
-#, no-c-format
+#: inheritance_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "Você pode até mesmo misturar a estratégia de tabela por hierarquia e tabela "
 "por subclasse usando esta abordagem:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:143
+#: inheritance_mapping.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -360,7 +360,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:145
+#: inheritance_mapping.xml:169
 #, no-c-format
 msgid ""
 "For any of these mapping strategies, a polymorphic association to the root "
@@ -372,7 +372,7 @@
 "usando <literal>&lt;many-to-one&gt;</literal>."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:151
+#: inheritance_mapping.xml:175
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"payment\" column=\"PAYMENT_ID\" class=\"Payment"
@@ -380,24 +380,24 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:156
+#: inheritance_mapping.xml:180
 #, no-c-format
 msgid "Table per concrete class"
 msgstr "Tabela por classe concreta"
 
 #. Tag: para
-#: inheritance_mapping.xml:158
-#, no-c-format
+#: inheritance_mapping.xml:182
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "Existem duas formas que poderíamos usar a respeito da estratégia de "
 "mapeamento de tabela por classe concreta. A primeira é usar <literal>&lt;"
 "union-subclass&gt;</literal>.."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:163
+#: inheritance_mapping.xml:187
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\">\n"
@@ -420,7 +420,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:165
+#: inheritance_mapping.xml:189
 #, no-c-format
 msgid ""
 "Three tables are involved for the subclasses. Each table defines columns for "
@@ -430,14 +430,14 @@
 "para todas as propriedades da classe, incluindo propriedades herdadas."
 
 #. Tag: para
-#: inheritance_mapping.xml:170
-#, no-c-format
+#: inheritance_mapping.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "A limitação dessa abordagem é que se uma propriedade é mapeada na "
 "superclasse, o nome da coluna deve ser o mesmo em todas as tabelas das "
@@ -447,13 +447,13 @@
 "compartilhada através de todas subclasses unidas da hierarquia."
 
 #. Tag: para
-#: inheritance_mapping.xml:179
-#, no-c-format
+#: inheritance_mapping.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "Se sua superclasse é abstrata, mapeie ela com <literal>abstract=\"true\"</"
 "literal>. Claro, que se ela não for abstrata, uma tabela (padrão para "
@@ -461,19 +461,19 @@
 "segurar as instâncias da superclasse."
 
 #. Tag: title
-#: inheritance_mapping.xml:189
-#, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+#: inheritance_mapping.xml:213
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "Tabela por classe concreta, usando polimorfismo implícito"
 
 #. Tag: para
-#: inheritance_mapping.xml:191
+#: inheritance_mapping.xml:215
 #, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr "Uma abordagem alternativa é fazer uso de polimorfismo implícito:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:195
+#: inheritance_mapping.xml:219
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -502,15 +502,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:197
-#, no-c-format
+#: inheritance_mapping.xml:221
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "Veja que em nenhum lugar mencionamos a interface <literal>Payment</literal> "
 "explicitamente. Também preste atenção que propriedades de <literal>Payment</"
@@ -521,7 +521,7 @@
 "literal> no mapeamento)."
 
 #. Tag: para
-#: inheritance_mapping.xml:207
+#: inheritance_mapping.xml:231
 #, no-c-format
 msgid ""
 "The disadvantage of this approach is that Hibernate does not generate SQL "
@@ -531,7 +531,7 @@
 "literal>s SQL quando executa pesquisas polimórficas."
 
 #. Tag: para
-#: inheritance_mapping.xml:212
+#: inheritance_mapping.xml:236
 #, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
@@ -541,7 +541,7 @@
 "literal> geralmente é mapeada usando <literal>&lt;any&gt;</literal>."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:217
+#: inheritance_mapping.xml:241
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"payment\" meta-type=\"string\" id-type=\"long\">\n"
@@ -554,21 +554,20 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:222
+#: inheritance_mapping.xml:246
 #, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr "Misturando polimorfismo implícito com outros mapeamentos de herança"
 
 #. Tag: para
-#: inheritance_mapping.xml:224
-#, no-c-format
+#: inheritance_mapping.xml:248
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "Ainda existe uma coisa para ser observada com respeito a este mapeamento. "
 "Desde que as subclasses sejam mapeadas em seu próprio elemento <literal>&lt;"
@@ -578,7 +577,7 @@
 "cima da interface <literal>Payment</literal>.)"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:232
+#: inheritance_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -611,15 +610,15 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:234
-#, no-c-format
+#: inheritance_mapping.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "Mais uma vez, nós não mencionamos <literal>Payment</literal> explicitamente. "
@@ -631,19 +630,18 @@
 "mas não as instâncias de <literal>NonelectronicTransaction</literal>."
 
 #. Tag: title
-#: inheritance_mapping.xml:249
+#: inheritance_mapping.xml:273
 #, no-c-format
 msgid "Limitations"
 msgstr "Limitações"
 
 #. Tag: para
-#: inheritance_mapping.xml:251
-#, no-c-format
+#: inheritance_mapping.xml:275
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "Existem certas limitações para a abordagem do \"polimorfismo implícito\" "
 "comparada com a estratégia de mapeamento da tabela por classe concreta. "
@@ -651,7 +649,7 @@
 "union-subclass&gt;</literal>."
 
 #. Tag: para
-#: inheritance_mapping.xml:258
+#: inheritance_mapping.xml:282
 #, no-c-format
 msgid ""
 "The following table shows the limitations of table per concrete-class "
@@ -661,128 +659,128 @@
 "concreta e do polimorfismo implícito no Hibernate."
 
 #. Tag: title
-#: inheritance_mapping.xml:264
+#: inheritance_mapping.xml:288
 #, no-c-format
 msgid "Features of inheritance mappings"
 msgstr "Features of inheritance mappings"
 
 #. Tag: entry
-#: inheritance_mapping.xml:276
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "Estratégia de Herança"
 
 #. Tag: entry
-#: inheritance_mapping.xml:277
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "muitos-para-um Polimórfico"
 
 #. Tag: entry
-#: inheritance_mapping.xml:278
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "um-para-um Polimórfico"
 
 #. Tag: entry
-#: inheritance_mapping.xml:279
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "um-para-muitos Polimórfico"
 
 #. Tag: entry
-#: inheritance_mapping.xml:280
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "muitos-para-muitos Polimórfico"
 
 #. Tag: entry
-#: inheritance_mapping.xml:281
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:282
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Pesquisas Polimórficas"
 
 #. Tag: entry
-#: inheritance_mapping.xml:283
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "Joins polimórficos"
 
 #. Tag: entry
-#: inheritance_mapping.xml:284
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "Outer join fetching"
 
 #. Tag: entry
-#: inheritance_mapping.xml:289
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "table per class-hierarchy"
 
 #. Tag: literal
-#: inheritance_mapping.xml:290 inheritance_mapping.xml:301
-#: inheritance_mapping.xml:312
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:291 inheritance_mapping.xml:302
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:292 inheritance_mapping.xml:303
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:293 inheritance_mapping.xml:304
-#: inheritance_mapping.xml:315
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:294 inheritance_mapping.xml:305
-#: inheritance_mapping.xml:316
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:295 inheritance_mapping.xml:306
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
 #. Tag: literal
-#: inheritance_mapping.xml:296 inheritance_mapping.xml:307
-#: inheritance_mapping.xml:318
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:297 inheritance_mapping.xml:308
-#: inheritance_mapping.xml:319
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr "supported"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:325
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -792,13 +790,13 @@
 "table per subclass"
 
 #. Tag: entry
-#: inheritance_mapping.xml:311
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "table per concrete-class (union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:314
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -806,32 +804,32 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:322
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "table per concrete class (implicit polymorphism)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:323
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:324 inheritance_mapping.xml:325
-#: inheritance_mapping.xml:329 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, no-c-format
 msgid "not supported"
 msgstr "not supported"
 
 #. Tag: literal
-#: inheritance_mapping.xml:326
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:327
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: performance.xml:5
+#: performance.xml:29
 #, no-c-format
 msgid "Improving performance"
 msgstr "Aumentando a performance"
 
 #. Tag: title
-#: performance.xml:8
+#: performance.xml:32
 #, no-c-format
 msgid "Fetching strategies"
 msgstr "Estratégias de Fetching"
 
 #. Tag: para
-#: performance.xml:10
-#, no-c-format
+#: performance.xml:34
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "Uma <emphasis>estratégia de fetching</emphasis> é a estratégia que o "
 "Hibernate irá usar para buscar objetos associados se a aplicação precisar "
@@ -38,16 +38,16 @@
 "<literal>Criteria</literal>."
 
 #. Tag: para
-#: performance.xml:17
+#: performance.xml:41
 #, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr "Hibernate3 define as seguintes estratégias de fetching:"
 
 #. Tag: para
-#: performance.xml:23
-#, no-c-format
+#: performance.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -56,13 +56,13 @@
 "literal>."
 
 #. Tag: para
-#: performance.xml:30
-#, no-c-format
+#: performance.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>Select fetching</emphasis> - um segundo <literal>SELECT</literal> "
 "é usado para buscar a entidade ou coleção associada. A menos que você "
@@ -70,14 +70,14 @@
 "esse segundo SELECT será executado apenas quando você acessar a associação."
 
 #. Tag: para
-#: performance.xml:39
-#, no-c-format
+#: performance.xml:63
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>Subselect fetching</emphasis> - um segundo <literal>SELECT</"
 "literal> será usado para buscar as coleções associadas de todas as entidades "
@@ -86,12 +86,12 @@
 "SELECT será executado apenas quando você acessar a associação."
 
 #. Tag: para
-#: performance.xml:48
-#, no-c-format
+#: performance.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>Batch fetching</emphasis> - uma opção de otimização para o Select "
@@ -100,17 +100,17 @@
 "ou chaves estrangeiras."
 
 #. Tag: para
-#: performance.xml:57
+#: performance.xml:81
 #, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "O Hibernate distingue também entre:"
 
 #. Tag: para
-#: performance.xml:63
-#, no-c-format
+#: performance.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>Immediate fetching</emphasis> - uma associação, coleção ou "
 "atributo é buscado como ela é carregada (Qual SQL é usado). Não se confuda "
@@ -120,25 +120,25 @@
 "carregado."
 
 #. Tag: para
-#: performance.xml:69
-#, no-c-format
+#: performance.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>Lazy collection fetching</emphasis> - a coleção é buscada quando a "
 "aplicação invoca uma operação sobre aquela coleção (Esse é o padrão para "
 "coleções)"
 
 #. Tag: para
-#: performance.xml:76
-#, no-c-format
+#: performance.xml:100
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - elementos "
 "individuais de uma coleção são acessados do banco de dados quando preciso. O "
@@ -146,10 +146,10 @@
 "seja absolutamente preciso. (indicado para coleções muito grandes)"
 
 #. Tag: para
-#: performance.xml:84
-#, no-c-format
+#: performance.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -158,15 +158,15 @@
 "objeto associado."
 
 #. Tag: para
-#: performance.xml:91
-#, no-c-format
+#: performance.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>\"No-proxy\" fetching</emphasis> - uma associação de um valor é "
 "carregada quando a variável da instância é carregada. Comparada com a proxy "
@@ -176,10 +176,10 @@
 "de bytecodes em build-time e é raramente necessário."
 
 #. Tag: para
-#: performance.xml:101
-#, no-c-format
+#: performance.xml:125
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -188,14 +188,15 @@
 "requer instrumentação de bytecodes em build-time e é raramente necessário."
 
 #. Tag: para
-#: performance.xml:110
-#, no-c-format
+#: performance.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "Nós temos aqui duas noções ortogonais: <emphasis>quando</emphasis> a "
 "associação é carregada e <emphasis>como </emphasis> ela é carregada (Qual "
@@ -205,31 +206,30 @@
 "classe qualquer."
 
 #. Tag: title
-#: performance.xml:119
+#: performance.xml:143
 #, no-c-format
 msgid "Working with lazy associations"
 msgstr "Inicializando coleções e proxies"
 
 #. Tag: para
-#: performance.xml:121
-#, no-c-format
+#: performance.xml:145
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "Por padrão, o Hibernate3 usa busca preguiçosa para coleções e busca "
 "preguiçosa com proxy para associações de um valor. Esses padrões fazem "
 "sentido para quase todas as associações em quase todas a aplicações."
 
 #. Tag: para
-#: performance.xml:127
-#, no-c-format
+#: performance.xml:151
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>Veja:</emphasis> se voce setar <literal>hibernate."
 "default_batch_fetch_size</literal>, O Hibernate irá usar otimização de "
@@ -237,19 +237,18 @@
 "também habilitada em um nível mais fino)."
 
 #. Tag: para
-#: performance.xml:134
-#, no-c-format
+#: performance.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "Porém, a busca preguiçosa tem um problema que você precisar saber. Acesso a "
 "associações preguiçosas fora do contexto de uma sessão aberta do Hibernate "
 "irá resultar numa exceção. Por exemplo:"
 
 #. Tag: programlisting
-#: performance.xml:140
+#: performance.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
@@ -266,14 +265,14 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:142
-#, no-c-format
+#: performance.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "Como a coleção de permissões não foi inicializada quando a <literal>Session</"
 "literal> foi fechada, a coleção não poderá carregar o seu estado. O "
@@ -282,15 +281,15 @@
 "antes da transação ser comitada."
 
 #. Tag: para
-#: performance.xml:150
-#, no-c-format
+#: performance.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "Alternativamente, nós podemos usar uma coleção ou associação não preguiçosa, "
 "especificando <literal>lazy=\"false\"</literal> para o mapeamento da "
@@ -300,14 +299,14 @@
 "precisar carregar o banco de dados inteiro na memória em cada transação!"
 
 #. Tag: para
-#: performance.xml:159
-#, no-c-format
+#: performance.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "Por outro lado, nós geralmente escolhemos join fetching (que é não "
 "preguiçosa por natureza) ao invés de select fetching em uma transação "
@@ -316,13 +315,13 @@
 "identicos para as associações simples e para coleções."
 
 #. Tag: title
-#: performance.xml:170
+#: performance.xml:194
 #, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "Personalizando as estratégias de busca"
 
 #. Tag: para
-#: performance.xml:172
+#: performance.xml:196
 #, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
@@ -333,7 +332,7 @@
 "mapeamento:"
 
 #. Tag: programlisting
-#: performance.xml:177
+#: performance.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
@@ -344,13 +343,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:179
+#: performance.xml:203
 #, no-c-format
 msgid "<![CDATA[<many-to-one name=\"mother\" class=\"Cat\" fetch=\"join\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:181
+#: performance.xml:205
 #, no-c-format
 msgid ""
 "The <literal>fetch</literal> strategy defined in the mapping document "
@@ -360,36 +359,36 @@
 "afeta:"
 
 #. Tag: para
-#: performance.xml:187
+#: performance.xml:211
 #, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr "recupera via <literal>get()</literal> ou <literal>load()</literal>"
 
 #. Tag: para
-#: performance.xml:192
+#: performance.xml:216
 #, no-c-format
 msgid "retrieval that happens implicitly when an association is navigated"
 msgstr ""
 "Recuperações que acontecem implicitamente quando navegamos por uma associação"
 
 #. Tag: para
-#: performance.xml:197
+#: performance.xml:221
 #, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr "<literal>Criteria</literal> queries"
 
 #. Tag: para
-#: performance.xml:202
+#: performance.xml:226
 #, no-c-format
 msgid "HQL queries if <literal>subselect</literal> fetching is used"
 msgstr "buscas por HQL se buscar por <literal>subselect</literal> for usado"
 
 #. Tag: para
-#: performance.xml:208
-#, no-c-format
+#: performance.xml:232
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "Independentemente da estratégia de busca que você usar, o grafo não "
@@ -398,11 +397,11 @@
 "particular."
 
 #. Tag: para
-#: performance.xml:214
-#, no-c-format
+#: performance.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -416,19 +415,19 @@
 "você irá usar <literal>setFetchMode(FetchMode.JOIN)</literal>."
 
 #. Tag: para
-#: performance.xml:223
-#, no-c-format
+#: performance.xml:247
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "Se você quiser mudar a estratégia de busca usada pelo <literal>get()</"
 "literal> ou <literal>load()</literal>, simplesmente use uma query "
 "<literal>Criteria</literal>, por exemplo:"
 
 #. Tag: programlisting
-#: performance.xml:229
+#: performance.xml:253
 #, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
@@ -438,41 +437,41 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:231
-#, no-c-format
+#: performance.xml:255
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(Isto é o equivalente do Hibernate para o que algumas soluções ORM chamam de "
 "\"plano de busca\")"
 
 #. Tag: para
-#: performance.xml:235
-#, no-c-format
+#: performance.xml:259
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr ""
 "Um meio totalmente diferente de evitar problemas com selects N+1 é usar um "
 "cache de segundo nível."
 
 #. Tag: title
-#: performance.xml:243
+#: performance.xml:267
 #, no-c-format
 msgid "Single-ended association proxies"
 msgstr "Proxies de associação single-ended"
 
 #. Tag: para
-#: performance.xml:245
-#, no-c-format
+#: performance.xml:269
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "A recuperação preguiçosa para coleções é implementada usando uma "
 "implementação própria do Hibernate para coleções persistentes. Porém, um "
@@ -483,10 +482,10 @@
 "biblioteca CGLIB)."
 
 #. Tag: para
-#: performance.xml:253
-#, no-c-format
+#: performance.xml:277
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -495,14 +494,14 @@
 "associações <literal>many-to-one</literal> e <literal>one-to-one</literal>."
 
 #. Tag: para
-#: performance.xml:259
-#, no-c-format
+#: performance.xml:283
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "O arquivo de mapeamento deve declaram uma interface para usar como interface "
 "de proxy para aquela classe, com o atributo <literal>proxy</literal>. Por "
@@ -512,17 +511,17 @@
 "todas as classes persistentes!</emphasis>"
 
 #. Tag: para
-#: performance.xml:266
-#, no-c-format
+#: performance.xml:290
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr ""
 "Existe alguns truques que você deve saber quando extender esse comportamento "
 "para classes polimórficas, dessa maneira:"
 
 #. Tag: programlisting
-#: performance.xml:271
+#: performance.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -534,7 +533,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:273
+#: performance.xml:296
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -546,7 +545,7 @@
 "uma estância de <literal>DomesticCat</literal>:"
 
 #. Tag: programlisting
-#: performance.xml:279
+#: performance.xml:302
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -559,13 +558,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:281
-#, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr "É possível quebrar o proxy <literal>==</literal>."
 
 #. Tag: programlisting
-#: performance.xml:285
+#: performance.xml:308
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -577,7 +576,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:287
+#: performance.xml:310
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -589,7 +588,7 @@
 "objeto"
 
 #. Tag: programlisting
-#: performance.xml:292
+#: performance.xml:315
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -597,22 +596,22 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:294
-#, no-c-format
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr ""
 "Terceiro, Você não pode usar um proxy CGLIB em uma classe <literal>final</"
 "literal> ou com qualquer método <literal>final</literal>."
 
 #. Tag: para
-#: performance.xml:299
-#, no-c-format
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "Finalmente, se o seu objeto persistente adquirir qualquer recursto durante a "
@@ -621,13 +620,16 @@
 "classe persistente."
 
 #. Tag: para
-#: performance.xml:305
-#, no-c-format
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "Esses problemas são todos devido a limitação fundamental do modelo de "
 "herança simples do Java. Se você quiser evitar esse problemas em suas "
@@ -636,7 +638,7 @@
 "mapeamento. Ex:"
 
 #. Tag: programlisting
-#: performance.xml:311
+#: performance.xml:336
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -648,25 +650,19 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:313
-#, no-c-format
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"onde <literal>CatImpl</literal> implementa a interface <literal>Cat</"
-"literal> e <literal>DomesticCatImpl</literal> implementa a interface "
-"<literal>DomesticCat</literal>. Então proxies para instâncias de "
-"<literal>Cat</literal> e <literal>DomesticCat</literal> serão retornadas por "
-"<literal>load()</literal> ou <literal>iterate()</literal>. (Note que "
-"<literal>list()</literal> geralmente não retorna proxies)."
+"Primeiramente, instâncias de <literal>Cat</literal> nunca seráo convertidas "
+"para <literal>DomesticCat</literal>, mesmo que a instância em questão seja "
+"uma estância de <literal>DomesticCat</literal>:"
 
 #. Tag: programlisting
-#: performance.xml:321
+#: performance.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -675,8 +671,20 @@
 "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "<literal>Criteria</literal> queries"
+
+#. Tag: para
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -688,41 +696,41 @@
 "literal>, e não <literal>CatImpl</literal>."
 
 #. Tag: para
-#: performance.xml:328
-#, no-c-format
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr ""
 "Algumas operações <emphasis>não</emphasis> requerem inicialização por proxy:"
 
 #. Tag: para
-#: performance.xml:334
-#, no-c-format
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal>, se a classe persistente não sobrescrever "
 "<literal>equals()</literal>"
 
 #. Tag: para
-#: performance.xml:340
-#, no-c-format
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal>, se a classe persistente não sobrescrever "
 "<literal>hashCode()</literal>"
 
 #. Tag: para
-#: performance.xml:346
+#: performance.xml:375
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "O método getter do identificador"
 
 #. Tag: para
-#: performance.xml:352
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -732,13 +740,13 @@
 "<literal>equals()</literal> ou <literal>hashCode()</literal>."
 
 #. Tag: para
-#: performance.xml:357
-#, no-c-format
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "Escolhendo <literal>lazy=\"no-proxy\"</literal> ao invés do padrão "
 "<literal>lazy=\"proxy\"</literal>, podemos evitar problemas associados com "
@@ -747,19 +755,19 @@
 "imediatas."
 
 #. Tag: title
-#: performance.xml:367
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "Inicializando coleções e proxies"
 
 #. Tag: para
-#: performance.xml:369
-#, no-c-format
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "Será lançada uma <literal>LazyInitializationException</literal> se uma "
 "coleção não inicializada ou proxy é acessado fora do escopo da "
@@ -767,14 +775,14 @@
 "ou tem a referência ao proxy estiver no estado destachado."
 
 #. Tag: para
-#: performance.xml:375
-#, no-c-format
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "Algumas vezes precisamos garantir qie o proxy ou coleção é inicializado "
 "antes de se fechar a <literal>Session</literal>. Claro que sempre podemos "
@@ -783,11 +791,11 @@
 "confuso para quem lê o código e não é conveniente para códigos genéricos."
 
 #. Tag: para
-#: performance.xml:382
-#, no-c-format
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -804,11 +812,11 @@
 "kittens."
 
 #. Tag: para
-#: performance.xml:391
-#, no-c-format
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -824,11 +832,11 @@
 "inicializada. Existem dois caminhos básicos para lidar com esse problema:"
 
 #. Tag: para
-#: performance.xml:402
-#, no-c-format
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -848,21 +856,20 @@
 "View\""
 
 #. Tag: para
-#: performance.xml:415
-#, no-c-format
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "Em uma aplicação com uma camada de negócios separada, a lógica de negócios "
 "deve \"preparar\" todas as coleções que serão usadas pela camada web antes "
@@ -877,14 +884,14 @@
 "<emphasis>Session Facade</emphasis>."
 
 #. Tag: para
-#: performance.xml:430
-#, no-c-format
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "Você também pode anexar um objeto prevaimente carregado em uma nova "
 "<literal>Session</literal><literal>merge()</literal> or <literal>lock()</"
@@ -893,17 +900,18 @@
 "automaticamente pois isso introduziria semantica em transações ad hoc."
 
 #. Tag: para
-#: performance.xml:440
-#, no-c-format
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "As vezes você não quer inicializar uma coleção muito grande, mas precisa de "
 "algumas informações (como o tamanho) ou alguns de seus dados."
 
 #. Tag: para
-#: performance.xml:445
+#: performance.xml:474
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -912,7 +920,7 @@
 "Você pode usar um filtro de coleção para saber seu tamanho sem a inicializar:"
 
 #. Tag: programlisting
-#: performance.xml:449
+#: performance.xml:478
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -920,7 +928,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:451
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -932,7 +940,7 @@
 "inteira:"
 
 #. Tag: programlisting
-#: performance.xml:456
+#: performance.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -940,20 +948,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:461
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "Usando busca em lote"
 
 #. Tag: para
-#: performance.xml:463
-#, no-c-format
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "O Hibernate pode fazer uso eficiente de busca em lote, isto é, o Hibernate "
 "pode carregar diversos proxies não inicializados se um proxy é acessado (ou "
@@ -962,19 +969,19 @@
 "nível da classe ou no nível da coleção."
 
 #. Tag: para
-#: performance.xml:469
-#, no-c-format
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "A recuperação em lote para classes/entidades é mais fácil de entender. "
 "Imagine que você tem a seguinte situação em tempo de execução: Você tem 25 "
@@ -989,27 +996,27 @@
 "no mapeamento da classe <literal>Person</literal>:"
 
 #. Tag: programlisting
-#: performance.xml:479
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:481
-#, no-c-format
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr ""
 "O Hibernate irá executar agora apenas três consultas, buscando por vez, 10, "
 "10 e 5 Person."
 
 #. Tag: para
-#: performance.xml:485
-#, no-c-format
+#: performance.xml:514
+#, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
-"and 10 persons are currently loaded in the <literal>Sesssion</literal>, "
+"and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
 "one for every call to <literal>getCats()</literal>. If you enable batch "
 "fetching for the <literal>cats</literal> collection in the mapping of "
@@ -1025,7 +1032,7 @@
 "pré carga das coleções:"
 
 #. Tag: programlisting
-#: performance.xml:494
+#: performance.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1036,7 +1043,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:496
+#: performance.xml:525
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -1050,13 +1057,13 @@
 "<literal>Session</literal>."
 
 #. Tag: para
-#: performance.xml:502
-#, no-c-format
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "A busca em lote de coleções é particularmente útil quando você tem uma "
 "árvore encadeada de items, ex. o típico padrão bill-of-materials (Se bem que "
@@ -1065,40 +1072,40 @@
 "leitura)"
 
 #. Tag: title
-#: performance.xml:511
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "Usando subselect fetching"
 
 #. Tag: para
-#: performance.xml:513
-#, no-c-format
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "Se uma coleção ou proxy simples precisa ser recuperado, o Hibernate carrega "
 "todos eles rodando novamente a query original em um subselect. Isso funciona "
 "da mesma maneira que busca em lote, sem carregar tanto."
 
 #. Tag: title
-#: performance.xml:524
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "Usando busca preguiçosa de propriedade"
 
 #. Tag: para
-#: performance.xml:526
-#, no-c-format
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "O Hibernate3 suporta a carga posterior de propriedades individuais. Essa "
 "técnica de otimização também conhecida como <emphasis>fetch groups</"
@@ -1109,7 +1116,7 @@
 "centenas de colunas e o modelo de dados não pode ser melhorado."
 
 #. Tag: para
-#: performance.xml:535
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1119,7 +1126,7 @@
 "<literal>lazy</literal> no seu mapeamento de propriedade:"
 
 #. Tag: programlisting
-#: performance.xml:540
+#: performance.xml:569
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1135,25 +1142,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:542
-#, no-c-format
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "A carga posterior de propriedades requer instrumentação de bytecode! Se suas "
 "classes persistentes não forem melhoradas, o Hibernate irá ignorar "
 "silenciosamente essa configuração e usará busca imediatamente."
 
 #. Tag: para
-#: performance.xml:548
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr "Para instrumentação de bytecode, use a seguinte tarefa do Ant:"
 
 #. Tag: programlisting
-#: performance.xml:552
+#: performance.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1173,13 +1180,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:554
-#, no-c-format
+#: performance.xml:583
+#, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a prefered solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "A different (better?) way to avoid unnecessary column reads, at least for "
 "read-only transactions is to use the projection features of HQL or Criteria "
@@ -1187,32 +1194,32 @@
 "certainly a prefered solution."
 
 #. Tag: para
-#: performance.xml:561
-#, no-c-format
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "You may force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 
 #. Tag: title
-#: performance.xml:571
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "The Second Level Cache"
 
 #. Tag: para
-#: performance.xml:573
-#, no-c-format
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
@@ -1223,17 +1230,16 @@
 "cached data)."
 
 #. Tag: para
-#: performance.xml:581
-#, no-c-format
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
@@ -1245,162 +1251,180 @@
 "provider; that is no longer the case as of 3.2."
 
 #. Tag: title
-#: performance.xml:592
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr "Cache Providers"
 
 #. Tag: entry
-#: performance.xml:601 performance.xml:774
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr "Cache"
 
 #. Tag: entry
-#: performance.xml:602
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr "Provider class"
 
 #. Tag: entry
-#: performance.xml:603
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
 #. Tag: entry
-#: performance.xml:604
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "Cluster Safe"
 
 #. Tag: entry
-#: performance.xml:605
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "Query Cache Supported"
 
 #. Tag: entry
-#: performance.xml:610 performance.xml:783
+#: performance.xml:639 performance.xml:827
 #, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr "Hashtable (not intended for production use)"
 
 #. Tag: literal
-#: performance.xml:611
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:612
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr "memory"
 
 #. Tag: entry
-#: performance.xml:614 performance.xml:621 performance.xml:628
-#: performance.xml:784 performance.xml:785 performance.xml:786
-#: performance.xml:791 performance.xml:792 performance.xml:793
-#: performance.xml:798 performance.xml:799 performance.xml:800
-#: performance.xml:805 performance.xml:806 performance.xml:812
-#: performance.xml:815
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:617 performance.xml:790
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:618
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:619 performance.xml:626
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr "memory, disk"
 
 #. Tag: entry
-#: performance.xml:624 performance.xml:797
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:625
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:631 performance.xml:804
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:632
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:633
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "clustered (ip multicast)"
 
 #. Tag: entry
-#: performance.xml:634
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "yes (clustered invalidation)"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:811
-#, no-c-format
-msgid "JBoss TreeCache"
+#: performance.xml:667 performance.xml:855
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:639
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:640
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "clustered (ip multicast), transactional"
 
 #. Tag: entry
-#: performance.xml:641
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr "yes (replication)"
 
 #. Tag: entry
-#: performance.xml:642
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "yes (clock sync req.)"
 
+#. Tag: entry
+#: performance.xml:674 performance.xml:862
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "JBoss TreeCache"
+
+#. Tag: literal
+#: performance.xml:675
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:677
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "yes (clustered invalidation)"
+
 #. Tag: title
-#: performance.xml:649
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr "Cache mappings"
 
 #. Tag: para
-#: performance.xml:651
+#: performance.xml:687
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1410,7 +1434,7 @@
 "mapping has the following form:"
 
 #. Tag: programlisting
-#: performance.xml:662
+#: performance.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1421,7 +1445,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:665
+#: performance.xml:701
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1433,22 +1457,22 @@
 "<literal>nonstrict-read-write</literal> or <literal>read-only</literal>"
 
 #. Tag: para
-#: performance.xml:674
-#, no-c-format
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (optional, defaults to the class or collection "
 "role name) specifies the name of the second level cache region"
 
 #. Tag: para
-#: performance.xml:681
-#, no-c-format
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (optional, defaults to <literal>all</literal>) "
@@ -1457,19 +1481,19 @@
 "lazy fetching is enabled"
 
 #. Tag: para
-#: performance.xml:691
-#, no-c-format
+#: performance.xml:727
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
 "literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
 "<literal>hibernate.cfg.xml</literal>."
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:732
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1479,18 +1503,18 @@
 "concurrency strategy</emphasis>."
 
 #. Tag: title
-#: performance.xml:703
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "Strategy: read only"
 
 #. Tag: para
-#: performance.xml:705
-#, no-c-format
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "If your application needs to read but never modify instances of a persistent "
@@ -1499,7 +1523,7 @@
 "cluster."
 
 #. Tag: programlisting
-#: performance.xml:711
+#: performance.xml:747
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1509,26 +1533,26 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:717
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "Strategy: read/write"
 
 #. Tag: para
-#: performance.xml:719
-#, no-c-format
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
@@ -1543,7 +1567,7 @@
 "<emphasis>not</emphasis>."
 
 #. Tag: programlisting
-#: performance.xml:730
+#: performance.xml:766
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1557,18 +1581,18 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:735
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "Strategy: nonstrict read/write"
 
 #. Tag: para
-#: performance.xml:737
-#, no-c-format
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1585,18 +1609,18 @@
 "</literal> or <literal>Session.disconnect()</literal> is called."
 
 #. Tag: title
-#: performance.xml:749
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "Strategy: transactional"
 
 #. Tag: para
-#: performance.xml:751
-#, no-c-format
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "The <literal>transactional</literal> cache strategy provides support for "
@@ -1604,60 +1628,75 @@
 "may only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 
+#. Tag: title
+#: performance.xml:796
+#, fuzzy, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
+msgstr "Cache Concurrency Strategy Support"
+
 #. Tag: para
-#: performance.xml:759
-#, no-c-format
+#: performance.xml:799
+#, fuzzy, no-c-format
 msgid ""
+"None of the cache providers support all of the cache concurrency strategies."
+msgstr ""
 "None of the cache providers support all of the cache concurrency strategies. "
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
+
+#. Tag: para
+#: performance.xml:804
+#, fuzzy, no-c-format
+msgid ""
+"The following table shows which providers are compatible with which "
+"concurrency strategies."
 msgstr ""
 "None of the cache providers support all of the cache concurrency strategies. "
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 
 #. Tag: title
-#: performance.xml:765
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "Cache Concurrency Strategy Support"
 
 #. Tag: entry
-#: performance.xml:775
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr "read-only"
 
 #. Tag: entry
-#: performance.xml:776
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write"
 
 #. Tag: entry
-#: performance.xml:777
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr "read-write"
 
 #. Tag: entry
-#: performance.xml:778
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
 #. Tag: title
-#: performance.xml:824
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr "Managing the caches"
 
 #. Tag: para
-#: performance.xml:826
-#, no-c-format
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1671,14 +1710,14 @@
 "<literal>Session</literal>."
 
 #. Tag: para
-#: performance.xml:833
-#, no-c-format
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
@@ -1689,7 +1728,7 @@
 "cache."
 
 #. Tag: programlisting
-#: performance.xml:841
+#: performance.xml:894
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1702,7 +1741,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:843
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1712,17 +1751,17 @@
 "method to determine if an instance belongs to the session cache."
 
 #. Tag: para
-#: performance.xml:848
-#, no-c-format
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "To completely evict all objects from the session cache, call "
 "<literal>Session.clear()</literal>"
 
 #. Tag: para
-#: performance.xml:852
+#: performance.xml:905
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1734,7 +1773,7 @@
 "instance, entire class, collection instance or entire collection role."
 
 #. Tag: programlisting
-#: performance.xml:858
+#: performance.xml:911
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1746,53 +1785,53 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:860
-#, no-c-format
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
 "with the second-level cache."
 
 #. Tag: para
-#: performance.xml:867
-#, no-c-format
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr ""
 "<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
 "second-level cache"
 
 #. Tag: para
-#: performance.xml:872
-#, no-c-format
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - read items from the second-level cache, "
 "but don't write to the second-level cache except when updating data"
 
 #. Tag: para
-#: performance.xml:878
-#, no-c-format
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
 "but don't read from the second-level cache"
 
 #. Tag: para
-#: performance.xml:884
-#, no-c-format
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - write items to the second-level "
 "cache, but don't read from the second-level cache, bypass the effect of "
@@ -1800,7 +1839,7 @@
 "the second-level cache for all items read from the database"
 
 #. Tag: para
-#: performance.xml:892
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1810,7 +1849,7 @@
 "<literal>Statistics</literal> API:"
 
 #. Tag: programlisting
-#: performance.xml:897
+#: performance.xml:950
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1819,17 +1858,17 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:899
-#, no-c-format
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "You'll need to enable statistics, and, optionally, force Hibernate to keep "
 "the cache entries in a more human-understandable format:"
 
 #. Tag: programlisting
-#: performance.xml:904
+#: performance.xml:957
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1837,41 +1876,40 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:909
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr "The Query Cache"
 
 #. Tag: para
-#: performance.xml:911
-#, no-c-format
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "Query result sets may also be cached. This is only useful for queries that "
 "are run frequently with the same parameters. To use the query cache you must "
 "first enable it:"
 
 #. Tag: programlisting
-#: performance.xml:916
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:918
-#, no-c-format
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "This setting causes the creation of two new cache regions - one holding "
 "cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
@@ -1883,10 +1921,10 @@
 "second-level cache."
 
 #. Tag: para
-#: performance.xml:928
-#, no-c-format
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1897,11 +1935,11 @@
 "results to the cache when it is executed."
 
 #. Tag: para
-#: performance.xml:935
-#, no-c-format
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "If you require fine-grained control over query cache expiration policies, "
@@ -1909,7 +1947,7 @@
 "<literal>Query.setCacheRegion()</literal>."
 
 #. Tag: programlisting
-#: performance.xml:941
+#: performance.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1922,7 +1960,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:943
+#: performance.xml:996
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1942,55 +1980,52 @@
 "<literal>SessionFactory.evictQueries()</literal>."
 
 #. Tag: title
-#: performance.xml:955
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "Understanding Collection performance"
 
 #. Tag: para
-#: performance.xml:957
+#: performance.xml:1010
 #, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
 
 #. Tag: title
-#: performance.xml:964
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr "Taxonomy"
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate defines three basic kinds of collections:"
 
 #. Tag: para
-#: performance.xml:970
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr "collections of values"
 
 #. Tag: para
-#: performance.xml:973
-#, no-c-format
-msgid "one to many associations"
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "one to many associations"
 
 #. Tag: para
-#: performance.xml:976
-#, no-c-format
-msgid "many to many associations"
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "many to many associations"
 
 #. Tag: para
-#: performance.xml:980
+#: performance.xml:1033
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -2008,31 +2043,31 @@
 "This suggests the following classification:"
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr "indexed collections"
 
 #. Tag: para
-#: performance.xml:994
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr "sets"
 
 #. Tag: para
-#: performance.xml:997
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr "bags"
 
 #. Tag: para
-#: performance.xml:1001
-#, no-c-format
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "All indexed collections (maps, lists, arrays) have a primary key consisting "
@@ -2042,18 +2077,18 @@
 "efficiently located when Hibernate tries to update or delete it."
 
 #. Tag: para
-#: performance.xml:1009
-#, no-c-format
+#: performance.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
 "element columns. This may be less efficient for some types of collection "
@@ -2066,24 +2101,24 @@
 "declare all columns as <literal>not-null=\"true\"</literal>.)"
 
 #. Tag: para
-#: performance.xml:1020
-#, no-c-format
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
 "are always very efficient to update. In fact, they are the best case."
 
 #. Tag: para
-#: performance.xml:1025
-#, no-c-format
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "Bags are the worst case. Since a bag permits duplicate element values and "
 "has no index column, no primary key may be defined. Hibernate has no way of "
@@ -2092,13 +2127,13 @@
 "the collection whenever it changes. This might be very inefficient."
 
 #. Tag: para
-#: performance.xml:1033
-#, no-c-format
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "Note that for a one-to-many association, the \"primary key\" may not be the "
 "physical primary key of the database table - but even in this case, the "
@@ -2106,7 +2141,7 @@
 "\"locates\" individual rows of the collection.)"
 
 #. Tag: title
-#: performance.xml:1043
+#: performance.xml:1096
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
@@ -2114,28 +2149,28 @@
 "Lists, maps, idbags and sets are the most efficient collections to update"
 
 #. Tag: para
-#: performance.xml:1045
-#, no-c-format
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "From the discussion above, it should be clear that indexed collections and "
 "(usually) sets allow the most efficient operation in terms of adding, "
 "removing and updating elements."
 
 #. Tag: para
-#: performance.xml:1051
-#, no-c-format
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "There is, arguably, one more advantage that indexed collections have over "
 "sets for many to many associations or collections of values. Because of the "
@@ -2146,12 +2181,12 @@
 "consideration does not apply to one to many associations."
 
 #. Tag: para
-#: performance.xml:1060
-#, no-c-format
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -2162,14 +2197,14 @@
 "are most natural in the relational model."
 
 #. Tag: para
-#: performance.xml:1068
-#, no-c-format
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "However, in well-designed Hibernate domain models, we usually see that most "
 "collections are in fact one-to-many associations with <literal>inverse=\"true"
@@ -2178,24 +2213,23 @@
 "performance simply do not apply."
 
 #. Tag: title
-#: performance.xml:1078
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr "Bags and lists are the most efficient inverse collections"
 
 #. Tag: para
-#: performance.xml:1080
-#, no-c-format
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "Just before you ditch bags forever, there is a particular case in which bags "
 "(and also lists) are much more performant than sets. For a collection with "
@@ -2208,7 +2242,7 @@
 "much faster."
 
 #. Tag: programlisting
-#: performance.xml:1090
+#: performance.xml:1143
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2219,20 +2253,19 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1095
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr "One shot delete"
 
 #. Tag: para
-#: performance.xml:1097
-#, no-c-format
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "Occasionally, deleting collection elements one by one can be extremely "
 "inefficient. Hibernate isn't completely stupid, so it knows not to do that "
@@ -2241,13 +2274,13 @@
 "<literal>DELETE</literal> and we are done!"
 
 #. Tag: para
-#: performance.xml:1104
-#, no-c-format
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "Suppose we add a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
@@ -2255,7 +2288,7 @@
 "collection is a bag). This is certainly desirable."
 
 #. Tag: para
-#: performance.xml:1110
+#: performance.xml:1163
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2265,41 +2298,40 @@
 "thee new elements. There are two possible ways to proceed"
 
 #. Tag: para
-#: performance.xml:1117
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "delete eighteen rows one by one and then insert three rows"
 
 #. Tag: para
-#: performance.xml:1120
-#, no-c-format
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr ""
 "remove the whole collection (in one SQL <literal>DELETE</literal>) and "
 "insert all five current elements (one by one)"
 
 #. Tag: para
-#: performance.xml:1125
-#, no-c-format
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernate isn't smart enough to know that the second option is probably "
 "quicker in this case. (And it would probably be undesirable for Hibernate to "
 "be that smart; such behaviour might confuse database triggers, etc.)"
 
 #. Tag: para
-#: performance.xml:1131
-#, no-c-format
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "Fortunately, you can force this behaviour (ie. the second strategy) at any "
 "time by discarding (ie. dereferencing) the original collection and returning "
@@ -2307,23 +2339,23 @@
 "very useful and powerful from time to time."
 
 #. Tag: para
-#: performance.xml:1137
-#, no-c-format
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "Of course, one-shot-delete does not apply to collections mapped "
 "<literal>inverse=\"true\"</literal>."
 
 #. Tag: title
-#: performance.xml:1146
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "Monitoring performance"
 
 #. Tag: para
-#: performance.xml:1148
+#: performance.xml:1201
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2337,13 +2369,13 @@
 "<literal>SessionFactory</literal>."
 
 #. Tag: title
-#: performance.xml:1155
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "Monitoring a SessionFactory"
 
 #. Tag: para
-#: performance.xml:1157
+#: performance.xml:1210
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2355,11 +2387,11 @@
 "and read or display the <literal>Statistics</literal> yourself."
 
 #. Tag: para
-#: performance.xml:1163
-#, no-c-format
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2369,7 +2401,7 @@
 "following code for minimalistic configuration examples:"
 
 #. Tag: programlisting
-#: performance.xml:1170
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2385,7 +2417,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1173
+#: performance.xml:1226
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2399,29 +2431,16 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1175
-#, no-c-format
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
-
-#. Tag: para
-#: performance.xml:1180
-#, no-c-format
-msgid ""
 "You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1238
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2431,7 +2450,7 @@
 "to <literal>false</literal>"
 
 #. Tag: para
-#: performance.xml:1192
+#: performance.xml:1245
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2441,11 +2460,11 @@
 "or <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
 
 #. Tag: para
-#: performance.xml:1199
-#, no-c-format
+#: performance.xml:1252
+#, fuzzy, no-c-format
 msgid ""
-"Statistics can be reset programatically using the <literal>clear()</literal> "
-"method. A summary can be sent to a logger (info level) using the "
+"Statistics can be reset programmatically using the <literal>clear()</"
+"literal> method. A summary can be sent to a logger (info level) using the "
 "<literal>logSummary()</literal> method."
 msgstr ""
 "Statistics can be reset programatically using the <literal>clear()</literal> "
@@ -2453,19 +2472,19 @@
 "<literal>logSummary()</literal> method."
 
 #. Tag: title
-#: performance.xml:1208
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr "Metrics"
 
 #. Tag: para
-#: performance.xml:1210
-#, no-c-format
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "Hibernate provides a number of metrics, from very basic to the specialized "
 "information only relevant in certain scenarios. All available counters are "
@@ -2473,7 +2492,7 @@
 "categories:"
 
 #. Tag: para
-#: performance.xml:1217
+#: performance.xml:1270
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2483,17 +2502,17 @@
 "number of open sessions, retrieved JDBC connections, etc."
 
 #. Tag: para
-#: performance.xml:1223
-#, no-c-format
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr ""
 "Metrics related to he entities, collections, queries, and caches as a whole "
 "(aka global metrics),"
 
 #. Tag: para
-#: performance.xml:1229
+#: performance.xml:1282
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2503,14 +2522,14 @@
 "region."
 
 #. Tag: para
-#: performance.xml:1236
-#, no-c-format
+#: performance.xml:1289
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"For example, you can check the cache hit, miss, and put ratio of entities, "
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "For exampl,e you can check the cache hit, miss, and put ratio of entities, "
 "collections and queries, and the average time a query needs. Beware that the "
@@ -2519,8 +2538,8 @@
 "accurate to 10 seconds."
 
 #. Tag: para
-#: performance.xml:1243
-#, no-c-format
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2529,7 +2548,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
@@ -2543,7 +2562,7 @@
 "example:"
 
 #. Tag: programlisting
-#: performance.xml:1253
+#: performance.xml:1306
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2565,12 +2584,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1255
-#, no-c-format
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2580,5 +2599,42 @@
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "onde <literal>CatImpl</literal> implementa a interface <literal>Cat</"
+#~ "literal> e <literal>DomesticCatImpl</literal> implementa a interface "
+#~ "<literal>DomesticCat</literal>. Então proxies para instâncias de "
+#~ "<literal>Cat</literal> e <literal>DomesticCat</literal> serão retornadas "
+#~ "por <literal>load()</literal> ou <literal>iterate()</literal>. (Note que "
+#~ "<literal>list()</literal> geralmente não retorna proxies)."
+
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+
 #~ msgid "yes"
 #~ msgstr "yes"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,20 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: persistent_classes.xml:5
+#: persistent_classes.xml:29
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "Persistent Classes"
 
 #. Tag: para
-#: persistent_classes.xml:7
-#, no-c-format
+#: persistent_classes.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
@@ -31,14 +32,14 @@
 "in the persistent state - an instance may instead be transient or detached."
 
 #. Tag: para
-#: persistent_classes.xml:14
-#, no-c-format
+#: persistent_classes.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
@@ -47,20 +48,22 @@
 "in other ways: using trees of <literal>Map</literal> instances, for example."
 
 #. Tag: title
-#: persistent_classes.xml:23
+#: persistent_classes.xml:47
 #, no-c-format
 msgid "A simple POJO example"
 msgstr "A simple POJO example"
 
 #. Tag: para
-#: persistent_classes.xml:25
-#, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+#: persistent_classes.xml:49
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr ""
 "Most Java applications require a persistent class representing felines."
 
 #. Tag: programlisting
-#: persistent_classes.xml:29
+#: persistent_classes.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -144,25 +147,27 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:31
+#: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
-msgstr "There are four main rules to follow here:"
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:37
+#: persistent_classes.xml:61
 #, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "Implement a no-argument constructor"
 
 #. Tag: para
-#: persistent_classes.xml:39
-#, no-c-format
+#: persistent_classes.xml:63
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -174,22 +179,22 @@
 "Hibernate."
 
 #. Tag: title
-#: persistent_classes.xml:49
+#: persistent_classes.xml:73
 #, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "Provide an identifier property (optional)"
 
 #. Tag: para
-#: persistent_classes.xml:51
-#, no-c-format
+#: persistent_classes.xml:75
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
@@ -200,7 +205,7 @@
 "these types - see the section on composite identifiers later.)"
 
 #. Tag: para
-#: persistent_classes.xml:60
+#: persistent_classes.xml:84
 #, no-c-format
 msgid ""
 "The identifier property is strictly optional. You can leave them off and let "
@@ -212,17 +217,17 @@
 "this, however."
 
 #. Tag: para
-#: persistent_classes.xml:65
-#, no-c-format
+#: persistent_classes.xml:89
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr ""
 "In fact, some functionality is available only to classes which declare an "
 "identifier property:"
 
 #. Tag: para
-#: persistent_classes.xml:72
+#: persistent_classes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "Transitive reattachment for detached objects (cascade update or cascade "
@@ -232,37 +237,36 @@
 "merge) - see <xref linkend=\"objectstate-transitive\"/>"
 
 #. Tag: literal
-#: persistent_classes.xml:79
+#: persistent_classes.xml:103
 #, no-c-format
 msgid "Session.saveOrUpdate()"
 msgstr "Session.saveOrUpdate()"
 
 #. Tag: literal
-#: persistent_classes.xml:84
+#: persistent_classes.xml:108
 #, no-c-format
 msgid "Session.merge()"
 msgstr "Session.merge()"
 
 #. Tag: para
-#: persistent_classes.xml:89
-#, no-c-format
+#: persistent_classes.xml:113
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "We recommend you declare consistently-named identifier properties on "
 "persistent classes. We further recommend that you use a nullable (ie. non-"
 "primitive) type."
 
 #. Tag: title
-#: persistent_classes.xml:96
+#: persistent_classes.xml:120
 #, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr "Prefer non-final classes (optional)"
 
 #. Tag: para
-#: persistent_classes.xml:97
+#: persistent_classes.xml:121
 #, no-c-format
 msgid ""
 "A central feature of Hibernate, <emphasis>proxies</emphasis>, depends upon "
@@ -274,19 +278,20 @@
 "interface that declares all public methods."
 
 #. Tag: para
-#: persistent_classes.xml:102
-#, no-c-format
+#: persistent_classes.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "You can persist <literal>final</literal> classes that do not implement an "
 "interface with Hibernate, but you won't be able to use proxies for lazy "
 "association fetching - which will limit your options for performance tuning."
 
 #. Tag: para
-#: persistent_classes.xml:107
+#: persistent_classes.xml:131
 #, no-c-format
 msgid ""
 "You should also avoid declaring <literal>public final</literal> methods on "
@@ -300,23 +305,22 @@
 "<literal>lazy=\"false\"</literal>."
 
 #. Tag: title
-#: persistent_classes.xml:115
+#: persistent_classes.xml:139
 #, no-c-format
 msgid "Declare accessors and mutators for persistent fields (optional)"
 msgstr "Declare accessors and mutators for persistent fields (optional)"
 
 #. Tag: para
-#: persistent_classes.xml:117
-#, no-c-format
+#: persistent_classes.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
 "fields. Many other ORM tools directly persist instance variables. We believe "
@@ -328,7 +332,7 @@
 "if needed."
 
 #. Tag: para
-#: persistent_classes.xml:127
+#: persistent_classes.xml:151
 #, no-c-format
 msgid ""
 "Properties need <emphasis>not</emphasis> be declared public - Hibernate can "
@@ -340,23 +344,23 @@
 "<literal>private</literal> get / set pair."
 
 #. Tag: title
-#: persistent_classes.xml:138
+#: persistent_classes.xml:162
 #, no-c-format
 msgid "Implementing inheritance"
 msgstr "Implementing inheritance"
 
 #. Tag: para
-#: persistent_classes.xml:140
-#, no-c-format
+#: persistent_classes.xml:164
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "A subclass must also observe the first and second rules. It inherits its "
 "identifier property from the superclass, <literal>Cat</literal>."
 
 #. Tag: programlisting
-#: persistent_classes.xml:145
+#: persistent_classes.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -374,7 +378,7 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:149
+#: persistent_classes.xml:173
 #, no-c-format
 msgid ""
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
@@ -382,21 +386,21 @@
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
 
 #. Tag: para
-#: persistent_classes.xml:151
-#, no-c-format
+#: persistent_classes.xml:175
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
 "</literal> methods if you"
 
 #. Tag: para
-#: persistent_classes.xml:157
-#, no-c-format
+#: persistent_classes.xml:181
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
@@ -404,19 +408,19 @@
 "emphasis>"
 
 #. Tag: para
-#: persistent_classes.xml:164
+#: persistent_classes.xml:188
 #, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr "intend to use reattachment of detached instances"
 
 #. Tag: para
-#: persistent_classes.xml:170
-#, no-c-format
+#: persistent_classes.xml:194
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
@@ -426,24 +430,23 @@
 "semantics for <literal>Set</literal>s."
 
 #. Tag: para
-#: persistent_classes.xml:178
-#, no-c-format
+#: persistent_classes.xml:202
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
@@ -462,14 +465,15 @@
 "equality."
 
 #. Tag: para
-#: persistent_classes.xml:192
-#, no-c-format
+#: persistent_classes.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
 "</literal> using <emphasis>Business key equality</emphasis>. Business key "
@@ -478,7 +482,7 @@
 "instance in the real world (a <emphasis>natural</emphasis> candidate key):"
 
 #. Tag: programlisting
-#: persistent_classes.xml:200
+#: persistent_classes.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
@@ -507,13 +511,12 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:202
-#, no-c-format
+#: persistent_classes.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "Note that a business key does not have to be as solid as a database primary "
 "key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
@@ -521,30 +524,36 @@
 "key."
 
 #. Tag: title
-#: persistent_classes.xml:212
+#: persistent_classes.xml:236
 #, no-c-format
 msgid "Dynamic models"
 msgstr "Dynamic models"
 
+#. Tag: title
+#: persistent_classes.xml:239
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: emphasis
-#: persistent_classes.xml:215
-#, no-c-format
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr ""
 "Note that the following features are currently considered experimental and "
 "may change in the near future."
 
 #. Tag: para
-#: persistent_classes.xml:219
-#, no-c-format
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "Persistent entities don't necessarily have to be represented as POJO classes "
 "or as JavaBean objects at runtime. Hibernate also supports dynamic models "
@@ -553,13 +562,13 @@
 "write persistent classes, only mapping files."
 
 #. Tag: para
-#: persistent_classes.xml:227
-#, no-c-format
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "By default, Hibernate works in normal POJO mode. You may set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
@@ -567,19 +576,19 @@
 "option (see <xref linkend=\"configuration-optional-properties\"/>."
 
 #. Tag: para
-#: persistent_classes.xml:234
-#, no-c-format
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "The following examples demonstrates the representation using <literal>Map</"
 "literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
 "to be declared instead of (or in addition to) a class name:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:240
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -618,23 +627,22 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:242
-#, no-c-format
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "Note that even though associations are declared using target class names, "
 "the target type of an associations may also be a dynamic entity instead of a "
 "POJO."
 
 #. Tag: para
-#: persistent_classes.xml:249
-#, no-c-format
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
@@ -642,7 +650,7 @@
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:255
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -669,14 +677,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:257
-#, no-c-format
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "The advantages of a dynamic mapping are quick turnaround time for "
@@ -687,7 +695,7 @@
 "implementation on top later on."
 
 #. Tag: para
-#: persistent_classes.xml:265
+#: persistent_classes.xml:292
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -697,7 +705,7 @@
 "literal> basis:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:270
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -715,14 +723,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
-#, no-c-format
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -737,7 +745,7 @@
 "primary unit of work."
 
 #. Tag: para
-#: persistent_classes.xml:283
+#: persistent_classes.xml:310
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -747,29 +755,24 @@
 "<xref linkend=\"xml\"/>."
 
 #. Tag: title
-#: persistent_classes.xml:291
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr "Tuplizers"
 
 #. Tag: para
-#: persistent_classes.xml:293
-#, no-c-format
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
 "responsible for managing a particular representation of a piece of data, "
@@ -787,17 +790,29 @@
 "<literal>ComponentTuplizer</literal>s do the same for components."
 
 #. Tag: para
-#: persistent_classes.xml:308
+#: persistent_classes.xml:330
 #, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "Users may also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
@@ -809,7 +824,7 @@
 "customer entity:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:317
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -849,10 +864,194 @@
 "}]]>"
 msgstr ""
 
+#. Tag: title
+#: persistent_classes.xml:354
+#, no-c-format
+msgid "EntityNameResolvers"
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:322
+#: persistent_classes.xml:356
 #, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
 msgstr ""
-"TODO: Document user-extension framework in the property and proxy packages"
+
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "There are four main rules to follow here:"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: preface.xml:21
+#: preface.xml:29
 #, no-c-format
 msgid "Preface"
 msgstr "Prefácio"
 
 #. Tag: para
-#: preface.xml:23
-#, no-c-format
+#: preface.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -35,13 +35,13 @@
 "modelo de objeto para dados de modelo relacional com o esquema baseado em SQL"
 
 #. Tag: para
-#: preface.xml:31
-#, no-c-format
+#: preface.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "O Hibernate não somente cuida do mapeamento de classes em Java para tabelas "
 "de banco de dados (e de tipos de dados em Java para tipos de dados em SQL), "
@@ -50,10 +50,10 @@
 "manipulação manual de dados no SQL e JDBC."
 
 #. Tag: para
-#: preface.xml:38
-#, no-c-format
+#: preface.xml:46
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -74,7 +74,7 @@
 "gráfico de objetos."
 
 #. Tag: para
-#: preface.xml:48
+#: preface.xml:56
 #, no-c-format
 msgid ""
 "If you are new to Hibernate and Object/Relational Mapping or even Java, "
@@ -84,7 +84,7 @@
 "mesmo em Java, por favor, siga os seguintes passos."
 
 #. Tag: para
-#: preface.xml:55
+#: preface.xml:63
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"tutorial\"/> for a tutorial with step-by-step "
@@ -96,7 +96,7 @@
 "diretório <literal>doc/reference/tutorial/</literal>."
 
 #. Tag: para
-#: preface.xml:63
+#: preface.xml:71
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
@@ -106,15 +106,15 @@
 "Hibernate pode ser utilizado."
 
 #. Tag: para
-#: preface.xml:69
-#, no-c-format
+#: preface.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "Dê uma olhada no diretório de exemplo <literal>eg/</literal> da distribuição "
 "do Hibernate, ele contém uma simples aplicação standalone. Copie seu driver "
@@ -125,15 +125,15 @@
 "digite <literal>build eg</literal>."
 
 #. Tag: para
-#: preface.xml:80
-#, no-c-format
+#: preface.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr ""
 "Use esta documentação de referencia como sua fonte primaria de informação. "
 "Considere ler também o livro <emphasis>Java Persistence with Hibernate</"
@@ -143,7 +143,7 @@
 "download da aplicação de exemplo do Java Persistence with Hibernate."
 
 #. Tag: para
-#: preface.xml:90
+#: preface.xml:98
 #, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr ""
@@ -151,16 +151,16 @@
 "Hibernate"
 
 #. Tag: para
-#: preface.xml:95
-#, no-c-format
+#: preface.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr ""
 "Demonstrações, exemplos e tutorials estão disponíveis no site do Hibernate."
 
 #. Tag: para
-#: preface.xml:101
+#: preface.xml:109
 #, no-c-format
 msgid ""
 "The Community Area on the Hibernate website is a good resource for design "
@@ -172,11 +172,11 @@
 "Struts, EJB, etc.)."
 
 #. Tag: para
-#: preface.xml:109
-#, no-c-format
+#: preface.xml:117
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."
@@ -188,7 +188,7 @@
 "desenvolvedores."
 
 #. Tag: para
-#: preface.xml:117
+#: preface.xml:125
 #, no-c-format
 msgid ""
 "Commercial development support, production support, and training for "

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,25 +11,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_criteria.xml:5
+#: query_criteria.xml:29
 #, no-c-format
 msgid "Criteria Queries"
 msgstr "Consultas por critérios"
 
 #. Tag: para
-#: query_criteria.xml:7
+#: query_criteria.xml:31
 #, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr "O Hibernate provê uma intuitiva e extensível API de critério de query."
 
 #. Tag: title
-#: query_criteria.xml:12
+#: query_criteria.xml:36
 #, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr "Criando uma instancia <literal>Criteria</literal>"
 
 #. Tag: para
-#: query_criteria.xml:14
+#: query_criteria.xml:38
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.Criteria</literal> represents a query "
@@ -41,7 +41,7 @@
 "intancias de <literal>Criteria</literal> ."
 
 #. Tag: programlisting
-#: query_criteria.xml:20
+#: query_criteria.xml:44
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = sess.createCriteria(Cat.class);\n"
@@ -50,13 +50,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:25
+#: query_criteria.xml:49
 #, no-c-format
 msgid "Narrowing the result set"
 msgstr "Limitando o result set"
 
 #. Tag: para
-#: query_criteria.xml:27
+#: query_criteria.xml:51
 #, no-c-format
 msgid ""
 "An individual query criterion is an instance of the interface <literal>org."
@@ -70,7 +70,7 @@
 "certos tipos pré fabricados de <literal>Criterion</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:35
+#: query_criteria.xml:59
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -80,13 +80,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:37
-#, no-c-format
-msgid "Restrictions may be grouped logically."
+#: query_criteria.xml:61
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "Restrições podem ser logicamente agrupadas."
 
 #. Tag: programlisting
-#: query_criteria.xml:41
+#: query_criteria.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -99,7 +99,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:43
+#: query_criteria.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -115,11 +115,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:45
-#, no-c-format
+#: query_criteria.xml:69
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "Existe um grande número de critérios pré fabricados (subclasses de "
@@ -127,7 +127,7 @@
 "especificar o SQL diretamente."
 
 #. Tag: programlisting
-#: query_criteria.xml:50
+#: query_criteria.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -137,7 +137,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:52
+#: query_criteria.xml:76
 #, no-c-format
 msgid ""
 "The <literal>{alias}</literal> placeholder with be replaced by the row alias "
@@ -147,19 +147,19 @@
 "entidade procurada."
 
 #. Tag: para
-#: query_criteria.xml:57
-#, no-c-format
+#: query_criteria.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "Uma maneira alternativa de obter um critério é pegá-lo de uma instancia de "
 "<literal>Property</literal>. Você pode criar uma <literal>Property</literal> "
 "chamando <literal>Property.forName()</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:63
+#: query_criteria.xml:87
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -177,23 +177,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:68
+#: query_criteria.xml:92
 #, no-c-format
 msgid "Ordering the results"
 msgstr "Ordering the results"
 
 #. Tag: para
-#: query_criteria.xml:70
-#, no-c-format
+#: query_criteria.xml:94
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "You may order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:74
+#: query_criteria.xml:98
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -205,7 +205,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:76
+#: query_criteria.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -217,23 +217,21 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:81
+#: query_criteria.xml:105
 #, no-c-format
 msgid "Associations"
 msgstr "Associations"
 
 #. Tag: para
-#: query_criteria.xml:83
+#: query_criteria.xml:107
 #, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:88
+#: query_criteria.xml:112
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -244,11 +242,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:90
-#, no-c-format
+#: query_criteria.xml:114
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "note that the second <literal>createCriteria()</literal> returns a new "
@@ -256,13 +254,14 @@
 "<literal>kittens</literal> collection."
 
 #. Tag: para
-#: query_criteria.xml:96
-#, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+#: query_criteria.xml:120
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "The following, alternate form is useful in certain circumstances."
 
 #. Tag: programlisting
-#: query_criteria.xml:100
+#: query_criteria.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -273,7 +272,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:102
+#: query_criteria.xml:126
 #, no-c-format
 msgid ""
 "(<literal>createAlias()</literal> does not create a new instance of "
@@ -283,12 +282,12 @@
 "<literal>Criteria</literal>.)"
 
 #. Tag: para
-#: query_criteria.xml:107
-#, no-c-format
+#: query_criteria.xml:131
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "Note that the kittens collections held by the <literal>Cat</literal> "
@@ -297,7 +296,7 @@
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:114
+#: query_criteria.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -314,23 +313,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:119
+#: query_criteria.xml:143
 #, no-c-format
 msgid "Dynamic association fetching"
 msgstr "Dynamic association fetching"
 
 #. Tag: para
-#: query_criteria.xml:121
-#, no-c-format
+#: query_criteria.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "You may specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:126
+#: query_criteria.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -341,7 +340,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:128
+#: query_criteria.xml:152
 #, no-c-format
 msgid ""
 "This query will fetch both <literal>mate</literal> and <literal>kittens</"
@@ -353,13 +352,13 @@
 "more information."
 
 #. Tag: title
-#: query_criteria.xml:136
+#: query_criteria.xml:160
 #, no-c-format
 msgid "Example queries"
 msgstr "Example queries"
 
 #. Tag: para
-#: query_criteria.xml:138
+#: query_criteria.xml:162
 #, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Example</literal> allows you to "
@@ -369,7 +368,7 @@
 "construct a query criterion from a given instance."
 
 #. Tag: programlisting
-#: query_criteria.xml:143
+#: query_criteria.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
@@ -381,7 +380,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:145
+#: query_criteria.xml:169
 #, no-c-format
 msgid ""
 "Version properties, identifiers and associations are ignored. By default, "
@@ -391,13 +390,13 @@
 "null valued properties are excluded."
 
 #. Tag: para
-#: query_criteria.xml:150
+#: query_criteria.xml:174
 #, no-c-format
 msgid "You can adjust how the <literal>Example</literal> is applied."
 msgstr "You can adjust how the <literal>Example</literal> is applied."
 
 #. Tag: programlisting
-#: query_criteria.xml:154
+#: query_criteria.xml:178
 #, no-c-format
 msgid ""
 "<![CDATA[Example example = Example.create(cat)\n"
@@ -412,13 +411,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:156
+#: query_criteria.xml:180
 #, no-c-format
 msgid "You can even use examples to place criteria upon associated objects."
 msgstr "You can even use examples to place criteria upon associated objects."
 
 #. Tag: programlisting
-#: query_criteria.xml:160
+#: query_criteria.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -429,25 +428,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:165
+#: query_criteria.xml:189
 #, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr "Projections, aggregation and grouping"
 
 #. Tag: para
-#: query_criteria.xml:166
-#, no-c-format
+#: query_criteria.xml:190
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
 "factory for <literal>Projection</literal> instances. We apply a projection "
 "to a query by calling <literal>setProjection()</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:172
+#: query_criteria.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -457,7 +456,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:174
+#: query_criteria.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -471,7 +470,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:176
+#: query_criteria.xml:200
 #, no-c-format
 msgid ""
 "There is no explicit \"group by\" necessary in a criteria query. Certain "
@@ -483,19 +482,19 @@
 "emphasis>, which also appear in the SQL <literal>group by</literal> clause."
 
 #. Tag: para
-#: query_criteria.xml:182
-#, no-c-format
+#: query_criteria.xml:206
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "An alias may optionally be assigned to a projection, so that the projected "
 "value may be referred to in restrictions or orderings. Here are two "
 "different ways to do this:"
 
 #. Tag: programlisting
-#: query_criteria.xml:188
+#: query_criteria.xml:212
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -506,7 +505,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:190
+#: query_criteria.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -516,7 +515,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:192
+#: query_criteria.xml:216
 #, no-c-format
 msgid ""
 "The <literal>alias()</literal> and <literal>as()</literal> methods simply "
@@ -530,7 +529,7 @@
 "you add the projection to a projection list:"
 
 #. Tag: programlisting
-#: query_criteria.xml:199
+#: query_criteria.xml:223
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -546,7 +545,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:201
+#: query_criteria.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Domestic.class, \"cat\")\n"
@@ -561,7 +560,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:203
+#: query_criteria.xml:227
 #, no-c-format
 msgid ""
 "You can also use <literal>Property.forName()</literal> to express "
@@ -571,7 +570,7 @@
 "projections:"
 
 #. Tag: programlisting
-#: query_criteria.xml:207
+#: query_criteria.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -581,7 +580,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:209
+#: query_criteria.xml:233
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -597,25 +596,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:214
+#: query_criteria.xml:238
 #, no-c-format
 msgid "Detached queries and subqueries"
 msgstr "Detached queries and subqueries"
 
 #. Tag: para
-#: query_criteria.xml:215
-#, no-c-format
+#: query_criteria.xml:239
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "The <literal>DetachedCriteria</literal> class lets you create a query "
 "outside the scope of a session, and then later execute it using some "
 "arbitrary <literal>Session</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:220
+#: query_criteria.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria query = DetachedCriteria.forClass(Cat.class)\n"
@@ -630,11 +629,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:222
-#, no-c-format
+#: query_criteria.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "A <literal>DetachedCriteria</literal> may also be used to express a "
@@ -642,7 +641,7 @@
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:228
+#: query_criteria.xml:252
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)\n"
@@ -653,7 +652,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:230
+#: query_criteria.xml:254
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
@@ -664,13 +663,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:232
-#, no-c-format
-msgid "Even correlated subqueries are possible:"
+#: query_criteria.xml:256
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "Even correlated subqueries are possible:"
 
 #. Tag: programlisting
-#: query_criteria.xml:236
+#: query_criteria.xml:260
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
@@ -683,18 +682,18 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:245
+#: query_criteria.xml:269
 #, no-c-format
 msgid "Queries by natural identifier"
 msgstr "Queries by natural identifier"
 
 #. Tag: para
-#: query_criteria.xml:247
-#, no-c-format
+#: query_criteria.xml:271
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -707,17 +706,17 @@
 "provides special provision for this use case."
 
 #. Tag: para
-#: query_criteria.xml:255
-#, no-c-format
+#: query_criteria.xml:279
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "First, you should map the natural key of your entity using <literal>&lt;"
 "natural-id&gt;</literal>, and enable use of the second-level cache."
 
 #. Tag: programlisting
-#: query_criteria.xml:260
+#: query_criteria.xml:284
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
@@ -734,33 +733,28 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:262
-#, no-c-format
+#: query_criteria.xml:286
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr ""
 "Note that this functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 
 #. Tag: para
-#: query_criteria.xml:267
-#, no-c-format
-msgid "Next, enable the Hibernate query cache."
-msgstr "Next, enable the Hibernate query cache."
-
-#. Tag: para
-#: query_criteria.xml:271
-#, no-c-format
+#: query_criteria.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
 "the more efficient cache algorithm."
 
 #. Tag: programlisting
-#: query_criteria.xml:276
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
@@ -770,3 +764,13 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 msgstr ""
+
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "Next, enable the Hibernate query cache."

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_hql.xml:5
+#: query_hql.xml:29
 #, no-c-format
 msgid "HQL: The Hibernate Query Language"
 msgstr "HQL: A linguagem de Queries do Hibernate"
 
 #. Tag: para
-#: query_hql.xml:7
-#, no-c-format
+#: query_hql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "O Hibernate vem com uma poderosa linguagem que é (intencionalmente) muito "
 "parecida com o SQL. Mas não seja enganado pela sintaxe; a HQL é totalmente "
@@ -31,20 +30,20 @@
 "associações."
 
 #. Tag: title
-#: query_hql.xml:14
+#: query_hql.xml:38
 #, no-c-format
 msgid "Case Sensitivity"
 msgstr "Case Sensitíve"
 
 #. Tag: para
-#: query_hql.xml:16
-#, no-c-format
+#: query_hql.xml:40
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "As Queries não são case-sensitive, exceto pelo nomes das classes e "
 "propriedades Java. <literal>sELEct</literal> e o mesmo que <literal>SELECT</"
@@ -53,42 +52,42 @@
 "<literal>foo.BARSET</literal>."
 
 #. Tag: para
-#: query_hql.xml:27
-#, no-c-format
+#: query_hql.xml:51
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "Esse manual usa as palavras chave HQL em letras minúsculas. Alguns usuários "
 "acham que com letras maiúsculas as queries ficam mais legíveis, mas nós "
 "achamos essa convenção feia dentro do código Java."
 
 #. Tag: title
-#: query_hql.xml:35
+#: query_hql.xml:59
 #, no-c-format
 msgid "The from clause"
 msgstr "A clausula from"
 
 #. Tag: para
-#: query_hql.xml:37
+#: query_hql.xml:61
 #, no-c-format
 msgid "The simplest possible Hibernate query is of the form:"
 msgstr "A mais simples query possível do Hibernate é a assim:"
 
 #. Tag: programlisting
-#: query_hql.xml:41
+#: query_hql.xml:65
 #, no-c-format
 msgid "<![CDATA[from eg.Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:43
-#, no-c-format
+#: query_hql.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "Ela irá retornar todas as instancias da classe <literal>eg.Cat</literal>. "
 "Necessariamente não precisamos qualificar o nome da classe, pois é realizado "
@@ -96,75 +95,71 @@
 "nós simplesmente escrevemos:"
 
 #. Tag: programlisting
-#: query_hql.xml:49
+#: query_hql.xml:73
 #, no-c-format
 msgid "<![CDATA[from Cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:51
+#: query_hql.xml:75
 #, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"Na maior parte do tempo, você precisará atribuir um <emphasis>alias</"
-"emphasis>, desde que você queira se referia ao <literal>Cat</literal> em "
-"outras partes da query."
 
 #. Tag: programlisting
-#: query_hql.xml:57 query_hql.xml:372
+#: query_hql.xml:81 query_hql.xml:396
 #, no-c-format
 msgid "<![CDATA[from Cat as cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:59
-#, no-c-format
+#: query_hql.xml:83
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "Essa query atribui um alias a <literal>cat</literal> para as instancias de "
 "<literal>Cat</literal>, então nós podemos usar esse alias depois na query. A "
 "palavra chave as é opcional; poderíamos escrever assim:"
 
 #. Tag: programlisting
-#: query_hql.xml:65
+#: query_hql.xml:89
 #, no-c-format
 msgid "<![CDATA[from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:67
-#, no-c-format
+#: query_hql.xml:91
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr ""
 "Múltiplas classes pode ser envolvidas, resultando em um produto cartesiano "
 "ou \"cross\" join."
 
 #. Tag: programlisting
-#: query_hql.xml:71
+#: query_hql.xml:95
 #, no-c-format
 msgid "<![CDATA[from Formula, Parameter]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:72
+#: query_hql.xml:96
 #, no-c-format
 msgid "<![CDATA[from Formula as form, Parameter as param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:74
-#, no-c-format
+#: query_hql.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "É considerada uma boa prática os nomes dos aliases começarem com letra "
@@ -172,24 +167,24 @@
 "<literal>domesticCat</literal>)."
 
 #. Tag: title
-#: query_hql.xml:83
+#: query_hql.xml:107
 #, no-c-format
 msgid "Associations and joins"
 msgstr "Associações e joins"
 
 #. Tag: para
-#: query_hql.xml:85
-#, no-c-format
+#: query_hql.xml:109
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "Nós também podemos querer atribuir aliases em uma entidade associada, ou "
 "mesmo em elementos de uma coleção de valores, usando um <literal>join</"
 "literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:90
+#: query_hql.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -198,49 +193,49 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:92
+#: query_hql.xml:116
 #, no-c-format
 msgid "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:94
+#: query_hql.xml:118
 #, no-c-format
 msgid "<![CDATA[from Formula form full join form.parameter param]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:96
-#, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+#: query_hql.xml:120
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "Os tipos de joins suportados foram inspirados no SQL ANSI:"
 
 #. Tag: literal
-#: query_hql.xml:103
+#: query_hql.xml:127
 #, no-c-format
 msgid "inner join"
 msgstr "inner join"
 
 #. Tag: literal
-#: query_hql.xml:108
+#: query_hql.xml:132
 #, no-c-format
 msgid "left outer join"
 msgstr "left outer join"
 
 #. Tag: literal
-#: query_hql.xml:113
+#: query_hql.xml:137
 #, no-c-format
 msgid "right outer join"
 msgstr "right outer join"
 
 #. Tag: para
-#: query_hql.xml:117
+#: query_hql.xml:141
 #, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr "<literal>full join</literal> (geralmente não é útil)"
 
 #. Tag: para
-#: query_hql.xml:123
+#: query_hql.xml:147
 #, no-c-format
 msgid ""
 "The <literal>inner join</literal>, <literal>left outer join</literal> and "
@@ -252,7 +247,7 @@
 "literal> e <literal>right outer join</literal> podem ser abreviadas."
 
 #. Tag: programlisting
-#: query_hql.xml:128
+#: query_hql.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -261,7 +256,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:130
+#: query_hql.xml:154
 #, no-c-format
 msgid ""
 "You may supply extra join conditions using the HQL <literal>with</literal> "
@@ -271,7 +266,7 @@
 "<literal>with</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:135
+#: query_hql.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -280,15 +275,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:137
-#, no-c-format
+#: query_hql.xml:161
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "Adicionalmente, um \"fetch\" join permite que associações ou coleções de "
 "valores sejam inicializadas junto com o objeto pai, usando apenas um select. "
@@ -298,7 +293,7 @@
 "informações."
 
 #. Tag: programlisting
-#: query_hql.xml:145
+#: query_hql.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -307,14 +302,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:147
-#, no-c-format
+#: query_hql.xml:171
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "Usualmente, um <literal>fetch</literal>join não precisa atribuir um alias, "
@@ -326,7 +321,7 @@
 "coleção adicional:"
 
 #. Tag: programlisting
-#: query_hql.xml:155
+#: query_hql.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -336,23 +331,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:157
-#, no-c-format
+#: query_hql.xml:181
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "Observe que a construção <literal>fetch</literal> não deve ser usada em "
 "queries invocadas usando <literal>iterate()</literal> (embora possa ser "
@@ -371,12 +366,12 @@
 "e <literal>right join fetch</literal> não são significativos."
 
 #. Tag: para
-#: query_hql.xml:172
-#, no-c-format
+#: query_hql.xml:196
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "Se está usando o nível de propriedade lazy (<literal>com</literal> "
@@ -385,13 +380,13 @@
 "query), usando <literal>fetch all properties </literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:178
+#: query_hql.xml:202
 #, no-c-format
 msgid "<![CDATA[from Document fetch all properties order by name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:179
+#: query_hql.xml:203
 #, no-c-format
 msgid ""
 "<![CDATA[from Document doc fetch all properties where lower(doc.name) like '%"
@@ -399,13 +394,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:184
+#: query_hql.xml:208
 #, no-c-format
 msgid "Forms of join syntax"
 msgstr "Formas e sintaxe de joins"
 
 #. Tag: para
-#: query_hql.xml:186
+#: query_hql.xml:210
 #, no-c-format
 msgid ""
 "HQL supports two forms of association joining: <literal>implicit</literal> "
@@ -415,19 +410,19 @@
 "literal> e <literal>explicita</literal>."
 
 #. Tag: para
-#: query_hql.xml:190
-#, no-c-format
+#: query_hql.xml:214
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "As queries apresentadas na seção anterior usam a forma <literal>explicita</"
 "literal>, onde a palavra chave \"join\" é explicitamente usada na clausula "
 "\"from\". Essa é a forma recomendada."
 
 #. Tag: para
-#: query_hql.xml:195
+#: query_hql.xml:219
 #, no-c-format
 msgid ""
 "The <literal>implicit</literal> form does not use the join keyword. Instead, "
@@ -442,33 +437,31 @@
 "inner joins."
 
 #. Tag: programlisting
-#: query_hql.xml:202
+#: query_hql.xml:226
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:206
-#, no-c-format
-msgid "Refering to identifier property"
+#: query_hql.xml:230
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
-#: query_hql.xml:208
-#, no-c-format
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#: query_hql.xml:232
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
 "property:"
 
 #. Tag: para
-#: query_hql.xml:213
-#, no-c-format
+#: query_hql.xml:237
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -476,23 +469,23 @@
 "entity does not define a non-identifier property named id</emphasis>."
 
 #. Tag: para
-#: query_hql.xml:220
-#, no-c-format
+#: query_hql.xml:244
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "If the entity defines a named identifier property, you may use that property "
 "name."
 
 #. Tag: para
-#: query_hql.xml:226
-#, no-c-format
+#: query_hql.xml:250
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "References to composite identifier properties follow the same naming rules. "
@@ -502,14 +495,14 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:233
+#: query_hql.xml:258
 #, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
 "versions, <literal>id</literal><emphasis>always</emphasis> referred to the "
@@ -518,23 +511,23 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:242
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr "Clausula select"
 
 #. Tag: para
-#: query_hql.xml:244
-#, no-c-format
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "A clausula <literal>select</literal> seleciona quais obetos e propriedades "
 "retornam no resultado da query. Considere:"
 
 #. Tag: programlisting
-#: query_hql.xml:249
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -543,34 +536,34 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:251
-#, no-c-format
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "A query selecionará <literal>mate</literal>s (companheiros), de outros "
 "<literal>Cat</literal>s. Atualmente, podemos expressar a query de forma mais "
 "compacta como:"
 
 #. Tag: programlisting
-#: query_hql.xml:256
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:258
-#, no-c-format
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "Queries podem retornar propriedades de qualquer tipo de valor, incluindo "
 "propriedades de tipo de componente:"
 
 #. Tag: programlisting
-#: query_hql.xml:262
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -578,23 +571,23 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:264
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:266
-#, no-c-format
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "Queries podem retornar múltiplos objetos e/ou propriedades como um array do "
 "tipo Object[],"
 
 #. Tag: programlisting
-#: query_hql.xml:271
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -604,13 +597,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:273
-#, no-c-format
-msgid "or as a <literal>List</literal>,"
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "ou como um <literal>List</literal>,"
 
 #. Tag: programlisting
-#: query_hql.xml:277
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -620,13 +613,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:279
-#, no-c-format
-msgid "or as an actual typesafe Java object,"
-msgstr "ou como um objeto Java typesafe,"
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr ""
+"assumindo que a classe <literal>Family</literal> tenha um construtor "
+"apropriado."
 
 #. Tag: programlisting
-#: query_hql.xml:283
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -636,26 +633,16 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:285
-#, no-c-format
+#: query_hql.xml:313
+#, fuzzy, no-c-format
 msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr ""
-"assumindo que a classe <literal>Family</literal> tenha um construtor "
-"apropriado."
-
-#. Tag: para
-#: query_hql.xml:289
-#, no-c-format
-msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
-msgstr ""
 "Pode-se designar referencias a expressões selecionadas, <literal>as</"
 "literal>:"
 
 #. Tag: programlisting
-#: query_hql.xml:293
+#: query_hql.xml:317
 #, no-c-format
 msgid ""
 "<![CDATA[select max(bodyWeight) as max, min(bodyWeight) as min, count(*) as "
@@ -664,7 +651,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:295
+#: query_hql.xml:319
 #, no-c-format
 msgid ""
 "This is most useful when used together with <literal>select new map</"
@@ -674,7 +661,7 @@
 "literal><literal>select new map</literal>:"
 
 #. Tag: programlisting
-#: query_hql.xml:299
+#: query_hql.xml:323
 #, no-c-format
 msgid ""
 "<![CDATA[select new map( max(bodyWeight) as max, min(bodyWeight) as min, "
@@ -683,7 +670,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:301
+#: query_hql.xml:325
 #, no-c-format
 msgid ""
 "This query returns a <literal>Map</literal> from aliases to selected values."
@@ -692,22 +679,22 @@
 "selecionados."
 
 #. Tag: title
-#: query_hql.xml:308
+#: query_hql.xml:332
 #, no-c-format
 msgid "Aggregate functions"
 msgstr "Funções de agregação"
 
 #. Tag: para
-#: query_hql.xml:310
-#, no-c-format
+#: query_hql.xml:334
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr ""
 "As queries HQL podem retornar o resultado de funções agregadas nas "
 "propriedades."
 
 #. Tag: programlisting
-#: query_hql.xml:314
+#: query_hql.xml:338
 #, no-c-format
 msgid ""
 "<![CDATA[select avg(cat.weight), sum(cat.weight), max(cat.weight), count"
@@ -716,41 +703,41 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:325
-#, no-c-format
-msgid "The supported aggregate functions are"
+#: query_hql.xml:349
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "As funções agregadas suportadas são:"
 
 #. Tag: literal
-#: query_hql.xml:332
+#: query_hql.xml:356
 #, no-c-format
 msgid "avg(...), sum(...), min(...), max(...)"
 msgstr "avg(...), sum(...), min(...), max(...)"
 
 #. Tag: literal
-#: query_hql.xml:337
+#: query_hql.xml:361
 #, no-c-format
 msgid "count(*)"
 msgstr "count(*)"
 
 #. Tag: literal
-#: query_hql.xml:342
+#: query_hql.xml:366
 #, no-c-format
 msgid "count(...), count(distinct ...), count(all...)"
 msgstr "count(...), count(distinct ...), count(all...)"
 
 #. Tag: para
-#: query_hql.xml:347
-#, no-c-format
+#: query_hql.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr ""
 "Pode-se usar operadores aritiméticos, concatenação e funções SQL "
 "reconhecidas na clausula select:"
 
 #. Tag: programlisting
-#: query_hql.xml:352
+#: query_hql.xml:376
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
@@ -760,24 +747,24 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:354
+#: query_hql.xml:378
 #, no-c-format
 msgid ""
 "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from Person]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:356
-#, no-c-format
+#: query_hql.xml:380
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "As palavras <literal>distinct</literal> e <literal>all</literal> podem ser "
 "usadas e têm a mesma semântica como no SQL."
 
 #. Tag: programlisting
-#: query_hql.xml:361
+#: query_hql.xml:385
 #, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
@@ -786,23 +773,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:366
+#: query_hql.xml:390
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Queries polimórficas"
 
 #. Tag: para
-#: query_hql.xml:368
+#: query_hql.xml:392
 #, no-c-format
 msgid "A query like:"
 msgstr "A query:"
 
 #. Tag: para
-#: query_hql.xml:374
-#, no-c-format
+#: query_hql.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -816,13 +803,13 @@
 "query , a seguir, pode retornar todo objeto persistente:"
 
 #. Tag: programlisting
-#: query_hql.xml:382
+#: query_hql.xml:406
 #, no-c-format
 msgid "<![CDATA[from java.lang.Object o]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:384
+#: query_hql.xml:408
 #, no-c-format
 msgid ""
 "The interface <literal>Named</literal> might be implemented by various "
@@ -832,19 +819,19 @@
 "classes persistentes:"
 
 #. Tag: programlisting
-#: query_hql.xml:389
+#: query_hql.xml:413
 #, no-c-format
 msgid "<![CDATA[from Named n, Named m where n.name = m.name]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:391
-#, no-c-format
+#: query_hql.xml:415
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "Note que as duas últimas queries requerem mais de um SQL SELECT . Isto "
 "significa que a clausula <literal>order by</literal> não ordena corretamente "
@@ -852,48 +839,54 @@
 "queries usando <literal>Query.scroll()</literal>.)"
 
 #. Tag: title
-#: query_hql.xml:400
+#: query_hql.xml:424
 #, no-c-format
 msgid "The where clause"
 msgstr "A clausula where"
 
 #. Tag: para
-#: query_hql.xml:402
-#, no-c-format
+#: query_hql.xml:426
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "A clausula <literal>where</literal> permite estreitar a lista de instancias "
 "retornada. Se não houver referencia alguma, pode-se referir a propriedades "
 "pelo nome:"
 
 #. Tag: programlisting
-#: query_hql.xml:407
+#: query_hql.xml:431
 #, no-c-format
 msgid "<![CDATA[from Cat where name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:409
+#: query_hql.xml:433
 #, no-c-format
 msgid "If there is an alias, use a qualified property name:"
 msgstr "Se houver uma referência, use o nome da propriedade qualificada:"
 
 #. Tag: programlisting
-#: query_hql.xml:413
+#: query_hql.xml:437
 #, no-c-format
 msgid "<![CDATA[from Cat as cat where cat.name='Fritz']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:415
-#, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#: query_hql.xml:439
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "retorna instancias de <literal>Cat</literal> com nome ‘Fritz’."
 
+#. Tag: para
+#: query_hql.xml:443
+#, no-c-format
+msgid "The following query:"
+msgstr ""
+
 #. Tag: programlisting
-#: query_hql.xml:419
+#: query_hql.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
@@ -902,14 +895,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:421
-#, no-c-format
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "retornará todas as instancias de <literal>Foo</literal>, para cada um que "
 "tiver uma instancia de <literal>bar</literal> com a propriedade "
@@ -918,23 +911,22 @@
 "<literal>where</literal>, extremamente poderosa. Consideremos:"
 
 #. Tag: programlisting
-#: query_hql.xml:430
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:432
-#, no-c-format
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "Esta query traduzida para uma query SQL <literal>com</literal> uma tabela "
 "(inner) join. Se fosse escrever algo como:"
 
 #. Tag: programlisting
-#: query_hql.xml:437
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -942,32 +934,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:439
-#, no-c-format
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr ""
 "Poderia-se terminar <literal>com</literal> uma query que necessitasse de "
 "join de quatro tabelas, no SQL."
 
 #. Tag: para
-#: query_hql.xml:443
-#, no-c-format
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "O operador <literal>=</literal> pode ser uasdo para comparar não apenas "
 "propriedades, mas também instancias:"
 
 #. Tag: programlisting
-#: query_hql.xml:448
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:450
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -976,10 +967,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:452
-#, no-c-format
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -988,7 +979,7 @@
 "de sua propriedade)"
 
 #. Tag: programlisting
-#: query_hql.xml:458
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -997,27 +988,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:460
-#, no-c-format
-msgid "The second query is efficient. No table join is required!"
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr "A Segunda query é eficiente. Nenhuma união de tabelas é necessária!"
 
 #. Tag: para
-#: query_hql.xml:464
-#, no-c-format
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "As propriedades de identificadores compostas também podem ser usadas. "
 "Suponha que <literal>Person</literal> tenha um identificador composto que "
 "consiste de <literal>country</literal> e <literal>medicareNumber</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:471
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -1026,7 +1015,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:473
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -1035,38 +1024,46 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:475
-#, no-c-format
-msgid "Once again, the second query requires no table join."
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr "Mais uma vez, a Segunda query não precisa de nenhum join de tabela."
 
 #. Tag: para
-#: query_hql.xml:479
+#: query_hql.xml:505
 #, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "Assim mesmo, a propriedade especial <literal>class</literal> acessa o valor "
 "discriminador da instancia, no caso de persistência polimórfica. O nome de "
 "uma classe Java inclusa em uma clausula \"where\", será traduzida para seu "
 "valor descriminante."
 
 #. Tag: programlisting
-#: query_hql.xml:485
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:487
-#, no-c-format
+#: query_hql.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "Pode-se também especificar as propriedades dos components ou tipos de "
 "usuário composto (e de componentes de componentes). Nunca tente usar uma "
@@ -1076,13 +1073,13 @@
 "literal>."
 
 #. Tag: para
-#: query_hql.xml:492
-#, no-c-format
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "Um tipo \"any\" tem as propriedades <literal>id</literal> e <literal>class</"
 "literal> especiais, nôs permitindo expressar um join da seguinte forma (onde "
@@ -1090,7 +1087,7 @@
 "literal><literal>&lt;any&gt;</literal>)"
 
 #. Tag: programlisting
-#: query_hql.xml:498
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1098,63 +1095,63 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:500
-#, no-c-format
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "Veja que <literal>log.item.class</literal> e <literal>payment.class</"
 "literal> podem referir-se a valores de colunas de banco de dados "
 "completamente diferentes, na query acima."
 
 #. Tag: title
-#: query_hql.xml:508
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr "Expressões"
 
 #. Tag: para
-#: query_hql.xml:510
-#, no-c-format
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "As expressões permitidas na cláusula <literal>where</literal> inclui a "
 "maioria das coisas que você poderia escrever no SQL:"
 
 #. Tag: para
-#: query_hql.xml:517
-#, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "operadores matemáticos <literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:522
-#, no-c-format
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr ""
 "operadores de comparação binários <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, "
 "like</literal>"
 
 #. Tag: para
-#: query_hql.xml:527
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "operadores lógicos <literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:532
-#, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "parenteses <literal>( )</literal>, indicating grouping"
 
 #. Tag: para
-#: query_hql.xml:537
+#: query_hql.xml:568
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1168,7 +1165,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:550
+#: query_hql.xml:581
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1179,7 +1176,7 @@
 "end</literal>"
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:587
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1189,29 +1186,29 @@
 "(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:561
-#, no-c-format
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:567
-#, no-c-format
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:605
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1223,13 +1220,13 @@
 "mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
+#: query_hql.xml:616
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1239,7 +1236,7 @@
 "string"
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:622
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1253,7 +1250,7 @@
 "banco de dados usado"
 
 #. Tag: para
-#: query_hql.xml:599
+#: query_hql.xml:630
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1263,13 +1260,13 @@
 "coleçôes associadas e indexadas"
 
 #. Tag: para
-#: query_hql.xml:605
-#, no-c-format
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "As funções hql que retornam expressões de coleções de valores: <literal>size"
@@ -1279,11 +1276,11 @@
 "usando <literal>some, all, exists, any, in</literal>."
 
 #. Tag: para
-#: query_hql.xml:613
-#, no-c-format
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "Qualquer funçâo escalar pelo bando de dados como <literal>sign()</literal>, "
@@ -1291,23 +1288,23 @@
 "literal>"
 
 #. Tag: para
-#: query_hql.xml:619
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "Parametros posicionais ao estilo JDBC <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:624
-#, no-c-format
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "Parametros nomeados <literal>:name</literal>, <literal>:start_date</"
 "literal>, <literal>:x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:660
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1317,7 +1314,7 @@
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:635
+#: query_hql.xml:666
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1327,41 +1324,41 @@
 "TABBY</literal>"
 
 #. Tag: para
-#: query_hql.xml:641
-#, no-c-format
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "<literal>in</literal> e <literal>between</literal> podem ser usadas da "
 "seguinte maneira:"
 
 #. Tag: programlisting
-#: query_hql.xml:645
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:647
+#: query_hql.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:649
-#, no-c-format
-msgid "and the negated forms may be written"
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "e as formas negativas podem ser escritas"
 
 #. Tag: programlisting
-#: query_hql.xml:653
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:655
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1369,10 +1366,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:657
-#, no-c-format
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
@@ -1380,17 +1377,17 @@
 "<literal>is not null</literal> podem ser usados para testar valores nulos."
 
 #. Tag: para
-#: query_hql.xml:662
-#, no-c-format
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "Booleanos podem ser facilmente usados em expressões, declarando as "
 "substituições da HQL query, na configuração do Hibernate"
 
 #. Tag: programlisting
-#: query_hql.xml:667
+#: query_hql.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1398,7 +1395,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:669
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1410,43 +1407,43 @@
 "literal> e <literal>0</literal> na tradução do HQL para SQL."
 
 #. Tag: programlisting
-#: query_hql.xml:674
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:676
-#, no-c-format
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "Pode-se testar o tamanho de uma coleção <literal>com</literal> a propriedade "
 "especial <literal>size</literal>, ou a função especial <literal>size()</"
 "literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:681
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:683
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:685
-#, no-c-format
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "Para coleções indexadas, você pode se referir aos índices máximo e mínimo, "
 "usando as funções <literal>minindex</literal> e <literal>maxindex</literal>. "
@@ -1455,32 +1452,32 @@
 "<literal>maxelement</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:693
+#: query_hql.xml:724
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:695
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:697
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:699
-#, no-c-format
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "As funções SQL <literal>any, some, all, exists, in</literal> são suportadas "
 "quando passado o elemento ou o conjunto de índices de uma coleção "
@@ -1488,7 +1485,7 @@
 "resultado de uma subquery (veja abaixo)."
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1496,7 +1493,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1504,31 +1501,31 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:709
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:711
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:713
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:715
-#, no-c-format
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "Note que essas construções - <literal>size</literal>, <literal>elements</"
@@ -1538,23 +1535,23 @@
 "Hibernate3."
 
 #. Tag: para
-#: query_hql.xml:722
-#, no-c-format
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "Elementos de coleções com índice (arrays, lists, maps), podem ser "
 "referenciadas pelo índice (apenas na clausula where):"
 
 #. Tag: programlisting
-#: query_hql.xml:727
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1563,7 +1560,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1572,7 +1569,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1580,17 +1577,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:735
-#, no-c-format
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr ""
 "A expressão entre colchetes <literal>[]</literal>, pode ser até uma "
 "expressão aritimética."
 
 #. Tag: programlisting
-#: query_hql.xml:739
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1598,17 +1595,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:741
-#, no-c-format
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "O HQL também provê a função interna <literal>index()</literal>, para "
 "elementos de associação um-pra-muitos ou coleção de valores."
 
 #. Tag: programlisting
-#: query_hql.xml:746
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1617,29 +1614,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:748
-#, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr "Funções escalares SQL, suportadas pelo banco de dados subjacente."
 
 #. Tag: programlisting
-#: query_hql.xml:752
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:754
-#, no-c-format
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "Se ainda ainda não está totalmente convencido, pense o quão maior e menos "
 "legível poderia ser a query a seguir, em SQL:"
 
 #. Tag: programlisting
-#: query_hql.xml:759
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1652,13 +1649,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:761
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>Hint:</emphasis> something like"
 
 #. Tag: programlisting
-#: query_hql.xml:765
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1682,23 +1679,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:770
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr "A clausula order by"
 
 #. Tag: para
-#: query_hql.xml:772
-#, no-c-format
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "A lista retornada pela query pode ser ordenada por qualquer propriedade da "
 "classe ou componente retornado:"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1706,7 +1703,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:809
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1716,23 +1713,23 @@
 "crescente ou decrescente, respectivamente."
 
 #. Tag: title
-#: query_hql.xml:785
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr "A clausula group by"
 
 #. Tag: para
-#: query_hql.xml:787
-#, no-c-format
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "Uma query que retorne valores agregados, podem ser agrupados por qualquer "
 "propriedade de uma classe ou componente retornado:"
 
 #. Tag: programlisting
-#: query_hql.xml:791
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1741,7 +1738,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:793
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1750,13 +1747,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:795
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr "Uma clausula <literal>having</literal> também é permitida."
 
 #. Tag: programlisting
-#: query_hql.xml:799
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1766,19 +1763,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:801
-#, no-c-format
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "Funções SQL e funções agregadas são permitidas nas clausulas "
 "<literal>having</literal> e <literal>order by</literal>, se suportadas pelo "
 "banco de dados subjacente (ex: não no MySQL)."
 
 #. Tag: programlisting
-#: query_hql.xml:807
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1790,27 +1787,26 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:809
-#, no-c-format
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "Note que, nem a clausula <literal>group by</literal> ou <literal>order by</"
 "literal>, podem conter expressões aritiméticas."
 
 #. Tag: title
-#: query_hql.xml:821
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr "Subqueries"
 
 #. Tag: para
-#: query_hql.xml:823
+#: query_hql.xml:854
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1824,7 +1820,7 @@
 "(subqueries que fazem referência à alias de outras queries), são aceitas."
 
 #. Tag: programlisting
-#: query_hql.xml:829
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1834,7 +1830,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1844,7 +1840,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:833
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1854,7 +1850,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:835
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1864,7 +1860,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:837
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1872,37 +1868,38 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:839
-#, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr ""
 "Note que HQL subqueries podem aparecer apenas dentro de clausulas select ou "
 "where."
 
 #. Tag: para
-#: query_hql.xml:843
-#, no-c-format
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "Note that subqueries can also utilize <literal>row value constructor</"
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:851
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr "Exemplos de HQL"
 
 #. Tag: para
-#: query_hql.xml:853
-#, no-c-format
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "As queries do Hibernate, podem ser muito poderosas e complexas. De fato, o "
 "poder da linguagem de querie é um dos pontos principais na distribuição do "
@@ -1911,16 +1908,16 @@
 "escrever, são mais simples que estas."
 
 #. Tag: para
-#: query_hql.xml:859
-#, no-c-format
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "A query a seguir retorna o id de order, numero de itens e o valor total do "
 "order para todos os orders não pagos para um freguês particular e valor "
@@ -1931,7 +1928,7 @@
 "inner joins e um (não correlacionado) subselect."
 
 #. Tag: programlisting
-#: query_hql.xml:868
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1955,7 +1952,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:870
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1965,7 +1962,7 @@
 "subqueries, então minha query seria mais parecida com isto:"
 
 #. Tag: programlisting
-#: query_hql.xml:875
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1984,7 +1981,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:908
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -2003,7 +2000,7 @@
 "literal> ."
 
 #. Tag: programlisting
-#: query_hql.xml:885
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2024,17 +2021,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:887
-#, no-c-format
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "Se eu tivesse mapeado a Collection <literal>statusChanges</literal> como um "
 "List, ao invés de um Set, a query teria sido muito mais simples de escrever."
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2048,7 +2045,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:925
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -2068,7 +2065,7 @@
 "<literal>ORGANIZATION</literal> e <literal>ORG_USER</literal> ."
 
 #. Tag: programlisting
-#: query_hql.xml:903
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2081,7 +2078,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:905
+#: query_hql.xml:936
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
@@ -2090,7 +2087,7 @@
 "(correlacionado)."
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2104,39 +2101,38 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:914
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "update e delete em lote"
 
 #. Tag: para
-#: query_hql.xml:916
-#, no-c-format
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "Agora o HQL suporta declarações, <literal>update</literal>, <literal>delete</"
 "literal> e <literal>insert ... select ...</literal> Veja <xref linkend="
 "\"batch-direct\"/>, para mais detalhes."
 
 #. Tag: title
-#: query_hql.xml:924
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "Dicas e Truques"
 
 #. Tag: para
-#: query_hql.xml:926
-#, no-c-format
-msgid ""
-"You can count the number of query results without actually returning them:"
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr ""
 "Pode-se contar o número de resultados da query, sem realmente retorna-los."
 
 #. Tag: programlisting
-#: query_hql.xml:930
+#: query_hql.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2144,7 +2140,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:932
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
@@ -2152,7 +2148,7 @@
 "seguir."
 
 #. Tag: programlisting
-#: query_hql.xml:936
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2163,7 +2159,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:938
+#: query_hql.xml:969
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2173,19 +2169,19 @@
 "tamanho de seleção na cláusula where da sua query:"
 
 #. Tag: programlisting
-#: query_hql.xml:943
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:945
-#, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr "Se seu banco de dados não suporta subselects, use a query a seguir:"
 
 #. Tag: programlisting
-#: query_hql.xml:949
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2196,10 +2192,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:951
-#, no-c-format
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "Com essa solução não se pode retornar um <literal>User</"
@@ -2207,7 +2203,7 @@
 "join\", a forma a seguir também é útil."
 
 #. Tag: programlisting
-#: query_hql.xml:956
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2218,7 +2214,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:958
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
@@ -2226,7 +2222,7 @@
 "query:"
 
 #. Tag: programlisting
-#: query_hql.xml:962
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2236,7 +2232,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:964
+#: query_hql.xml:996
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2246,7 +2242,7 @@
 "literal><literal>com</literal> um filtro:"
 
 #. Tag: programlisting
-#: query_hql.xml:968
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2257,15 +2253,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:970
-#, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "Os elementos da Collection podem ser ordenados ou agrupados usando um filtro "
 "de query:"
 
 #. Tag: programlisting
-#: query_hql.xml:974
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2275,13 +2271,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:976
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "Pode-se achar o tamanho de uma Collection sem inicializa-la:"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:1012
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2289,34 +2285,34 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:985
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:987
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:992 query_hql.xml:1038
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:993
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:995
+#: query_hql.xml:1027
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2324,37 +2320,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1000
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1001
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1003
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1007
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1008
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1010
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2362,24 +2358,24 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1016
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1018
+#: query_hql.xml:1050
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1057
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2387,21 +2383,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1059
 #, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1066
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2409,16 +2405,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1040
+#: query_hql.xml:1072
 #, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1045
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2428,10 +2423,22 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1047
+#: query_hql.xml:1079
 #, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
+
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "Na maior parte do tempo, você precisará atribuir um <emphasis>alias</"
+#~ "emphasis>, desde que você queira se referia ao <literal>Cat</literal> em "
+#~ "outras partes da query."
+
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "ou como um objeto Java typesafe,"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,17 +11,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_sql.xml:5
+#: query_sql.xml:29
 #, no-c-format
 msgid "Native SQL"
 msgstr "Native SQL"
 
 #. Tag: para
-#: query_sql.xml:7
-#, no-c-format
+#: query_sql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -33,29 +33,29 @@
 "Hibernate."
 
 #. Tag: para
-#: query_sql.xml:13
-#, no-c-format
+#: query_sql.xml:37
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3 allows you to specify handwritten SQL (including stored "
 "procedures) for all create, update, delete, and load operations."
 
 #. Tag: title
-#: query_sql.xml:17
+#: query_sql.xml:41
 #, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "Using a <literal>SQLQuery</literal>"
 
 #. Tag: para
-#: query_sql.xml:19
-#, no-c-format
+#: query_sql.xml:43
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
@@ -63,19 +63,19 @@
 "querying."
 
 #. Tag: title
-#: query_sql.xml:25
+#: query_sql.xml:49
 #, no-c-format
 msgid "Scalar queries"
 msgstr "Scalar queries"
 
 #. Tag: para
-#: query_sql.xml:27
+#: query_sql.xml:51
 #, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr "The most basic SQL query is to get a list of scalars (values)."
 
 #. Tag: programlisting
-#: query_sql.xml:30
+#: query_sql.xml:54
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
@@ -84,11 +84,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:32
-#, no-c-format
+#: query_sql.xml:56
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "These will both return a List of Object arrays (Object[]) with scalar values "
@@ -96,19 +96,19 @@
 "deduce the actual order and types of the returned scalar values."
 
 #. Tag: para
-#: query_sql.xml:37
-#, no-c-format
+#: query_sql.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
 "simply to be more explicit in what is returned one can use <literal>addScalar"
 "()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:41
+#: query_sql.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -119,29 +119,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:43 query_sql.xml:89 query_sql.xml:170 query_sql.xml:321
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, no-c-format
 msgid "This query specified:"
 msgstr "This query specified:"
 
 #. Tag: para
-#: query_sql.xml:47 query_sql.xml:93 query_sql.xml:325
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr "the SQL query string"
 
 #. Tag: para
-#: query_sql.xml:51
+#: query_sql.xml:75
 #, no-c-format
 msgid "the columns and types to return"
 msgstr "the columns and types to return"
 
 #. Tag: para
-#: query_sql.xml:55
-#, no-c-format
+#: query_sql.xml:79
+#, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
-"<literal>ResultSetMetdata</literal> but will instead explicitly get the ID, "
+"This will return Object arrays, but now it will not use "
+"<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
 "be returned, even though the query is using <literal>*</literal> and could "
@@ -155,7 +155,7 @@
 "return more than the three listed columns."
 
 #. Tag: para
-#: query_sql.xml:63
+#: query_sql.xml:87
 #, no-c-format
 msgid ""
 "It is possible to leave out the type information for all or some of the "
@@ -165,7 +165,7 @@
 "scalars."
 
 #. Tag: programlisting
-#: query_sql.xml:66
+#: query_sql.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -176,24 +176,24 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:68
-#, no-c-format
+#: query_sql.xml:92
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "This is essentially the same query as before, but now "
 "<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
 "BIRTHDATE where as the type of ID is explicitly specified."
 
 #. Tag: para
-#: query_sql.xml:72
-#, no-c-format
+#: query_sql.xml:96
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
@@ -202,13 +202,13 @@
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 
 #. Tag: title
-#: query_sql.xml:80
+#: query_sql.xml:104
 #, no-c-format
 msgid "Entity queries"
 msgstr "Entity queries"
 
 #. Tag: para
-#: query_sql.xml:82
+#: query_sql.xml:106
 #, no-c-format
 msgid ""
 "The above queries were all about returning scalar values, basically "
@@ -222,7 +222,7 @@
 "literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:87
+#: query_sql.xml:111
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.class);\n"
@@ -232,13 +232,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:97
+#: query_sql.xml:121
 #, no-c-format
 msgid "the entity returned by the query"
 msgstr "the entity returned by the query"
 
 #. Tag: para
-#: query_sql.xml:101
+#: query_sql.xml:125
 #, no-c-format
 msgid ""
 "Assuming that Cat is mapped as a class with the columns ID, NAME and "
@@ -250,7 +250,7 @@
 "Cat entity."
 
 #. Tag: para
-#: query_sql.xml:105
+#: query_sql.xml:129
 #, no-c-format
 msgid ""
 "If the entity is mapped with a <literal>many-to-one</literal> to another "
@@ -268,7 +268,7 @@
 "to-one</literal> to a <literal>Dog</literal>:"
 
 #. Tag: programlisting
-#: query_sql.xml:113
+#: query_sql.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID FROM CATS"
@@ -277,19 +277,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:115
+#: query_sql.xml:139
 #, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr "This will allow cat.getDog() to function properly."
 
 #. Tag: title
-#: query_sql.xml:119
+#: query_sql.xml:143
 #, no-c-format
 msgid "Handling associations and collections"
 msgstr "Handling associations and collections"
 
 #. Tag: para
-#: query_sql.xml:121
+#: query_sql.xml:145
 #, no-c-format
 msgid ""
 "It is possible to eagerly join in the <literal>Dog</literal> to avoid the "
@@ -303,7 +303,7 @@
 "association or collection."
 
 #. Tag: programlisting
-#: query_sql.xml:126
+#: query_sql.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID, D_ID, "
@@ -314,15 +314,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:128
-#, no-c-format
+#: query_sql.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "In this example the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
@@ -332,7 +332,7 @@
 "had a one-to-many to <literal>Dog</literal> instead."
 
 #. Tag: programlisting
-#: query_sql.xml:136
+#: query_sql.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_NAME, "
@@ -343,13 +343,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:138
-#, no-c-format
+#: query_sql.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "At this stage we are reaching the limits of what is possible with native "
 "queries without starting to enhance the sql queries to make them usable in "
@@ -357,18 +357,18 @@
 "the same type or when the default alias/column names are not enough."
 
 #. Tag: title
-#: query_sql.xml:146
+#: query_sql.xml:170
 #, no-c-format
 msgid "Returning multiple entities"
 msgstr "Returning multiple entities"
 
 #. Tag: para
-#: query_sql.xml:148
-#, no-c-format
+#: query_sql.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "Until now the result set column names are assumed to be the same as the "
@@ -377,7 +377,7 @@
 "appear in more than one table."
 
 #. Tag: para
-#: query_sql.xml:153
+#: query_sql.xml:177
 #, no-c-format
 msgid ""
 "Column alias injection is needed in the following query (which most likely "
@@ -387,7 +387,7 @@
 "will fail):"
 
 #. Tag: programlisting
-#: query_sql.xml:156
+#: query_sql.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m WHERE c."
@@ -398,15 +398,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:158
-#, no-c-format
+#: query_sql.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specificed in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "The intention for this query is to return two Cat instances per row, a cat "
 "and its mother. This will fail since there is a conflict of names since they "
@@ -416,13 +416,13 @@
 "\"NAME\")."
 
 #. Tag: para
-#: query_sql.xml:165
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "The following form is not vulnerable to column name duplication:"
 
 #. Tag: programlisting
-#: query_sql.xml:168
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -433,7 +433,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:174
+#: query_sql.xml:202
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -443,23 +443,22 @@
 "aliases"
 
 #. Tag: para
-#: query_sql.xml:179
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr "the entities returned by the query"
 
 #. Tag: para
-#: query_sql.xml:183
-#, no-c-format
+#: query_sql.xml:211
+#, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicity, but even in "
-"this case we let Hibernate inject the SQL column aliases for each property. "
-"The placeholder for a column alias is just the property name qualified by "
-"the table alias. In the following example, we retrieve Cats and their "
-"mothers from a different table (cat_log) to the one declared in the mapping "
-"metadata. Notice that we may even use the property aliases in the where "
-"clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
 "properties\". Alternatively, you may list the columns explicity, but even in "
@@ -471,7 +470,7 @@
 "clause if we like."
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -486,19 +485,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:195
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr "Alias and property references"
 
 #. Tag: para
-#: query_sql.xml:197
-#, no-c-format
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "For most cases the above alias injection is needed, but for queries relating "
 "to more complex mappings like composite properties, inheritance "
@@ -506,233 +505,234 @@
 "allow Hibernate to inject the proper aliases."
 
 #. Tag: para
-#: query_sql.xml:202
-#, no-c-format
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "The following table shows the different possibilities of using the alias "
 "injection. Note: the alias names in the result are examples, each alias will "
 "have a unique and probably different name when used."
 
 #. Tag: title
-#: query_sql.xml:208
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr "Alias injection names"
 
 #. Tag: entry
-#: query_sql.xml:219
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: entry
-#: query_sql.xml:221
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr "Syntax"
 
 #. Tag: entry
-#: query_sql.xml:223
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr "Example"
 
 #. Tag: entry
-#: query_sql.xml:229
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr "A simple property"
 
 #. Tag: literal
-#: query_sql.xml:231
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
 #. Tag: literal
-#: query_sql.xml:233
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:237
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr "A composite property"
 
 #. Tag: literal
-#: query_sql.xml:239
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:241
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
 #. Tag: entry
-#: query_sql.xml:246
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "Discriminator of an entity"
 
 #. Tag: literal
-#: query_sql.xml:248
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:250
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:254
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr "All properties of an entity"
 
 #. Tag: literal
-#: query_sql.xml:256 query_sql.xml:304
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:258
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:262
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr "A collection key"
 
 #. Tag: literal
-#: query_sql.xml:264
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:266
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr "The id of an collection"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr "The element of an collection"
 
 #. Tag: literal
-#: query_sql.xml:280
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:286
-#, no-c-format
-msgid "roperty of the element in the collection"
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "roperty of the element in the collection"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "All properties of the element in the collection"
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr "All properties of the the collection"
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:315
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "Returning non-managed entities"
 
 #. Tag: para
-#: query_sql.xml:317
-#, no-c-format
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "It is possible to apply a ResultTransformer to native sql queries. Allowing "
 "it to e.g. return non-managed entities."
 
 #. Tag: programlisting
-#: query_sql.xml:319
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -740,13 +740,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:329
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr "a result transformer"
 
 #. Tag: para
-#: query_sql.xml:333
+#: query_sql.xml:361
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -758,17 +758,17 @@
 "corresponding properties or fields."
 
 #. Tag: title
-#: query_sql.xml:340
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "Handling inheritance"
 
 #. Tag: para
-#: query_sql.xml:342
-#, no-c-format
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "Native sql queries which query for entities that is mapped as part of an "
@@ -776,19 +776,19 @@
 "subclasses."
 
 #. Tag: title
-#: query_sql.xml:348
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr "Parameters"
 
 #. Tag: para
-#: query_sql.xml:350
-#, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr "Native sql queries support positional as well as named parameters:"
 
 #. Tag: programlisting
-#: query_sql.xml:353
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -801,17 +801,17 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:361
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "Named SQL queries"
 
 #. Tag: para
-#: query_sql.xml:363
-#, no-c-format
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "Named SQL queries may be defined in the mapping document and called in "
@@ -819,7 +819,7 @@
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:368
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -833,7 +833,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:370
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -843,19 +843,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:372
-#, no-c-format
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
 "collection&gt;</literal> elements are used to join associations and define "
 "queries which initialize collections, respectively."
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -876,7 +876,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:379
+#: query_sql.xml:406
 #, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
@@ -888,7 +888,7 @@
 "element:"
 
 #. Tag: programlisting
-#: query_sql.xml:383
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -901,19 +901,20 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:385
-#, no-c-format
+#: query_sql.xml:412
+#, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them accross several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "You can externalize the resultset mapping informations in a <literal>&lt;"
 "resultset&gt;</literal> element to either reuse them accross several named "
 "queries or through the <literal>setResultSetMapping()</literal> API."
 
 #. Tag: programlisting
-#: query_sql.xml:390
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -937,17 +938,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:392
-#, no-c-format
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr ""
 "You can alternatively use the resultset mapping information in your hbm "
 "files directly in java code."
 
 #. Tag: programlisting
-#: query_sql.xml:395
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -959,25 +960,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:398
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr "Using return-property to explicitly specify column/alias names"
 
 #. Tag: para
-#: query_sql.xml:401
-#, no-c-format
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
 "Hibernate what column aliases to use, instead of using the <literal>{}</"
 "literal>-syntax to let Hibernate inject its own aliases."
 
 #. Tag: programlisting
-#: query_sql.xml:406
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -995,11 +996,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:408
-#, no-c-format
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
@@ -1007,7 +1008,7 @@
 "allow fine grained control of multi-column properties."
 
 #. Tag: programlisting
-#: query_sql.xml:413
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -1028,19 +1029,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:415
-#, no-c-format
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "Notice that in this example we used <literal>&lt;return-property&gt;</"
 "literal> in combination with the <literal>{}</literal>-syntax for injection. "
 "Allowing users to choose how they want to refer column and properties."
 
 #. Tag: para
-#: query_sql.xml:420
+#: query_sql.xml:447
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1050,20 +1051,20 @@
 "discriminator&gt;</literal> to specify the discriminator column."
 
 #. Tag: title
-#: query_sql.xml:426
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "Using stored procedures for querying"
 
 #. Tag: para
-#: query_sql.xml:428
-#, no-c-format
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernate 3 introduces support for queries via stored procedures and "
 "functions. Most of the following documentation is equivalent for both. The "
@@ -1072,7 +1073,7 @@
 "Oracle 9 and higher is as follows:"
 
 #. Tag: programlisting
-#: query_sql.xml:434
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1090,13 +1091,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:436
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr "To use this query in Hibernate you need to map it via a named query."
 
 #. Tag: programlisting
-#: query_sql.xml:439
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1117,30 +1118,30 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:441
-#, no-c-format
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "Notice stored procedures currently only return scalars and entities. "
 "<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
 "literal> are not supported."
 
 #. Tag: title
-#: query_sql.xml:446
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "Rules/limitations for using stored procedures"
 
 #. Tag: para
-#: query_sql.xml:448
-#, no-c-format
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1153,20 +1154,20 @@
 "procedure semantics/syntax."
 
 #. Tag: para
-#: query_sql.xml:455
-#, no-c-format
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "Stored procedure queries can't be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 
 #. Tag: para
-#: query_sql.xml:458
-#, no-c-format
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
@@ -1175,20 +1176,20 @@
 "parameters&gt;}</literal>. Native call syntax is not supported."
 
 #. Tag: para
-#: query_sql.xml:463
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "For Oracle the following rules apply:"
 
 #. Tag: para
-#: query_sql.xml:467
-#, no-c-format
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "A funçãp deve retornar um result set. O primeiro parâmetro da procedure "
 "dever ser uma <literal>SAÍDA</literal> que retorne um result set. Isto é "
@@ -1197,19 +1198,19 @@
 "documentação do Oracle."
 
 #. Tag: para
-#: query_sql.xml:476
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "For Sybase or MS SQL server the following rules apply:"
 
 #. Tag: para
-#: query_sql.xml:480
-#, no-c-format
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "A procedure deve retornar um result set. Veja que este servidor pode "
 "retornar múltiplos result sets e update counts. O Hibernate ira iterar os "
@@ -1217,7 +1218,7 @@
 "set. O resto será descartado."
 
 #. Tag: para
-#: query_sql.xml:488
+#: query_sql.xml:515
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1227,13 +1228,13 @@
 "provavelmente será mais eficiente. Mas, isto não é obrigatório"
 
 #. Tag: title
-#: query_sql.xml:498
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "SQL customizado para create, update e delete"
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:527
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1256,7 +1257,7 @@
 "update&gt;</literal> sobreecreve essas strings:"
 
 #. Tag: programlisting
-#: query_sql.xml:508
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1272,19 +1273,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:510
-#, no-c-format
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "O SQL é executado diretamente no seu banco de dados, então você pode usar "
 "qualquer linguagem que quiser. Isto com certeza reduzira a portabilidade do "
 "seu mapeamento se você utilizar um SQL para um banco de dados especifico."
 
 #. Tag: para
-#: query_sql.xml:514
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1294,7 +1295,7 @@
 "literal> estiver ativado:"
 
 #. Tag: programlisting
-#: query_sql.xml:517
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1310,25 +1311,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:519
-#, no-c-format
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr ""
 "A ordem de posições dos parâmetros são vitais, pois eles devem estar na "
 "mesma seqüência esperada pelo Hibernate."
 
 #. Tag: para
-#: query_sql.xml:522
-#, no-c-format
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "Você pode ver a ordem esperada ativando o debug logging no nível "
 "<literal>org.hibernate.persister.entity</literal>. Com este nível ativado, o "
@@ -1338,14 +1339,13 @@
 "sobreecreve o SQL estático gerado pelo Hibernate)."
 
 #. Tag: para
-#: query_sql.xml:529
-#, no-c-format
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "As stored procedures são na maioria dos casos (leia: melhor não fazer) "
 "requeridas para retornar o numero de linhas inseridas/atualizadas/deletadas. "
@@ -1354,7 +1354,7 @@
 "como uma saída numérica para operações CRUD."
 
 #. Tag: programlisting
-#: query_sql.xml:535
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1374,20 +1374,20 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:539
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "SQL customizado para carga"
 
 #. Tag: para
-#: query_sql.xml:541
-#, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
 "Você pode declarar sua própria query SQL (ou HQL) para iniciar entidades:"
 
 #. Tag: programlisting
-#: query_sql.xml:544
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1400,10 +1400,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
-#, no-c-format
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr ""
 "Este é apenas uma declaração de query com nome, como discutido "
@@ -1411,7 +1411,7 @@
 "classe:"
 
 #. Tag: programlisting
-#: query_sql.xml:549
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1424,19 +1424,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:551
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr "Isto também funciona com stored procedures."
 
 #. Tag: para
-#: query_sql.xml:553
-#, no-c-format
-msgid "You may even define a query for collection loading:"
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr "Você pode tembém definir uma query para iniciar collection:"
 
 #. Tag: programlisting
-#: query_sql.xml:555
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1447,7 +1447,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:557
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1460,17 +1460,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:559
-#, no-c-format
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr ""
 "You could even define an entity loader that loads a collection by join "
 "fetching:"
 
 #. Tag: programlisting
-#: query_sql.xml:562
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: session_api.xml:5
+#: session_api.xml:29
 #, no-c-format
 msgid "Working with objects"
 msgstr "Trabalhando com objetos"
 
 #. Tag: para
-#: session_api.xml:7
-#, no-c-format
+#: session_api.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "O Hibernate é uma solução completa de mapeamento objeto/relacional que não "
 "apenas poupa o desenvolvedor dos detalhes de baixo nível do sistema de "
@@ -36,7 +36,7 @@
 "a objetos em aplicações Java."
 
 #. Tag: para
-#: session_api.xml:16
+#: session_api.xml:40
 #, no-c-format
 msgid ""
 "In other words, Hibernate application developers should always think about "
@@ -52,27 +52,27 @@
 "aplicações apenas quando estão ajustando a performance do sistema."
 
 #. Tag: title
-#: session_api.xml:24
+#: session_api.xml:48
 #, no-c-format
 msgid "Hibernate object states"
 msgstr "Estado dos objetos no Hibernate"
 
 #. Tag: para
-#: session_api.xml:26
+#: session_api.xml:50
 #, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr "O Hibernate define e suporta os seguintes estados de um objetos:"
 
 #. Tag: para
-#: session_api.xml:32
-#, no-c-format
+#: session_api.xml:56
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -88,15 +88,15 @@
 "transição)."
 
 #. Tag: para
-#: session_api.xml:44
-#, no-c-format
+#: session_api.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -110,8 +110,8 @@
 "<literal>DELETE</literal> quando o objeto deve ser passado para transiente."
 
 #. Tag: para
-#: session_api.xml:55
-#, no-c-format
+#: session_api.xml:79
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -120,8 +120,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>Detached</emphasis> – uma instância desaclopada é um objeto que "
 "foi persistido, mas sua <literal>Session</literal> foi fechada. A referência "
@@ -134,23 +134,23 @@
 "de trabalho do ponto de vista do usuário."
 
 #. Tag: para
-#: session_api.xml:69
-#, no-c-format
+#: session_api.xml:93
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "Agora iremos discutir os estados e suas transições ( e os métodos do "
 "Hibernate que disparam uma transição) em mais detalhes."
 
 #. Tag: title
-#: session_api.xml:77
+#: session_api.xml:101
 #, no-c-format
 msgid "Making objects persistent"
 msgstr "Tornando os objetos persistentes"
 
 #. Tag: para
-#: session_api.xml:79
+#: session_api.xml:103
 #, no-c-format
 msgid ""
 "Newly instantiated instances of a a persistent class are considered "
@@ -163,7 +163,7 @@
 "associando-a a uma sessão:"
 
 #. Tag: programlisting
-#: session_api.xml:86
+#: session_api.xml:110
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
@@ -174,15 +174,15 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:88
-#, no-c-format
+#: session_api.xml:112
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -196,11 +196,11 @@
 "do EJB3."
 
 #. Tag: para
-#: session_api.xml:100
-#, no-c-format
+#: session_api.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -216,7 +216,7 @@
 "Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:111
+#: session_api.xml:135
 #, no-c-format
 msgid ""
 "<literal>save()</literal> does guarantee to return an identifier. If an "
@@ -232,17 +232,17 @@
 "running conversation with an extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:121
-#, no-c-format
+#: session_api.xml:145
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr ""
 "Alternativamente, pode-se atribuir o identificador usando uma versão "
 "sobrecarregada de <literal>save()</literal>."
 
 #. Tag: programlisting
-#: session_api.xml:126
+#: session_api.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
@@ -255,12 +255,12 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:128
-#, no-c-format
+#: session_api.xml:152
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -275,13 +275,13 @@
 "literal> for usada nos objetos em uma ordem errada."
 
 #. Tag: para
-#: session_api.xml:138
-#, no-c-format
+#: session_api.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "Geralmente você não deve se importar com esses detalhes, muito provavelmente "
@@ -292,19 +292,19 @@
 "nesse capítulo."
 
 #. Tag: title
-#: session_api.xml:149
+#: session_api.xml:173
 #, no-c-format
 msgid "Loading an object"
 msgstr "Carregando o objetos"
 
 #. Tag: para
-#: session_api.xml:151
-#, no-c-format
+#: session_api.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "O método <literal>load()</literal> de uma <literal> Session</literal> nos "
 "fornece um meio para recuperar uma instância persistente se o identificador "
@@ -313,13 +313,13 @@
 "persistente."
 
 #. Tag: programlisting
-#: session_api.xml:158
+#: session_api.xml:182
 #, no-c-format
 msgid "<![CDATA[Cat fritz = (Cat) sess.load(Cat.class, generatedId);]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:160
+#: session_api.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[// you need to wrap primitive identifiers\n"
@@ -329,7 +329,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:162
+#: session_api.xml:186
 #, no-c-format
 msgid "Alternatively, you can load state into a given instance:"
 msgstr ""
@@ -337,7 +337,7 @@
 "pode-se carregar um estado em uma instância dada:"
 
 #. Tag: programlisting
-#: session_api.xml:166
+#: session_api.xml:190
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -347,17 +347,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:168
-#, no-c-format
+#: session_api.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "Repare que <literal>load()</literal> irá lançar uma exceção irrecuperável se "
 "não houver na tabela no banco de dados um registro que combine. Se a classe "
@@ -369,11 +369,11 @@
 "grupo se <literal>batch-size</literal> estiver para o mapeamento da classe."
 
 #. Tag: para
-#: session_api.xml:179
-#, no-c-format
+#: session_api.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "Se você não tiver certeza da existencia do registro no banco, você deve usar "
@@ -381,7 +381,7 @@
 "retorna um null se não existir o registro."
 
 #. Tag: programlisting
-#: session_api.xml:185
+#: session_api.xml:209
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id);\n"
@@ -393,10 +393,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:187
-#, no-c-format
+#: session_api.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -405,19 +405,19 @@
 "para maiores informações."
 
 #. Tag: programlisting
-#: session_api.xml:192
+#: session_api.xml:216
 #, no-c-format
 msgid "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id, LockMode.UPGRADE);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:194
-#, no-c-format
+#: session_api.xml:218
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "Note that any associated instances or contained collections are "
 "<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
@@ -425,7 +425,7 @@
 "cascade style for the association."
 
 #. Tag: para
-#: session_api.xml:201
+#: session_api.xml:225
 #, no-c-format
 msgid ""
 "It is possible to re-load an object and all its collections at any time, "
@@ -438,7 +438,7 @@
 "do objeto."
 
 #. Tag: programlisting
-#: session_api.xml:207
+#: session_api.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
@@ -447,13 +447,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:209
-#, no-c-format
+#: session_api.xml:233
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "Uma importante questão geralmente aparece neste ponto: O quanto Hibernate "
 "carrega do banco de dados e quantos SQL <literal>SELECT</literal> ele irá "
@@ -461,19 +461,19 @@
 "explicada na <xref linkend=\"performance-fetching\"/>."
 
 #. Tag: title
-#: session_api.xml:219
+#: session_api.xml:243
 #, no-c-format
 msgid "Querying"
 msgstr "Consultando"
 
 #. Tag: para
-#: session_api.xml:221
-#, no-c-format
+#: session_api.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -486,13 +486,13 @@
 "conversão do conjunto de reultados em objetos."
 
 #. Tag: title
-#: session_api.xml:231
+#: session_api.xml:255
 #, no-c-format
 msgid "Executing queries"
 msgstr "Executando consultas"
 
 #. Tag: para
-#: session_api.xml:233
+#: session_api.xml:257
 #, no-c-format
 msgid ""
 "HQL and native SQL queries are represented with an instance of <literal>org."
@@ -508,7 +508,7 @@
 "usando a <literal>Session</literal> atual:"
 
 #. Tag: programlisting
-#: session_api.xml:240
+#: session_api.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
@@ -538,17 +538,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:242
-#, no-c-format
+#: session_api.xml:266
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "Geralmente uma consulta é executada ao invocar <literal>list()</literal>, o "
 "resultado da consulta será carregado completamente em uma coleção na "
@@ -561,20 +561,20 @@
 "simples <literal>Set</literal>."
 
 #. Tag: title
-#: session_api.xml:254
+#: session_api.xml:278
 #, no-c-format
 msgid "Iterating results"
 msgstr "Interagindo com resultados"
 
 #. Tag: para
-#: session_api.xml:256
-#, no-c-format
+#: session_api.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -592,7 +592,7 @@
 "inicializar as instâncias reais."
 
 #. Tag: programlisting
-#: session_api.xml:268
+#: session_api.xml:292
 #, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
@@ -611,23 +611,23 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:272
+#: session_api.xml:296
 #, no-c-format
 msgid "Queries that return tuples"
 msgstr "Consultas que retornam tuplas"
 
 #. Tag: para
-#: session_api.xml:274
-#, no-c-format
+#: session_api.xml:298
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "Algumas vezes as consultas do Hibernate retornam tuplas de objetos, nesse "
 "caso cada tupla é retornada como um array:"
 
 #. Tag: programlisting
-#: session_api.xml:279
+#: session_api.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
@@ -645,18 +645,18 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:284
+#: session_api.xml:308
 #, no-c-format
 msgid "Scalar results"
 msgstr "Resultados escalares"
 
 #. Tag: para
-#: session_api.xml:286
-#, no-c-format
+#: session_api.xml:310
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "Consultas devem especificar uma propriedade da classe na clausula "
 "<literal>select</literal>. Elas também podem chamar funções SQL de "
@@ -664,7 +664,7 @@
 "( e não entidades no estado persistente)."
 
 #. Tag: programlisting
-#: session_api.xml:292
+#: session_api.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
@@ -684,20 +684,20 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:297
+#: session_api.xml:321
 #, no-c-format
 msgid "Bind parameters"
 msgstr "Bind parameters"
 
 #. Tag: para
-#: session_api.xml:299
-#, no-c-format
+#: session_api.xml:323
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
@@ -706,7 +706,7 @@
 "The advantages of named parameters are:"
 
 #. Tag: para
-#: session_api.xml:309
+#: session_api.xml:333
 #, no-c-format
 msgid ""
 "named parameters are insensitive to the order they occur in the query string"
@@ -714,19 +714,19 @@
 "named parameters are insensitive to the order they occur in the query string"
 
 #. Tag: para
-#: session_api.xml:315
-#, no-c-format
-msgid "they may occur multiple times in the same query"
+#: session_api.xml:339
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "they may occur multiple times in the same query"
 
 #. Tag: para
-#: session_api.xml:320
+#: session_api.xml:344
 #, no-c-format
 msgid "they are self-documenting"
 msgstr "they are self-documenting"
 
 #. Tag: programlisting
-#: session_api.xml:326
+#: session_api.xml:350
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter (preferred)\n"
@@ -737,7 +737,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:328
+#: session_api.xml:352
 #, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
@@ -747,7 +747,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:330
+#: session_api.xml:354
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
@@ -761,25 +761,25 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:335
+#: session_api.xml:359
 #, no-c-format
 msgid "Pagination"
 msgstr "Pagination"
 
 #. Tag: para
-#: session_api.xml:337
-#, no-c-format
+#: session_api.xml:361
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "If you need to specify bounds upon your result set (the maximum number of "
 "rows you want to retrieve and / or the first row you want to retrieve) you "
 "should use methods of the <literal>Query</literal> interface:"
 
 #. Tag: programlisting
-#: session_api.xml:343
+#: session_api.xml:367
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"from DomesticCat cat\");\n"
@@ -789,7 +789,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:345
+#: session_api.xml:369
 #, no-c-format
 msgid ""
 "Hibernate knows how to translate this limit query into the native SQL of "
@@ -799,19 +799,19 @@
 "your DBMS."
 
 #. Tag: title
-#: session_api.xml:353
+#: session_api.xml:377
 #, no-c-format
 msgid "Scrollable iteration"
 msgstr "Scrollable iteration"
 
 #. Tag: para
-#: session_api.xml:355
-#, no-c-format
+#: session_api.xml:379
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
 "<literal>Query</literal> interface may be used to obtain a "
@@ -819,7 +819,7 @@
 "navigation of the query results."
 
 #. Tag: programlisting
-#: session_api.xml:362
+#: session_api.xml:386
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.createQuery(\"select cat.name, cat from DomesticCat "
@@ -849,11 +849,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:364
-#, no-c-format
+#: session_api.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "Note that an open database connection (and cursor) is required for this "
@@ -861,25 +861,25 @@
 "()</literal> if you need offline pagination functionality."
 
 #. Tag: title
-#: session_api.xml:373
+#: session_api.xml:397
 #, no-c-format
 msgid "Externalizing named queries"
 msgstr "Externalizing named queries"
 
 #. Tag: para
-#: session_api.xml:375
-#, no-c-format
+#: session_api.xml:399
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "You may also define named queries in the mapping document. (Remember to use "
 "a <literal>CDATA</literal> section if your query contains characters that "
 "could be interpreted as markup.)"
 
 #. Tag: programlisting
-#: session_api.xml:381
+#: session_api.xml:405
 #, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
@@ -890,13 +890,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:383
+#: session_api.xml:407
 #, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr "Parameter binding and executing is done programatically:"
 
 #. Tag: programlisting
-#: session_api.xml:387
+#: session_api.xml:411
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
@@ -906,26 +906,26 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:389
-#, no-c-format
+#: session_api.xml:413
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "Note that the actual program code is independent of the query language that "
 "is used, you may also define native SQL queries in metadata, or migrate "
 "existing queries to Hibernate by placing them in mapping files."
 
 #. Tag: para
-#: session_api.xml:395
-#, no-c-format
+#: session_api.xml:419
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
@@ -934,17 +934,17 @@
 "class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 
 #. Tag: title
-#: session_api.xml:408
+#: session_api.xml:432
 #, no-c-format
 msgid "Filtering collections"
 msgstr "Filtering collections"
 
 #. Tag: para
-#: session_api.xml:409
-#, no-c-format
+#: session_api.xml:433
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "A collection <emphasis>filter</emphasis> is a special type of query that may "
@@ -952,7 +952,7 @@
 "to <literal>this</literal>, meaning the current collection element."
 
 #. Tag: programlisting
-#: session_api.xml:415
+#: session_api.xml:439
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
@@ -964,31 +964,31 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:417
-#, no-c-format
+#: session_api.xml:441
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "The returned collection is considered a bag, and it's a copy of the given "
 "collection. The original collection is not modified (this is contrary to the "
 "implication of the name \"filter\", but consistent with expected behavior)."
 
 #. Tag: para
-#: session_api.xml:423
-#, no-c-format
+#: session_api.xml:447
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "Observe that filters do not require a <literal>from</literal> clause (though "
 "they may have one if required). Filters are not limited to returning the "
 "collection elements themselves."
 
 #. Tag: programlisting
-#: session_api.xml:428
+#: session_api.xml:452
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
@@ -998,17 +998,17 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:430
-#, no-c-format
+#: session_api.xml:454
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
 "huge collection:"
 
 #. Tag: programlisting
-#: session_api.xml:435
+#: session_api.xml:459
 #, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
@@ -1018,17 +1018,17 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:440
+#: session_api.xml:464
 #, no-c-format
 msgid "Criteria queries"
 msgstr "Criteria queries"
 
 #. Tag: para
-#: session_api.xml:442
-#, no-c-format
+#: session_api.xml:466
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1038,7 +1038,7 @@
 "API for these cases:"
 
 #. Tag: programlisting
-#: session_api.xml:448
+#: session_api.xml:472
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = session.createCriteria(Cat.class);\n"
@@ -1048,7 +1048,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:450
+#: session_api.xml:474
 #, no-c-format
 msgid ""
 "The <literal>Criteria</literal> and the associated <literal>Example</"
@@ -1060,20 +1060,20 @@
 ">."
 
 #. Tag: title
-#: session_api.xml:458
+#: session_api.xml:482
 #, no-c-format
 msgid "Queries in native SQL"
 msgstr "Queries in native SQL"
 
 #. Tag: para
-#: session_api.xml:460
-#, no-c-format
+#: session_api.xml:484
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "You may express a query in SQL, using <literal>createSQLQuery()</literal> "
 "and let Hibernate take care of the mapping from result sets to objects. Note "
@@ -1082,7 +1082,7 @@
 "Hibernate API, you must enclose SQL aliases in braces:"
 
 #. Tag: programlisting
-#: session_api.xml:468
+#: session_api.xml:492
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
@@ -1092,7 +1092,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:470
+#: session_api.xml:494
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
@@ -1105,10 +1105,10 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:472
-#, no-c-format
+#: session_api.xml:496
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1117,24 +1117,24 @@
 "in <xref linkend=\"querysql\"/>."
 
 #. Tag: title
-#: session_api.xml:483
+#: session_api.xml:507
 #, no-c-format
 msgid "Modifying persistent objects"
 msgstr "Modifying persistent objects"
 
 #. Tag: para
-#: session_api.xml:485
-#, no-c-format
+#: session_api.xml:509
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
 "saved, created or queried by the <literal>Session</literal>) may be "
@@ -1147,7 +1147,7 @@
 "then manipulate it directly, while the <literal>Session</literal> is open:"
 
 #. Tag: programlisting
-#: session_api.xml:496
+#: session_api.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat cat = (DomesticCat) sess.load( Cat.class, new Long"
@@ -1157,14 +1157,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:498
-#, no-c-format
+#: session_api.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "Sometimes this programming model is inefficient since it would require both "
 "an SQL <literal>SELECT</literal> (to load an object) and an SQL "
@@ -1172,19 +1171,19 @@
 "session. Therefore Hibernate offers an alternate approach, using detached "
 "instances."
 
-#. Tag: emphasis
-#: session_api.xml:506
+#. Tag: para
+#: session_api.xml:529
 #, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "Note that Hibernate does not offer its own API for direct execution of "
@@ -1198,13 +1197,13 @@
 "some possible batch operation tricks."
 
 #. Tag: title
-#: session_api.xml:521
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "Modifying detached objects"
 
 #. Tag: para
-#: session_api.xml:523
+#: session_api.xml:548
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1220,7 +1219,7 @@
 "unit of work."
 
 #. Tag: para
-#: session_api.xml:530
+#: session_api.xml:555
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1232,7 +1231,7 @@
 "merge()</literal> methods:"
 
 #. Tag: programlisting
-#: session_api.xml:536
+#: session_api.xml:561
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1249,7 +1248,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:538
+#: session_api.xml:563
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1261,16 +1260,16 @@
 "tried to reattach it, an exception would have been thrown."
 
 #. Tag: para
-#: session_api.xml:544
-#, no-c-format
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "Use <literal>update()</literal> if you are sure that the session does not "
 "contain an already persistent instance with the same identifier, and "
@@ -1281,14 +1280,14 @@
 "first operation that is executed."
 
 #. Tag: para
-#: session_api.xml:553
-#, no-c-format
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "The application should individually <literal>update()</literal> detached "
 "instances reachable from the given detached instance if and <emphasis>only</"
@@ -1297,19 +1296,19 @@
 "\"objectstate-transitive\"/>."
 
 #. Tag: para
-#: session_api.xml:560
-#, no-c-format
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
 "to be unmodified!"
 
 #. Tag: programlisting
-#: session_api.xml:565
+#: session_api.xml:590
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1321,11 +1320,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:567
-#, no-c-format
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1335,7 +1334,7 @@
 "usecase for <literal>lock()</literal>."
 
 #. Tag: para
-#: session_api.xml:574
+#: session_api.xml:599
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1345,13 +1344,13 @@
 "\"transactions-optimistic\"/>."
 
 #. Tag: title
-#: session_api.xml:581
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "Automatic state detection"
 
 #. Tag: para
-#: session_api.xml:583
+#: session_api.xml:608
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1365,7 +1364,7 @@
 "<literal>saveOrUpdate()</literal> method implements this functionality."
 
 #. Tag: programlisting
-#: session_api.xml:590
+#: session_api.xml:615
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1383,7 +1382,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:592
+#: session_api.xml:617
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1401,7 +1400,7 @@
 "these methods."
 
 #. Tag: para
-#: session_api.xml:600
+#: session_api.xml:625
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1411,31 +1410,31 @@
 "used in the following scenario:"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "the application loads an object in the first session"
 
 #. Tag: para
-#: session_api.xml:612
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "the object is passed up to the UI tier"
 
 #. Tag: para
-#: session_api.xml:617
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "some modifications are made to the object"
 
 #. Tag: para
-#: session_api.xml:622
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "the object is passed back down to the business logic tier"
 
 #. Tag: para
-#: session_api.xml:627
+#: session_api.xml:652
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1445,19 +1444,19 @@
 "literal> in a second session"
 
 #. Tag: para
-#: session_api.xml:634
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal> does the following:"
 
 #. Tag: para
-#: session_api.xml:640
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr "if the object is already persistent in this session, do nothing"
 
 #. Tag: para
-#: session_api.xml:645
+#: session_api.xml:670
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1467,13 +1466,13 @@
 "an exception"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr "if the object has no identifier property, <literal>save()</literal> it"
 
 #. Tag: para
-#: session_api.xml:656
+#: session_api.xml:681
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1483,11 +1482,11 @@
 "object, <literal>save()</literal> it"
 
 #. Tag: para
-#: session_api.xml:662
-#, no-c-format
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1497,19 +1496,19 @@
 "literal> it"
 
 #. Tag: para
-#: session_api.xml:670
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr "otherwise <literal>update()</literal> the object"
 
 #. Tag: para
-#: session_api.xml:676
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "and <literal>merge()</literal> is very different:"
 
 #. Tag: para
-#: session_api.xml:682
+#: session_api.xml:707
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1521,7 +1520,7 @@
 "persistent instance"
 
 #. Tag: para
-#: session_api.xml:689
+#: session_api.xml:714
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1531,13 +1530,13 @@
 "try to load it from the database, or create a new persistent instance"
 
 #. Tag: para
-#: session_api.xml:695
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "the persistent instance is returned"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:725
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1547,19 +1546,19 @@
 "detached"
 
 #. Tag: title
-#: session_api.xml:710
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "Deleting persistent objects"
 
 #. Tag: para
-#: session_api.xml:712
-#, no-c-format
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
 "database. Of course, your application might still hold a reference to a "
@@ -1567,19 +1566,19 @@
 "a persistent instance transient."
 
 #. Tag: programlisting
-#: session_api.xml:719
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:721
-#, no-c-format
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "You may delete objects in any order you like, without risk of foreign key "
 "constraint violations. It is still possible to violate a <literal>NOT NULL</"
@@ -1587,16 +1586,16 @@
 "order, e.g. if you delete the parent, but forget to delete the children."
 
 #. Tag: title
-#: session_api.xml:732
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "Replicating object between two different datastores"
 
 #. Tag: para
-#: session_api.xml:734
-#, no-c-format
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1605,7 +1604,7 @@
 "identifier values."
 
 #. Tag: programlisting
-#: session_api.xml:740
+#: session_api.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1624,50 +1623,50 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:742
-#, no-c-format
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
 "literal> will deal with conflicts with existing rows in the database."
 
 #. Tag: para
-#: session_api.xml:749
-#, no-c-format
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
 "an existing database row with the same identifier"
 
 #. Tag: para
-#: session_api.xml:755
-#, no-c-format
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
 "database row with the same identifier"
 
 #. Tag: para
-#: session_api.xml:761
-#, no-c-format
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr ""
 "<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
 "is an existing database row with the same identifier"
 
 #. Tag: para
-#: session_api.xml:767
-#, no-c-format
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1676,7 +1675,7 @@
 "the object otherwise"
 
 #. Tag: para
-#: session_api.xml:775
+#: session_api.xml:800
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1690,19 +1689,19 @@
 "more."
 
 #. Tag: title
-#: session_api.xml:784
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Flushing the Session"
 
 #. Tag: para
-#: session_api.xml:786
-#, no-c-format
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "From time to time the <literal>Session</literal> will execute the SQL "
 "statements needed to synchronize the JDBC connection's state with the state "
@@ -1710,93 +1709,92 @@
 "by default at the following points"
 
 #. Tag: para
-#: session_api.xml:795
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr "before some query executions"
 
 #. Tag: para
-#: session_api.xml:800
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr "from <literal>org.hibernate.Transaction.commit()</literal>"
 
 #. Tag: para
-#: session_api.xml:805
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "from <literal>Session.flush()</literal>"
 
 #. Tag: para
-#: session_api.xml:811
-#, no-c-format
-msgid "The SQL statements are issued in the following order"
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "The SQL statements are issued in the following order"
 
 #. Tag: para
-#: session_api.xml:817
-#, no-c-format
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "all entity insertions, in the same order the corresponding objects were "
 "saved using <literal>Session.save()</literal>"
 
 #. Tag: para
-#: session_api.xml:823
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr "all entity updates"
 
 #. Tag: para
-#: session_api.xml:828
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr "all collection deletions"
 
 #. Tag: para
-#: session_api.xml:833
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "all collection element deletions, updates and insertions"
 
 #. Tag: para
-#: session_api.xml:838
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr "all collection insertions"
 
 #. Tag: para
-#: session_api.xml:843
-#, no-c-format
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "all entity deletions, in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 
 #. Tag: para
-#: session_api.xml:850
-#, no-c-format
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(An exception is that objects using <literal>native</literal> ID generation "
 "are inserted when they are saved.)"
 
 #. Tag: para
-#: session_api.xml:855
-#, no-c-format
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "Except when you explicity <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
@@ -1806,17 +1804,17 @@
 "data."
 
 #. Tag: para
-#: session_api.xml:863
-#, no-c-format
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
@@ -1828,7 +1826,7 @@
 "time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
 
 #. Tag: programlisting
-#: session_api.xml:873
+#: session_api.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1848,7 +1846,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:875
+#: session_api.xml:900
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1862,13 +1860,13 @@
 "\"transactions\"/>."
 
 #. Tag: title
-#: session_api.xml:884
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "Transitive persistence"
 
 #. Tag: para
-#: session_api.xml:886
+#: session_api.xml:911
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1880,17 +1878,17 @@
 "a parent/child relationship. Consider the following example:"
 
 #. Tag: para
-#: session_api.xml:892
-#, no-c-format
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
@@ -1902,12 +1900,12 @@
 "have shared references, delete the child from the database."
 
 #. Tag: para
-#: session_api.xml:903
-#, no-c-format
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1922,7 +1920,7 @@
 "reachability</emphasis> by default."
 
 #. Tag: para
-#: session_api.xml:912
+#: session_api.xml:937
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1942,29 +1940,29 @@
 "mapping document. For example:"
 
 #. Tag: programlisting
-#: session_api.xml:921
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:923
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "Cascade styles my be combined:"
 
 #. Tag: programlisting
-#: session_api.xml:927
+#: session_api.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:929
-#, no-c-format
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -1975,7 +1973,7 @@
 "no operations are to be cascaded."
 
 #. Tag: para
-#: session_api.xml:935
+#: session_api.xml:960
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -1989,16 +1987,16 @@
 "association."
 
 #. Tag: para
-#: session_api.xml:942
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr "Recommendations:"
 
 #. Tag: para
-#: session_api.xml:948
-#, no-c-format
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -2009,7 +2007,7 @@
 "<literal>&lt;one-to-many&gt;</literal> associations."
 
 #. Tag: para
-#: session_api.xml:956
+#: session_api.xml:981
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -2021,7 +2019,7 @@
 "<literal>cascade=\"all,delete-orphan\"</literal>."
 
 #. Tag: para
-#: session_api.xml:963
+#: session_api.xml:988
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -2035,7 +2033,7 @@
 "<literal>cascade=\"persist,merge,save-update\"</literal>."
 
 #. Tag: para
-#: session_api.xml:971
+#: session_api.xml:996
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -2049,12 +2047,12 @@
 "delete of the parent results in save/update/delete of the child or children."
 
 #. Tag: para
-#: session_api.xml:977
-#, no-c-format
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -2069,7 +2067,7 @@
 "relationship are as follows:"
 
 #. Tag: para
-#: session_api.xml:988
+#: session_api.xml:1013
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -2079,7 +2077,7 @@
 "passed to <literal>persist()</literal>"
 
 #. Tag: para
-#: session_api.xml:994
+#: session_api.xml:1019
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -2089,7 +2087,7 @@
 "to <literal>merge()</literal>"
 
 #. Tag: para
-#: session_api.xml:1000
+#: session_api.xml:1025
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2101,7 +2099,7 @@
 "<literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1006
+#: session_api.xml:1031
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2111,7 +2109,7 @@
 "it is passed to <literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1037
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2121,7 +2119,7 @@
 "literal>"
 
 #. Tag: para
-#: session_api.xml:1017
+#: session_api.xml:1042
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2135,13 +2133,13 @@
 "case the \"orphaned\" child is deleted."
 
 #. Tag: para
-#: session_api.xml:1026
-#, no-c-format
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2153,21 +2151,21 @@
 "reachable during flush of the <literal>Session</literal>."
 
 #. Tag: title
-#: session_api.xml:1038
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr "Usando metadados"
 
 #. Tag: para
-#: session_api.xml:1040
-#, no-c-format
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "O Hibernate requer um modelo muito rico a nível de metadados de todas as "
 "entidades e tipos de valores. De tempos em tempos, este modelo é muito útil "
@@ -2178,12 +2176,12 @@
 "associadas)."
 
 #. Tag: para
-#: session_api.xml:1047
-#, no-c-format
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "O Hibernate expõe o metadados via interfaces <literal>ClassMetadata</"
@@ -2192,7 +2190,7 @@
 "obtidas a partir do <literal>SessionFactory</literal>."
 
 #. Tag: programlisting
-#: session_api.xml:1054
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,26 +11,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: toolset_guide.xml:5
+#: toolset_guide.xml:29
 #, no-c-format
 msgid "Toolset Guide"
 msgstr "Toolset Guide"
 
 #. Tag: para
-#: toolset_guide.xml:7
-#, no-c-format
+#: toolset_guide.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
 "plugins, commandline tools, as well as Ant tasks."
 
 #. Tag: para
-#: toolset_guide.xml:12
-#, no-c-format
+#: toolset_guide.xml:36
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -39,13 +39,13 @@
 "databases:"
 
 #. Tag: para
-#: toolset_guide.xml:18
-#, no-c-format
+#: toolset_guide.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
 "files, supporting auto-completion and syntax highlighting. It also supports "
@@ -53,14 +53,14 @@
 "much more versatile than a normal XML editor."
 
 #. Tag: para
-#: toolset_guide.xml:23
-#, no-c-format
+#: toolset_guide.xml:47
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
 "addition to a tree overview of your console configurations, you also get an "
@@ -69,15 +69,14 @@
 "the result directly in Eclipse."
 
 #. Tag: para
-#: toolset_guide.xml:30
-#, no-c-format
+#: toolset_guide.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
 "the Hibernate Eclipse tools; you can use a wizard to quickly generate "
@@ -86,47 +85,41 @@
 "mapping files. The reverse engineering wizard supports customizable "
 "templates."
 
-#. Tag: emphasis
-#: toolset_guide.xml:38
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr "Ant Tasks:"
-
 #. Tag: para
-#: toolset_guide.xml:43
-#, no-c-format
+#: toolset_guide.xml:67
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
 "documentation for more information."
 
 #. Tag: para
-#: toolset_guide.xml:48
-#, no-c-format
+#: toolset_guide.xml:72
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "However, the Hibernate main package comes bundled with an integrated tool "
 "(it can even be used from \"inside\" Hibernate on-the-fly): "
 "<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
 
 #. Tag: title
-#: toolset_guide.xml:55
+#: toolset_guide.xml:79
 #, no-c-format
 msgid "Automatic schema generation"
 msgstr "Automatic schema generation"
 
 #. Tag: para
-#: toolset_guide.xml:57
-#, no-c-format
+#: toolset_guide.xml:81
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "DDL may be generated from your mapping files by a Hibernate utility. The "
@@ -135,36 +128,38 @@
 "also created for mapped identifier generators."
 
 #. Tag: para
-#: toolset_guide.xml:64
-#, no-c-format
+#: toolset_guide.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
 "DDL is highly vendor specific."
 
 #. Tag: para
-#: toolset_guide.xml:70
-#, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+#: toolset_guide.xml:94
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr "First, customize your mapping files to improve the generated schema."
 
 #. Tag: title
-#: toolset_guide.xml:75
+#: toolset_guide.xml:99
 #, no-c-format
 msgid "Customizing the schema"
 msgstr "Customizing the schema"
 
 #. Tag: para
-#: toolset_guide.xml:77
-#, no-c-format
+#: toolset_guide.xml:101
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "Many Hibernate mapping elements define optional attributes named "
@@ -173,25 +168,25 @@
 "attribute."
 
 #. Tag: programlisting
-#: toolset_guide.xml:84
+#: toolset_guide.xml:108
 #, no-c-format
 msgid "<![CDATA[<property name=\"zip\" length=\"5\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:85
+#: toolset_guide.xml:109
 #, no-c-format
 msgid "<![CDATA[<property name=\"balance\" precision=\"12\" scale=\"2\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:87
-#, no-c-format
+#: toolset_guide.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "Some tags also accept a <literal>not-null</literal> attribute (for "
 "generating a <literal>NOT NULL</literal> constraint on table columns) and a "
@@ -199,14 +194,14 @@
 "literal> constraint on table columns)."
 
 #. Tag: programlisting
-#: toolset_guide.xml:93
+#: toolset_guide.xml:117
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" not-null=\"true\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:95
+#: toolset_guide.xml:119
 #, no-c-format
 msgid ""
 "<![CDATA[<element column=\"serialNumber\" type=\"long\" not-null=\"true\" "
@@ -214,14 +209,14 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:97
-#, no-c-format
+#: toolset_guide.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "A <literal>unique-key</literal> attribute may be used to group columns in a "
 "single unique key constraint. Currently, the specified value of the "
@@ -230,7 +225,7 @@
 "mapping file."
 
 #. Tag: programlisting
-#: toolset_guide.xml:105
+#: toolset_guide.xml:129
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"org\" column=\"orgId\" unique-key="
@@ -239,19 +234,19 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:107
-#, no-c-format
+#: toolset_guide.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "An <literal>index</literal> attribute specifies the name of an index that "
 "will be created using the mapped column or columns. Multiple columns may be "
 "grouped into the same index, simply by specifying the same index name."
 
 #. Tag: programlisting
-#: toolset_guide.xml:113
+#: toolset_guide.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
@@ -259,17 +254,17 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:115
-#, no-c-format
+#: toolset_guide.xml:139
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "A <literal>foreign-key</literal> attribute may be used to override the name "
 "of any generated foreign key constraint."
 
 #. Tag: programlisting
-#: toolset_guide.xml:120
+#: toolset_guide.xml:144
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"bar\" column=\"barId\" foreign-key=\"FKFooBar\"/"
@@ -277,7 +272,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:122
+#: toolset_guide.xml:146
 #, no-c-format
 msgid ""
 "Many mapping elements also accept a child <literal>&lt;column&gt;</literal> "
@@ -287,7 +282,7 @@
 "element. This is particularly useful for mapping multi-column types:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:127
+#: toolset_guide.xml:151
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
@@ -300,19 +295,19 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:129
-#, no-c-format
+#: toolset_guide.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "The <literal>default</literal> attribute lets you specify a default value "
 "for a column (you should assign the same value to the mapped property before "
 "saving a new instance of the mapped class)."
 
 #. Tag: programlisting
-#: toolset_guide.xml:135
+#: toolset_guide.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
@@ -321,7 +316,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:137
+#: toolset_guide.xml:161
 #, no-c-format
 msgid ""
 "<![CDATA[<version name=\"version\" type=\"integer\" insert=\"false\">\n"
@@ -330,7 +325,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:139
+#: toolset_guide.xml:163
 #, no-c-format
 msgid ""
 "The <literal>sql-type</literal> attribute allows the user to override the "
@@ -340,7 +335,7 @@
 "default mapping of a Hibernate type to SQL datatype."
 
 #. Tag: programlisting
-#: toolset_guide.xml:144
+#: toolset_guide.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
@@ -349,7 +344,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:146
+#: toolset_guide.xml:170
 #, no-c-format
 msgid ""
 "The <literal>check</literal> attribute allows you to specify a check "
@@ -359,7 +354,7 @@
 "constraint."
 
 #. Tag: programlisting
-#: toolset_guide.xml:150
+#: toolset_guide.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"foo\" type=\"integer\">\n"
@@ -368,7 +363,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:152
+#: toolset_guide.xml:176
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Foo\" table=\"foos\" check=\"bar < 100.0\">\n"
@@ -377,152 +372,158 @@
 "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:156
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
 #. Tag: entry
-#: toolset_guide.xml:163
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr "Attribute"
 
 #. Tag: entry
-#: toolset_guide.xml:164
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr "Values"
 
 #. Tag: entry
-#: toolset_guide.xml:165
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr "Interpretation"
 
 #. Tag: literal
-#: toolset_guide.xml:170
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:171 toolset_guide.xml:176 toolset_guide.xml:181
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr "number"
 
 #. Tag: entry
-#: toolset_guide.xml:172
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr "column length"
 
 #. Tag: literal
-#: toolset_guide.xml:175
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:177
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr "column decimal precision"
 
 #. Tag: literal
-#: toolset_guide.xml:180
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:182
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr "column decimal scale"
 
 #. Tag: literal
-#: toolset_guide.xml:185
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:186 toolset_guide.xml:191
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:187
-#, no-c-format
-msgid "specfies that the column should be non-nullable"
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "specfies that the column should be non-nullable"
 
 #. Tag: literal
-#: toolset_guide.xml:190
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:192
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "specifies that the column should have a unique constraint"
 
 #. Tag: literal
-#: toolset_guide.xml:195
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:196
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:197
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "specifies the name of a (multi-column) index"
 
 #. Tag: literal
-#: toolset_guide.xml:200
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:201
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:202
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "specifies the name of a multi-column unique constraint"
 
 #. Tag: literal
-#: toolset_guide.xml:205
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:206
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:207
+#: toolset_guide.xml:233
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -537,19 +538,19 @@
 "be considered by <placeholder-6/>."
 
 #. Tag: literal
-#: toolset_guide.xml:217
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:218
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL column type"
 
 #. Tag: entry
-#: toolset_guide.xml:219
+#: toolset_guide.xml:245
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -559,37 +560,37 @@
 "only)"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:226 toolset_guide.xml:233
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, no-c-format
 msgid "SQL expression"
 msgstr "SQL expression"
 
 #. Tag: entry
-#: toolset_guide.xml:227
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "specify a default value for the column"
 
 #. Tag: literal
-#: toolset_guide.xml:232
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:234
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr "create an SQL check constraint on either column or table"
 
 #. Tag: para
-#: toolset_guide.xml:242
+#: toolset_guide.xml:268
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -599,7 +600,7 @@
 "comments for the generated schema."
 
 #. Tag: programlisting
-#: toolset_guide.xml:247
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -609,7 +610,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:249
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -620,23 +621,23 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:251
-#, no-c-format
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
 "column</literal> statement in the generated DDL (where supported)."
 
 #. Tag: title
-#: toolset_guide.xml:260
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr "Running the tool"
 
 #. Tag: para
-#: toolset_guide.xml:262
+#: toolset_guide.xml:288
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -646,7 +647,15 @@
 "and/or executes the DDL statements."
 
 #. Tag: para
-#: toolset_guide.xml:267
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr "<literal>SchemaExport</literal> Command Line Options"
+
+#. Tag: para
+#: toolset_guide.xml:295
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -655,153 +664,153 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:273
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr "<literal>SchemaExport</literal> Command Line Options"
 
 #. Tag: entry
-#: toolset_guide.xml:279 toolset_guide.xml:429 toolset_guide.xml:498
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr "Option"
 
 #. Tag: entry
-#: toolset_guide.xml:280 toolset_guide.xml:367 toolset_guide.xml:430
-#: toolset_guide.xml:499
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: literal
-#: toolset_guide.xml:285 toolset_guide.xml:435
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:286 toolset_guide.xml:436
-#, no-c-format
-msgid "don't output the script to stdout"
+#: toolset_guide.xml:314 toolset_guide.xml:464
+#, fuzzy, no-c-format
+msgid "do not output the script to stdout"
 msgstr "don't output the script to stdout"
 
 #. Tag: literal
-#: toolset_guide.xml:289
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:290
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr "only drop the tables"
 
 #. Tag: literal
-#: toolset_guide.xml:293
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:294
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr "only create the tables"
 
 #. Tag: literal
-#: toolset_guide.xml:297 toolset_guide.xml:439
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:298
-#, no-c-format
-msgid "don't export to the database"
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "don't export to the database"
 
 #. Tag: literal
-#: toolset_guide.xml:301
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:302
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "output the ddl script to a file"
 
 #. Tag: literal
-#: toolset_guide.xml:305 toolset_guide.xml:443 toolset_guide.xml:504
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
 #. Tag: entry
-#: toolset_guide.xml:306 toolset_guide.xml:444 toolset_guide.xml:505
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "in <literal>hibernate.properties</literal>"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:451 toolset_guide.xml:512
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:310
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "read Hibernate configuration from an XML file"
 
 #. Tag: literal
-#: toolset_guide.xml:313 toolset_guide.xml:447 toolset_guide.xml:508
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
 #. Tag: entry
-#: toolset_guide.xml:314 toolset_guide.xml:448 toolset_guide.xml:509
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, no-c-format
 msgid "read database properties from a file"
 msgstr "read database properties from a file"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "format the generated SQL nicely in the script"
 
 #. Tag: literal
-#: toolset_guide.xml:321
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=;"
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "set an end of line delimiter for the script"
 
 #. Tag: para
-#: toolset_guide.xml:328
-#, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
 "You may even embed <literal>SchemaExport</literal> in your application:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:332
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -809,19 +818,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:337
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr "Properties"
 
 #. Tag: para
-#: toolset_guide.xml:339
-#, no-c-format
-msgid "Database properties may be specified"
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "Database properties may be specified"
 
 #. Tag: para
-#: toolset_guide.xml:345
+#: toolset_guide.xml:373
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -831,103 +840,103 @@
 "emphasis>"
 
 #. Tag: para
-#: toolset_guide.xml:348
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "in <literal>hibernate.properties</literal>"
 
 #. Tag: para
-#: toolset_guide.xml:351
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr "in a named properties file with <literal>--properties</literal>"
 
 #. Tag: para
-#: toolset_guide.xml:355
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "The needed properties are:"
 
 #. Tag: title
-#: toolset_guide.xml:360
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport Connection Properties"
 
 #. Tag: entry
-#: toolset_guide.xml:366
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr "Property Name"
 
 #. Tag: literal
-#: toolset_guide.xml:372
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:373
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "jdbc driver class"
 
 #. Tag: literal
-#: toolset_guide.xml:376
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:377
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr "jdbc url"
 
 #. Tag: literal
-#: toolset_guide.xml:380
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:381
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr "database user"
 
 #. Tag: literal
-#: toolset_guide.xml:384
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:385
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr "user password"
 
 #. Tag: literal
-#: toolset_guide.xml:388
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:389
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr "dialect"
 
 #. Tag: title
-#: toolset_guide.xml:398
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr "Using Ant"
 
 #. Tag: para
-#: toolset_guide.xml:400
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
@@ -935,7 +944,7 @@
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:404
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -958,19 +967,18 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:409
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "Incremental schema updates"
 
 #. Tag: para
-#: toolset_guide.xml:411
-#, no-c-format
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
 "\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
@@ -978,7 +986,7 @@
 "drivers."
 
 #. Tag: para
-#: toolset_guide.xml:417
+#: toolset_guide.xml:445
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -987,31 +995,31 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:423
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal> Command Line Options"
 
 #. Tag: entry
-#: toolset_guide.xml:440
-#, no-c-format
-msgid "don't export the script to the database"
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "don't export the script to the database"
 
 #. Tag: entry
-#: toolset_guide.xml:452 toolset_guide.xml:513
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr "specify a <placeholder-1/> file"
 
 #. Tag: para
-#: toolset_guide.xml:458
-#, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr "You may embed <literal>SchemaUpdate</literal> in your application:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:462
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1019,19 +1027,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:467
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "Using Ant for incremental schema updates"
 
 #. Tag: para
-#: toolset_guide.xml:469
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:473
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1050,20 +1058,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:478
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr "Schema validation"
 
 #. Tag: para
-#: toolset_guide.xml:480
-#, no-c-format
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
 "database schema \"matches\" your mapping documents. Note that "
@@ -1072,7 +1080,7 @@
 "useful for testing."
 
 #. Tag: para
-#: toolset_guide.xml:486
+#: toolset_guide.xml:514
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1080,20 +1088,28 @@
 "<emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal> Command Line Options"
+
 #. Tag: title
-#: toolset_guide.xml:492
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> Command Line Options"
 
 #. Tag: para
-#: toolset_guide.xml:519
-#, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr "You may embed <literal>SchemaValidator</literal> in your application:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:523
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1101,19 +1117,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:528
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "Using Ant for schema validation"
 
 #. Tag: para
-#: toolset_guide.xml:530
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr "You can call <literal>SchemaValidator</literal> from the Ant script:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:534
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
@@ -1130,6 +1146,9 @@
 "</target>]]>"
 msgstr ""
 
+#~ msgid "Ant Tasks:"
+#~ msgstr "Ant Tasks:"
+
 #~ msgid "&lt;one-to-one&gt;"
 #~ msgstr "&lt;one-to-one&gt;"
 

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:47+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
-#, no-c-format
-msgid "Transactions And Concurrency"
+#: transactions.xml:29
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "Transações e Concorrência"
 
 #. Tag: para
-#: transactions.xml:7
-#, no-c-format
+#: transactions.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "O ponto o mais importante sobre o Hibernate e o controle de concorrência é "
@@ -34,15 +34,14 @@
 "da base de dados."
 
 #. Tag: para
-#: transactions.xml:14
-#, no-c-format
+#: transactions.xml:38
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "O Hibernate não bloqueia objetos na memória. Sua aplicação pode esperar o "
 "comportamento tal qual definido pelo nível de isolamento de suas transações "
@@ -52,13 +51,13 @@
 "relatórios que retornam valores escalares)."
 
 #. Tag: para
-#: transactions.xml:22
-#, no-c-format
+#: transactions.xml:46
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "Além do versionamento para o controle automático de concorrência otimista, o "
 "Hibernate oferece também uma API (menor) para bloqueio pessimista de linhas "
@@ -66,10 +65,10 @@
 "concorrência otimista e esta API são discutidos mais tarde neste capítulo."
 
 #. Tag: para
-#: transactions.xml:29
-#, no-c-format
+#: transactions.xml:53
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -80,19 +79,19 @@
 "e conversações longas."
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "Session e escopos de transações"
 
 #. Tag: para
-#: transactions.xml:38
-#, no-c-format
+#: transactions.xml:62
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "Um <literal>SessionFactory</literal> é objeto threadsafe compartilhado por "
 "todas as threads da aplicação que consome muitos recursos na sua criação. É "
@@ -100,14 +99,14 @@
 "instância de uma <literal>Configuration</literal>."
 
 #. Tag: para
-#: transactions.xml:44
-#, no-c-format
+#: transactions.xml:68
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "Uma <literal>Session</literal> é um objeto de baixo custo de criação, não é "
 "threadsafe, deve ser usado uma vez, para uma única requisição, uma "
@@ -117,15 +116,14 @@
 "conseqüentemente não consome nenhum recurso até ser usado."
 
 #. Tag: para
-#: transactions.xml:52
-#, no-c-format
+#: transactions.xml:76
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "Para completar, você também tem que pensar sobre as transações de base de "
 "dados. Uma transação tem que ser tão curta quanto possível, para reduzir a "
@@ -135,14 +133,14 @@
 "tempo que o usuário pensa, até que a unidade do trabalho esteja completa."
 
 #. Tag: para
-#: transactions.xml:61
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "Qual é o escopo de uma unidade de trabalho? Pode uma únicoa "
 "<literal>Session</literal> do Hibernate gerenciar diversas transações ou é "
@@ -151,28 +149,43 @@
 "transação?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "Unidade de trabalho"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "Primeiro, não use o antipattern <emphasis>sessão-por-operação</emphasis>, "
@@ -193,19 +206,19 @@
 "manutenível e extensível."
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:126
+#, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is send to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "O pattern mais comum em uma aplicação multi-usuário cliente/servidor é "
 "<emphasis>sessão-por-requisição</emphasis>. Neste modelo, uma requisição do "
@@ -220,20 +233,20 @@
 "para muitas aplicações."
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is send to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "O desafio encontra-se na implementação. O Hibernate fornece gerência "
 "integrada da \"sessão atual\" para simplificar este pattern. Tudo que você "
@@ -250,15 +263,14 @@
 "de código."
 
 #. Tag: para
-#: transactions.xml:112
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "Seu código de aplicação pode acessar a \"sessão atual\" para processar a "
 "requisição fazendo uma chamada simples a <literal>sessionFactory."
@@ -268,19 +280,18 @@
 "ambientes JTA. Veja <xref linkend=\"architecture-current-session\"/>."
 
 #. Tag: para
-#: transactions.xml:120
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "Às vezes é conveniente estender o escopo de uma <literal>Session</literal> e "
 "de uma transação do banco de dados até que a \"visão esteja renderizada\". É "
@@ -295,20 +306,20 @@
 "<emphasis>Open Session in View</emphasis>."
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "Longas conversações"
 
 #. Tag: para
-#: transactions.xml:137
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "O pattern sessão-por-requisição não é o único conceito útil que você pode "
 "usar ao projetar unidades de trabalho. Muitos processos de negócio requerem "
@@ -318,10 +329,10 @@
 "seguinte exemplo:"
 
 #. Tag: para
-#: transactions.xml:147
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -330,25 +341,24 @@
 "está livre modificar os objetos."
 
 #. Tag: para
-#: transactions.xml:154
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "O usuário clica em \"Salvar\" após 5 minutos e espera suas modificações "
 "serem persistidas; espera também que ele era a única pessoa que edita esta "
 "informação e que nenhuma modificação conflitante possa ocorrer."
 
 #. Tag: para
-#: transactions.xml:162
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "Nós chamamos esta unidade de trabalho, do ponto da visão do usuário, "
 "executando uma longa <emphasis>conversação</emphasis> (ou "
@@ -356,14 +366,14 @@
 "pode implementar em sua aplicação."
 
 #. Tag: para
-#: transactions.xml:168
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "Uma primeira implementação simples pode manter a<literal>Session</literal> e "
 "a transação aberta durante o tempo de interação do usuário, com bloqueios na "
@@ -373,17 +383,17 @@
 "número de usuários concorrentes."
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:214
+#, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"converastion. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "Claramente, nós temos que usar diversas transações para implementar a "
 "conversação. Neste caso, Manter o isolamento dos processos de negócio torna-"
@@ -396,13 +406,13 @@
 "características do Hibernate:"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:227
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occured during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>Versionamento automático</emphasis> - O Hibernate pode fazer o "
 "controle automático de concorrência otimista para você, ele pode "
@@ -411,15 +421,15 @@
 "conversação."
 
 #. Tag: para
-#: transactions.xml:197
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>Detached Objects</emphasis>- se você se decidir usar o já "
 "discutido pattern <emphasis>session-per-request</emphasis>, todas as "
@@ -430,17 +440,17 @@
 "para isolar as modificações concorrentes."
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:245
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitely."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>Extended (or Long) Session</emphasis> A <literal>Session</literal> "
 "do Hibernate pode ser desligada da conexão básica do JDBC depois que a "
@@ -452,13 +462,13 @@
 "para ser nivelado automaticamente, e sim explicitamente."
 
 #. Tag: para
-#: transactions.xml:220
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "Ambos <emphasis>session-per-request-with-detached-objects</emphasis> e "
 "<emphasis>session-per-conversation</emphasis> possuem vantagens e "
@@ -466,19 +476,19 @@
 "controle de concorrência otimista."
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "Considerando a identidade do objeto"
 
 #. Tag: para
-#: transactions.xml:231
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "Uma aplicação pode acessar concorrentemente o mesmo estado persistente em "
 "duas <literal>Session</literal>s diferentes. Entretanto, uma instância de "
@@ -487,41 +497,41 @@
 "identidade:"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "Identidade da base de dados"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "Identidade da JVM"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "Então para os objetos acoplados a um <literal>Session</literal> em "
 "<literal>particular </literal> (isto é no escopo de um <literal>Session</"
@@ -534,16 +544,16 @@
 "abordagem otimista."
 
 #. Tag: para
-#: transactions.xml:266
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "Este caminho deixa o Hibernate e o banco dedados se preocuparem com a "
 "concorrência; também fornece uma escalabilidade melhor, garantindo que a "
@@ -555,28 +565,29 @@
 "<literal>==</literal> para comparar objetos."
 
 #. Tag: para
-#: transactions.xml:275
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "Com tudo, uma aplicação que usa <literal>==</literal> fora de uma "
 "<literal>Session</literal>, pode ver resultados inesperados. Isto pode "
@@ -601,19 +612,19 @@
 "a identidade e a igualdade do objeto de Java têm que ser implementadas."
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "Edições comuns"
 
 #. Tag: para
-#: transactions.xml:298
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "Nunca use o anti-patterns <emphasis>session-per-user-session</emphasis> ou "
@@ -623,17 +634,17 @@
 "implicações antes de fazer uma decisão de projeto:"
 
 #. Tag: para
-#: transactions.xml:307
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "Uma <literal>Session</literal> não é threadsafe. As coisas que são supostas "
 "para trabalhar concorrentemente, como requisições HTTP, session beans, ou "
@@ -646,18 +657,18 @@
 "concorrentemente."
 
 #. Tag: para
-#: transactions.xml:318
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "Uma exceção lançada pelo Hibernate significa que você tem que dar rollback "
 "na sua transação no banco de dados e fechar a <literal>Session</literal> "
@@ -670,18 +681,18 @@
 "recuperáveis e você tem que iniciar após o rollback de qualquer maneira."
 
 #. Tag: para
-#: transactions.xml:330
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "O <literal>Session</literal> guarda em cache cada objeto que está no estado "
 "persistente (guardado e checado para estado \"sujo\" pelo Hibernate). Isto "
@@ -696,21 +707,21 @@
 "probabilidade elevada de se acabar com dados velhos."
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "Demarcação de transações de bancos de dados"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:388
+#, fuzzy, no-c-format
 msgid ""
-"Datatabase (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -726,18 +737,18 @@
 "leitura."
 
 #. Tag: para
-#: transactions.xml:360
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "Uma aplicação do Hibernate pode funcionar em ambientes não gerenciados (isto "
 "é aplicações standalone, Web simples ou Swing) e ambientes gerenciados J2EE. "
@@ -751,13 +762,13 @@
 "necessário."
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:408
+#, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
-"transaction demaracation. Hibernate offers a wrapper API called "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
+"transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
 "strongly encourage its use unless you are in a CMT session bean."
@@ -771,62 +782,62 @@
 "fortemente seu uso a menos que você estiver em um CMT session bean."
 
 #. Tag: para
-#: transactions.xml:379
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr ""
 "Geralmente, finalizar um <literal>Session</literal>envolve quatro fases "
 "distintas:"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "flush da sessão"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "commitar a transação"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "fechar a sessão"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "tratar as exceções"
 
 #. Tag: para
-#: transactions.xml:406
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "A limpeza da sessão já foi bem discutida, agora nós daremos uma olhada na "
 "demarcação da transação e na manipulação de exceção em ambientes controlados "
 "e não controlados."
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "Ambiente não gerenciado"
 
 #. Tag: para
-#: transactions.xml:415
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -837,7 +848,7 @@
 "uma sessão/transação é mais ou menos assim:"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -861,12 +872,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
-#, no-c-format
+#: transactions.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -881,17 +892,17 @@
 "Este código Java é portável e funciona em ambientes não gerenciado e de JTA."
 
 #. Tag: para
-#: transactions.xml:433
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "Uma solução muito mais flexível é gerência integrada de contexto da \"sessão "
 "atual\" do Hibernate, como descrito anteriormente:"
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -910,17 +921,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "Você muito provavelmente nunca verá estes fragmentos de código em uma "
 "aplicação regular; as exceções fatais (do sistema) devem sempre ser pegas no "
@@ -933,12 +944,12 @@
 "discutida mais tarde neste capítulo."
 
 #. Tag: para
-#: transactions.xml:450
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "Note que você deve selecionar <literal>org.hibernate.transaction."
@@ -947,17 +958,17 @@
 "current_session_context_class</literal>."
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "Usando JTA"
 
 #. Tag: para
-#: transactions.xml:461
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -969,12 +980,12 @@
 "Hibernate oferece duas estratégias para a integração de JTA."
 
 #. Tag: para
-#: transactions.xml:468
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "Se você usar bean-managed transactions (BMT - transações gerenciadas por "
@@ -983,7 +994,7 @@
 "gerência de transação é idêntico ao ambiente não gerenciado."
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -1007,13 +1018,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 "Se você quiser usar um <literal>Session</literal> limitada por transação, "
 "isto é, a funcionalidade do <literal>getCurrentSession()</literal> para a "
@@ -1021,7 +1031,7 @@
 "<literal>UserTransaction</literal>:"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1044,18 +1054,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:522
+#, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "Com CMT, a demarcação da transação é feita em descritores de deployment do "
 "session beans, não programaticamente, conseqüentemente, o código é reduzido "
 "a:"
 
 #. Tag: programlisting
-#: transactions.xml:489
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1067,15 +1077,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "Em um CMT/EJB mesmo um rollback acontece automaticamente, desde que uma "
 "exeção <literal>RuntimeException</literal> não tratável seja lançada por um "
@@ -1086,17 +1096,16 @@
 "</emphasis>"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatiblity), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "Veja que você deverá escolher <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> se você usar o JTA diretamente (BMT) e "
@@ -1109,21 +1118,21 @@
 "\"</literal>."
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:546
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
-"close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicity "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "A operação <literal>getCurrentSession()</literal> tem um aspecto negativo em "
 "um ambiente JTA. Há uma advertência para o uso do método liberado de conexão "
@@ -1140,23 +1149,23 @@
 "código provindo do JTA ou do CMT.)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "Tratamento de Exceção"
 
 #. Tag: para
-#: transactions.xml:526
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "Se a <literal>Session</literal> levantar uma exceção (incluindo qualquer "
 "<literal>SQLException</literal>), você deve imediatamente dar um rollback na "
@@ -1168,19 +1177,19 @@
 "chamando <literal>close()</literal> no bloco <literal>finally</literal>."
 
 #. Tag: para
-#: transactions.xml:537
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "A exceção <literal>HibernateException</literal>, a qual envolve a maioria "
 "dos erros que podem ocorrer em uma camada de persistência do Hibernate, é "
@@ -1195,12 +1204,12 @@
 "Estas, também são, irrecuperáveis e uma ação apropriada deve ser tomada."
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
 "with the database in a <literal>JDBCException</literal>. In fact, Hibernate "
-"will attempt to convert the eexception into a more meningful subclass of "
+"will attempt to convert the exception into a more meaningful subclass of "
 "<literal>JDBCException</literal>. The underlying <literal>SQLException</"
 "literal> is always available via <literal>JDBCException.getCause()</"
 "literal>. Hibernate converts the <literal>SQLException</literal> into an "
@@ -1208,9 +1217,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "O Hibernate envolve <literal>SQLException</literal>s lançadas ao interagir "
@@ -1228,74 +1237,74 @@
 "<literal>JDBCException</literal> são:"
 
 #. Tag: para
-#: transactions.xml:565
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - indica um erro com a "
 "comunicação subjacente de JDBC."
 
 #. Tag: para
-#: transactions.xml:571
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - indica um problema da gramática ou "
 "da sintaxe com o SQL emitido."
 
 #. Tag: para
-#: transactions.xml:577
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - indica algum forma de "
 "violação de confinamento de integridade."
 
 #. Tag: para
-#: transactions.xml:583
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - indica um erro ao adquirir um "
 "nível de bloqueio necessário para realizar a operação de requisição."
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr ""
 "<literal>GenericJDBCException</literal> - uma exceção genérica que não cai "
 "em algumas das outras categorias."
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "Timeout de Transação"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:639
+#, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
-"transaction timeout to JTA. This functioanlity is abstracted by the "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "Uma característica extremamente importante fornecida por um ambiente "
@@ -1311,7 +1320,7 @@
 "<literal>Transaction</literal> do Hibernate."
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1336,33 +1345,32 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "Veja que <literal>setTimeout()</literal> não pode ser chamado em um CMT "
 "bean, onde os timeouts das transações devem ser definidos declarativamente."
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Controle de concorrência otimista"
 
 #. Tag: para
-#: transactions.xml:628
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "O único caminho que é consistente com a elevada concorrência e "
 "escalabilidade é controle de concorrência otimista com versionamento. "
@@ -1374,22 +1382,22 @@
 "impedir atualizações perdidas em únicas transações."
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "Checagem de versão da aplicação"
 
 #. Tag: para
-#: transactions.xml:641
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "Em uma implementação sem muita ajuda do Hibernate, cada interação com o "
 "banco de dados ocorre em uma nova <literal>Session</literal> e o "
@@ -1400,7 +1408,7 @@
 "ao banco de dados. É a caminho mais similar a EJBs entity."
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1418,7 +1426,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1430,15 +1438,15 @@
 "durante o flush se a entidade estiver alterada."
 
 #. Tag: para
-#: transactions.xml:658
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "Claro, se você se estiver operando em um ambiente de baixa concorrência de "
 "dados e não requerer a checagem de versão, você pode usar este caminho e "
@@ -1449,14 +1457,14 @@
 "uma possibilidade ajustar mudanças de conflito."
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:705
+#, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "Claro que, checagem manual da versão é somente praticável em circunstâncias "
 "triviais e não para a maioria de aplicações. Freqüentemente, os grafos "
@@ -1466,22 +1474,22 @@
 "paradigma do projeto."
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "Sessão estendida e versionamento automático"
 
 #. Tag: para
-#: transactions.xml:680
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "Uma única instância de <literal>Session</literal> e suas instâncias "
 "persistentes são usadas para a conversação inteira, isto é conhecido como "
@@ -1492,14 +1500,14 @@
 "mudanças ou reinicie a conversação do negócio com dados não antigos)."
 
 #. Tag: para
-#: transactions.xml:689
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
@@ -1513,7 +1521,7 @@
 "que recarregar instâncias em cada transação."
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1528,24 +1536,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "O objeto <literal>foo</literal> sabe que <literal>Session</literal> já foi "
 "carregada. Começando uma nova transação em uma sessão velha obtém uma "
@@ -1563,16 +1570,16 @@
 "da sessão para terminar a conversação."
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "Este pattern é problemático se a <literal>Session</literal> for "
 "demasiadamente grande para ser armazenado durante o tempo que usuário "
@@ -1583,27 +1590,33 @@
 "requisição/resposta. Você deve usar a <literal>Session</literal> somente "
 "para uma única conversação, porque ela logo também estará com dados velhos."
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:723
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "(Note que versões mais atuais de Hibernate requerem a desconexão e o "
 "reconexão explícitas de uma <literal>Session</literal>. Estes métodos são "
 "desatualizados, como o início e término de uma transação tem o mesmo efeito.)"
 
 #. Tag: para
-#: transactions.xml:729
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "Note também que você deve manter a <literal>Session</literal> desconectada "
 "fechada para a camada de persistência. Ou seja, use um EJB stateful session "
@@ -1612,13 +1625,13 @@
 "separada) para armazená-lo no <literal>HttpSession</literal>."
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "O pattern sessão estendida, ou <emphasis>session-per-conversation</"
@@ -1628,13 +1641,13 @@
 "para exemplos)."
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Objetos destacados e versionamento automático"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1654,7 +1667,7 @@
 "literal> ou <literal>Session.merge()</literal>."
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1668,22 +1681,22 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:799
+#, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
-"exception if conflicting updates occured."
+"exception if conflicting updates occurred."
 msgstr ""
 "Outra vez, o Hibernate verificará versões da instância durante o flush, "
 "lançando uma exceção se ocorrer conflitos de atualizações."
 
 #. Tag: para
-#: transactions.xml:764
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "Você pode também chamar o <literal>lock()</literal> em vez de <literal>update"
@@ -1692,16 +1705,16 @@
 "o objeto não foi modificado."
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "Versionamento automático customizado"
 
 #. Tag: para
-#: transactions.xml:775
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1712,19 +1725,19 @@
 "incrementa versões se a propriedade estiver modificada."
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:822
+#, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this concepetually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "Os esquemas da base de dados legada são freqüentemente estáticos e não podem "
 "ser modificados. Ou outras aplicações puderam também acessar a mesma base de "
@@ -1739,13 +1752,13 @@
 "session-per-request-with-detached-objects."
 
 #. Tag: para
-#: transactions.xml:793
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "Às vezes a modificação concorrente pode ser permitida tão longa quanto às "
 "mudanças que tiveram sido feitas que não sobrepuseram. Se você configurar "
@@ -1754,21 +1767,21 @@
 "durante o flush."
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute uneccessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "Em ambos os casos, com as colunas dedicadas da versão/timestamp ou com "
 "comparação do campo cheio/modificados, o Hibernate usa uma única declaração "
@@ -1785,20 +1798,20 @@
 "linha."
 
 #. Tag: title
-#: transactions.xml:817
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "Locking pessimista"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:860
+#, fuzzy, no-c-format
 msgid ""
-"It is not intended that users spend much time worring about locking "
-"strategies. Its usually enough to specify an isolation level for the JDBC "
+"It is not intended that users spend much time worrying about locking "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "Não se pretende que os usuários gastam muitas horas se preocupando com suas "
 "estratégias de locking. Geralmente é o bastante para especificar um nível de "
@@ -1808,27 +1821,27 @@
 "início de uma nova transação."
 
 #. Tag: para
-#: transactions.xml:826
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr ""
 "O Hibernate usará sempre o mecanismo de lock da base de dados, nunca trava "
 "objetos na memória!"
 
 #. Tag: para
-#: transactions.xml:831
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "A classe <literal>LockMode</literal> define os diferentes níveis de lock que "
 "o Hibernate pode adquirir. Um lock é obtido pelos seguintes mecanismos:"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1838,10 +1851,10 @@
 "Hibernate atualiza ou insere uma linha."
 
 #. Tag: para
-#: transactions.xml:844
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1850,10 +1863,10 @@
 "que suporte esse sintaxe."
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1862,19 +1875,19 @@
 "Oracle."
 
 #. Tag: para
-#: transactions.xml:856
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "<literal>LockMode.READ</literal> é adquirido automaticamente quando o "
 "Hibernate lê dados em um nível Repeatable Read ou Serializable isolation. "
 "Pode ser readquirido explicitamente pelo usuário."
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1890,7 +1903,7 @@
 "esse lock mode."
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
@@ -1899,7 +1912,7 @@
 "maneiras:"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1909,19 +1922,19 @@
 "<literal>LockMode</literal>."
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "Uma chamada a <literal>Session.lock()</literal>."
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "Uma chamada a <literal>Query.setLockMode()</literal>."
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1941,14 +1954,14 @@
 "literal> para aquele objeto."
 
 #. Tag: para
-#: transactions.xml:903
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "O método <literal>Session.lock()</literal> executa uma verificação no número "
 "da versão se o modo de lock especificado for <literal>READ</literal>, "
@@ -1957,37 +1970,37 @@
 "<literal>SELECT ... FOR UPDATE</literal>.)"
 
 #. Tag: para
-#: transactions.xml:910
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "Se o banco de dados não suportar o lock mode solicitado, o Hibernate vai "
 "usar um modo alternativo apropriado (ao invés de lançar uma exceção). Isso "
 "garante que a aplicação vai ser portável."
 
 #. Tag: title
-#: transactions.xml:919
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "Modos de liberar a Connection"
 
 #. Tag: para
-#: transactions.xml:921
-#, no-c-format
+#: transactions.xml:962
+#, fuzzy, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 "O comportamento legado do Hibernate (2.x) em consideração ao gerenciamento "
 "da conexão via JDBC fez com que a <literal>Session</literal> precisasse "
@@ -2001,39 +2014,37 @@
 "enumeração <literal>org.hibernate.ConnectionReleaseMode</literal>:"
 
 #. Tag: para
-#: transactions.xml:935
-#, no-c-format
+#: transactions.xml:976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obatins a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 "<literal>ON_CLOSE</literal> - essencialmente é o modo legado descrito acima. "
 "A sessão do Hibernate obtêm a conexão quando precisar executar alguma "
 "operação JDBC pela primeira vez e mantem enquanto a conexão não for fechada."
 
 #. Tag: para
-#: transactions.xml:942
-#, no-c-format
+#: transactions.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 "<literal>AFTER_TRANSACTION</literal> – informa que a conexão deve ser "
 "liberada após a conclusão de uma <literal>org.hibernate.Transaction</"
 "literal>."
 
 #. Tag: para
-#: transactions.xml:948
-#, no-c-format
+#: transactions.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 "<literal>AFTER_STATEMENT</literal> (também conhecida com liberação "
 "agressiva) – informa que a conexão deve ser liberada após a execução de cada "
@@ -2043,27 +2054,28 @@
 "ScrollableResults</literal>."
 
 #. Tag: para
-#: transactions.xml:958
-#, no-c-format
+#: transactions.xml:999
+#, fuzzy, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 "O parâmetro de configuração <literal>hibernate.connection.release_mode</"
 "literal> é usado para especificar qual modo de liberação deve ser usado. "
 "Opções disponíveis:"
 
 #. Tag: para
-#: transactions.xml:965
-#, no-c-format
+#: transactions.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 "<literal>auto</literal> (padrão) – essa opção delega ao modo de liberação "
 "retornado pelo método <literal>org.hibernate.transaction.TransactionFactory."
@@ -2074,25 +2086,24 @@
 "bugs e/ou suposições inválidas no código do usuário."
 
 #. Tag: para
-#: transactions.xml:975
-#, no-c-format
+#: transactions.xml:1016
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 "<literal>on_close</literal> - indica o uso da ConnectionReleaseMode."
 "ON_CLOSE. Essa opção foi deixada para manter a compatibilidade, mas seu uso "
 "é fortemente desencorajado."
 
 #. Tag: para
-#: transactions.xml:981
-#, no-c-format
+#: transactions.xml:1022
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 "<literal>after_transaction</literal> – indica o uso da ConnectionReleaseMode."
@@ -2102,18 +2113,18 @@
 "modo AFTER_STATEMENT."
 
 #. Tag: para
-#: transactions.xml:989
-#, no-c-format
+#: transactions.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""
 "<literal>after_statement</literal> – indica o uso ConnectionReleaseMode."
 "AFTER_STATEMENT. Adicionalmente, o <literal>ConnectionProvider</literal> "

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,167 +11,195 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:7
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
-msgstr "Introdução ao Hibernate"
+msgid "Tutorial"
+msgstr ""
 
-#. Tag: title
-#: tutorial.xml:10
-#, no-c-format
-msgid "Preface"
-msgstr "Prefácio"
-
 #. Tag: para
-#: tutorial.xml:12
+#: tutorial.xml:33
 #, no-c-format
 msgid ""
-"This chapter is an introductory tutorial for new users of Hibernate. We "
-"start with a simple command line application using an in-memory database and "
-"develop it in easy to understand steps."
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
+"Gloegl. All code is contained in the <filename>tutorials/web</filename> "
+"directory of the project source."
 msgstr ""
-"Este capítulo é um tutorial introdutório para novos usuários do Hibernate. "
-"Nós iniciaremos com uma simples linha de comando em uma aplicação usando uma "
-"base de dados em memória tornando isto um passo de fácil de compreender."
 
 #. Tag: para
-#: tutorial.xml:18
+#: tutorial.xml:42
 #, no-c-format
 msgid ""
-"This tutorial is intended for new users of Hibernate but requires Java and "
-"SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-party "
-"libraries we name are for JDK 1.4 and 5.0. You might need others for JDK 1.3."
+"This tutorial expects the user have knowledge of both Java and SQL. If you "
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
-"Este tutorial é voltado para novos usuários do Hibernate, mas requer um "
-"conhecimento de Java e SQL. Este tutorial é baseado no tutorial de Michael "
-"Gloegl, as bibliotecas Third Party foram nomeadas para JDK 1.4 e 5.0. Você "
-"pode precisar de outras bibliotecas para JDK 1.3."
 
 #. Tag: para
-#: tutorial.xml:24
+#: tutorial.xml:51
 #, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
-"O código fonte para o tutorial está incluído no diretório da distribuição "
-"<literal>doc/reference/tutorial/</literal>."
 
 #. Tag: title
-#: tutorial.xml:32
+#: tutorial.xml:59
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "Parte 1 – A primeira aplicação Hibernate"
 
 #. Tag: para
-#: tutorial.xml:34
+#: tutorial.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
+msgstr ""
+"Vamos supor que precisemos de uma aplicação com um banco de dados pequeno "
+"que possa armazenar e atender os eventos que queremos, e as informaççes "
+"sobre os hosts destes eventos."
+
+#. Tag: para
+#: tutorial.xml:67
 #, no-c-format
 msgid ""
-"First, we'll create a simple console-based Hibernate application. We use an "
-"Java database (HSQL DB), so we do not have to install any database server."
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
-"Primeiro, iremos criar uma simples aplicação Hibernate baseada em console. "
-"Usaremos uma base de dados Java (HSQL DB), então não teremos que instalar "
-"nenhum servidor de base de dados."
 
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:39
+#: tutorial.xml:78
 #, no-c-format
 msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the hosts of these events."
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
-"Vamos supor que precisemos de uma aplicação com um banco de dados pequeno "
-"que possa armazenar e atender os eventos que queremos, e as informaççes "
-"sobre os hosts destes eventos."
 
 #. Tag: para
-#: tutorial.xml:44
+#: tutorial.xml:88
 #, no-c-format
 msgid ""
-"The first thing we do, is set up our development directory and put all the "
-"Java libraries we need into it. Download the Hibernate distribution from the "
-"Hibernate website. Extract the package and place all required libraries "
-"found in <literal>/lib</literal> into into the <literal>/lib</literal> "
-"directory of your new development working directory. It should look like "
-"this:"
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
 msgstr ""
-"A primeira coisa que devemos fazer é configurar nosso diretório de "
-"desenvolvimento, e colocar todas as bibliotecas Java que precisamos dentro "
-"dele. Faça o download da distribuição do Hibernate no site do Hibernate. "
-"Descompacte o pacote e coloque todas as bibliotecas necessárias encontradas "
-"no diretório <literal>/lib</literal>, dentro do diretório <literal>/lib</"
-"literal> do seu novo projeto. Você deverá ter algo parecido com isso:"
 
 #. Tag: programlisting
-#: tutorial.xml:52
+#: tutorial.xml:94
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+"         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
+"apache.org/xsd/maven-4.0.0.xsd\">\n"
+"\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
+"\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>org.hibernate</groupId>\n"
+"            <artifactId>hibernate-core</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Because this is a web app, we also have a dependency on the "
+"servlet api. -->\n"
+"        <dependency>\n"
+"            <groupId>javax.servlet</groupId>\n"
+"            <artifactId>servlet-api</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:54
+#: tutorial.xml:97
 #, no-c-format
 msgid ""
-"This is the minimum set of required libraries (note that we also copied "
-"hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
-"writing</emphasis>. The Hibernate release you are using might require more "
-"or less libraries. See the <literal>README.txt</literal> file in the "
-"<literal>lib/</literal> directory of the Hibernate distribution for more "
-"information about required and optional third-party libraries. (Actually, "
-"Log4j is not required but preferred by many developers.)"
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
 msgstr ""
-"Esta é a configuração mínima requerida das bibliotecas (observe que também "
-"foi copiado o hibernate3.jar da pasta principal do Hibernate) para o "
-"Hibernate <emphasis>na hora do desenvolvimento</emphasis>. O Hibernate "
-"permite que você utilize mais ou menos bibliotecas. Veja o arquivo "
-"<literal>README.txt</literal> no diretório <literal>lib/</literal> da "
-"distribuição do Hibernate para maiores informaççes sobre bibliotecas "
-"requeridas e opcionais. (Atualmente, a biblioteca Log4j não é requerida, mas "
-"é preferida por muitos desenvolvedores.)"
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:114
 #, no-c-format
 msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
+"Save this file as <filename>pom.xml</filename> in the project root directory."
 msgstr ""
-"Agora, iremos criar uma classe que representa o evento que queremos "
-"armazenar na base de dados.."
 
 #. Tag: title
-#: tutorial.xml:68
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr "A primeira Classe"
 
 #. Tag: para
-#: tutorial.xml:70
-#, no-c-format
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
 msgstr ""
-"Nossa primeira classe de persistência é uma simples classe JavaBean com "
-"algumas propriedades:"
+"Agora, iremos criar uma classe que representa o evento que queremos "
+"armazenar na base de dados.."
 
 #. Tag: programlisting
-#: tutorial.xml:74
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -210,15 +238,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:76
-#, no-c-format
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "Você pode ver que esta classe usa o padrão JavaBean para o nomeamento "
 "convencional da propriedade getter e dos métodos setter, como também a "
@@ -229,20 +256,20 @@
 "com a reflexão."
 
 #. Tag: para
-#: tutorial.xml:84
-#, no-c-format
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "A propriedade <literal>id</literal> mantém um único valor de identificação "
 "para um evento particular. Todas as classes persistentes da entidade (bem "
@@ -259,13 +286,13 @@
 "você, e você pode combinar isso para adaptar seu projeto de aplicação"
 
 #. Tag: para
-#: tutorial.xml:96
-#, no-c-format
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "O construtor sem argumentos é um requerimento para todas as classes "
@@ -275,45 +302,21 @@
 "eficiente dos dados sem a instrumentação de bytecode"
 
 #. Tag: para
-#: tutorial.xml:103
+#: tutorial.xml:161
 #, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"Coloque este fonte Java no diretório chamado <literal>src</literal> na pasta "
-"de desenvolvimento, e em seu pacote correto. O diretório deverá ser parecido "
-"como este:"
 
-#. Tag: programlisting
-#: tutorial.xml:108
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:110
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr ""
-"No próximo passo, iremos falar sobre as classes de persistência do "
-"Hibernate.."
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr "O mapeamento do arquivo"
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:170
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -327,13 +330,13 @@
 "ele deverá acessar, e quais as colunas na tabela ele deverá usar."
 
 #. Tag: para
-#: tutorial.xml:126
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "A estrutura básica de um arquivo de mapeamento é parecida com:"
 
 #. Tag: programlisting
-#: tutorial.xml:130
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -341,23 +344,23 @@
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
 "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:132
-#, no-c-format
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "Note que o Hibernate DTD é muito sofisticado. Você pode usar isso para auto-"
 "conclusão no mapeamento XML dos elementos e atributos no seu editor ou IDE. "
@@ -369,23 +372,23 @@
 "<literal>src/</literal> da distribuição do Hibernate."
 
 #. Tag: para
-#: tutorial.xml:143
-#, no-c-format
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "Nós omitiremos a declaração do DTD nos exemplos futuros para encurtar o "
 "código. Isto, é claro, não é opcional."
 
 #. Tag: para
-#: tutorial.xml:148
-#, no-c-format
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "Entre os dois tags <literal>hibernate-mapping</literal>, inclua um elemento "
 "<literal>class</literal>. Todas as classes persistentes da entidade "
@@ -394,12 +397,12 @@
 "tabela na base de dados SQL"
 
 #. Tag: programlisting
-#: tutorial.xml:155
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -407,16 +410,15 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:157
-#, no-c-format
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "Mais adiante iremos dizer ao Hibernate como fazer para persistir e carregar "
 "objetos da classe <literal>Event</literal> da tabela <literal>EVENTS</"
@@ -427,12 +429,12 @@
 "geração de id’s para uma chave primária de uma surrogate key:"
 
 #. Tag: programlisting
-#: tutorial.xml:165
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -442,52 +444,57 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
+#: tutorial.xml:224
 #, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"The <literal>id</literal> element is the declaration of the identifier "
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"O elemento <literal>id</literal> é a declaração da propriedade "
-"identificadora, o <literal>name=\"id\"</literal> declara o nome da "
-"propriedade Java – o Hibernate irá usar os métodos getter e setter para "
-"acessar a propriedade. O atributo da coluna informa ao Hibernate qual coluna "
-"da tabela <literal>EVENTS</literal> nós iremos usar como chave primária. O "
-"elemento <literal>generator</literal> especifica a estratégia de geração do "
-"identificador, neste caso usaremos <literal>native</literal>, que escolhe a "
-"melhor estratégia dependendo da base de dados (dialeto) configurada. O "
-"Hibernate suporta a base de dados gerada, globalmente única, bem como a "
-"atribuição aos identificadores da aplicação (ou toda estratégia escrita para "
-"uma extensão)."
 
 #. Tag: para
-#: tutorial.xml:180
+#: tutorial.xml:234
 #, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "Finalmente incluiremos as declarações para as propriedades persistentes da "
 "classe no arquivo mapeado. Por default, nenhuma das propriedades da classe é "
 "considerada persistente:"
 
 #. Tag: programlisting
-#: tutorial.xml:186
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -499,14 +506,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:188
-#, no-c-format
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "Da mesma maneira que com o elemento <literal>id</literal>, o atributo "
 "<literal>name</literal> do elemento <literal>property</literal> informa ao "
@@ -515,15 +522,15 @@
 "também pelo <literal>getTitle()/setTitle()</literal>."
 
 #. Tag: para
-#: tutorial.xml:195
-#, no-c-format
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "Porque fazer o mapeamento da propriedade <literal>date</literal> incluído no "
 "atributo <literal>column</literal>, e no title não fazer? Sem o atributo "
@@ -534,24 +541,23 @@
 "um nome diferente."
 
 #. Tag: para
-#: tutorial.xml:204
-#, no-c-format
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "A próxima coisa interessante é que mapemanto do <literal>title</literal> "
 "também falta o atributo <literal>type</literal>. O tipo que declaramos e o "
@@ -572,77 +578,55 @@
 "literal>."
 
 #. Tag: para
-#: tutorial.xml:220
+#: tutorial.xml:297
 #, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"Este arquivo de mapeamento deve ser salvo como <literal>Event.hbm.xml</"
-"literal>, corretamente no diretório próximo ao arquivo fonte da Classe Java "
-"<literal>Event</literal>. O nomeamento dos arquivos de mapeamento podem ser "
-"arbitrários, porém o sufixo <literal>hbm.xml</literal> é uma convenção da "
-"comunidade dos desenvolvedores do Hibernate. Esta estrutura do diretório "
-"deve agora se parecer com isso:"
 
-#. Tag: programlisting
-#: tutorial.xml:228
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:230
-#, no-c-format
-msgid "We continue with the main configuration of Hibernate."
-msgstr "Nós iremos continuar com a configuração principal do Hibernate."
-
 #. Tag: title
-#: tutorial.xml:237
+#: tutorial.xml:312
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Configuração do Hibernate"
 
 #. Tag: para
-#: tutorial.xml:239
+#: tutorial.xml:314
 #, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"Agora nós temos uma classe persistente e este arquivo de mapeamento no "
-"lugar. Está na hora de configurar o Hibernate. Antes de fazermos isso, "
-"iremos precisar de uma base de dados. O HSQL DB, um SQL DBMS feito em java, "
-"pode ser baixado através do site do HSQL DB(http://hsqldb.org/). Atualmente, "
-"você só precisa baixar o <literal>hsqldb.jar</literal>. Coloque este arquivo "
-"no diretório da pasta de desenvolvimento <literal>lib/</literal>."
 
 #. Tag: para
-#: tutorial.xml:247
+#: tutorial.xml:321
 #, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "Crie um diretório chamado <literal>data</literal> no diretório root de "
 "desenvolvimento – Isto será onde o HSQL DB irá armazenar arquivos de dados. "
@@ -655,36 +639,35 @@
 "<literal>data/</literal>, e inicie o HSQL BD novamente."
 
 #. Tag: para
-#: tutorial.xml:257
+#: tutorial.xml:337
 #, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"O Hibernate é uma camada na sua aplicação na qual se conecta com a base de "
-"dados, para isso necessita de informação da conexão. As conexões são feitas "
-"através de um pool de conexão JDBC, na qual teremos que configurar. A "
-"distribuição do Hibernate contém diversas ferramentas de pooling da conexão "
-"JDBC de fonte aberta, mas iremos usar o pool de conexão interna para este "
-"tutorial. Note que você tem que copiar a biblioteca necessária em seu "
-"classpath e use configurações diferentes para pooling de conexão caso você "
-"deseje utilizar um software de pooling JDBC terceirizado para qualidade de "
-"produção."
 
 #. Tag: para
-#: tutorial.xml:267
+#: tutorial.xml:348
 #, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "Para as configurações do Hibernate, nós podemos usar um arquivo simples "
 "<literal>hibernate.properties</literal>, um arquivo mais ligeiramente "
@@ -693,7 +676,7 @@
 "configuração XML"
 
 #. Tag: programlisting
-#: tutorial.xml:273
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -732,9 +715,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -742,14 +725,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:275
+#: tutorial.xml:363
 #, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "Note que esta configuração XML usa um diferente DTD. Nós configuraremos as "
 "<literal>SessionFactory</literal> do Hibernate – uma factory global "
@@ -759,20 +747,34 @@
 "mais fácil)."
 
 #. Tag: para
-#: tutorial.xml:283
+#: tutorial.xml:373
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "As primeiras quatro <literal>propriedades</literal> do elemento contém a "
 "configuração necessária para a conexão ao JDBC. A propriedade "
 "<literal>propriedade</literal> dialect do elemento especifica a variante "
@@ -786,140 +788,80 @@
 "persistência mapeadas na configuração."
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"Copie este arquivo no diretório fonte, assim isto irá terminar na raiz "
-"(root) do classpath. O Hibernate automaticamente procura por um arquivo "
-"chamado <literal>hibernate.cfg.xml</literal> na raiz do classpath, no "
-"startup."
 
 #. Tag: title
-#: tutorial.xml:305
-#, no-c-format
-msgid "Building with Ant"
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "Construindo com o Ant"
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:405
 #, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"Nos iremos, agora, construir o tutorial com Ant. Você ira precisar o Ant "
-"instalado – se encontra disponível <ulink url=\"http://ant.apache.org/"
-"bindownload.cgi\">na página de download do Ant</ulink>. Como instalar o Ant, "
-"não será abordado aqui. Caso tenha alguma dúvida, por favor, vá ao <ulink "
-"url=\"http://ant.apache.org/manual/index.html\">Ant manual</ulink>. Depois "
-"que tiver instalado o Ant, podemos começar a criar o arquivo de construção "
-"<literal>build.xml</literal>. Este arquivo será chamado de <literal>build."
-"xml</literal> e posto diretamente no diretório de desenvolvimento."
 
-#. Tag: para
-#: tutorial.xml:316
-#, no-c-format
-msgid "A basic build file looks like this:"
-msgstr "Um arquivo básico de build, se parece com isto:"
-
 #. Tag: programlisting
-#: tutorial.xml:320
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:322
-#, no-c-format
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr ""
-"Isto irá avisar ao Ant para adicionar todos os arquivos no diretório lib "
-"terminando com <literal>.jar</literal>, para o classpath usado para "
-"compilação. Irá também copiar todos os arquivos não-java para o diretório "
-"alvo (arquivos de configuração, mapeamento). Se você rodar o ant agora, "
-"deverá ter esta saída."
-
-#. Tag: programlisting
-#: tutorial.xml:329
-#, no-c-format
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:334
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "Startup and helpers"
 
 #. Tag: para
-#: tutorial.xml:336
-#, no-c-format
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "É hora de carregar e arquivar alguns objetos <literal>Event</literal>, mas "
 "primeiro nós temos de completar o setup com algum código de infraestrutura. "
@@ -931,36 +873,37 @@
 "objeto global thread-safe, instanciado uma vez."
 
 #. Tag: para
-#: tutorial.xml:346
-#, no-c-format
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr ""
 "Nos iremos criar uma classe de ajuda <literal>HibernateUtil</literal>, que "
 "toma conta do startup e faz acesso a uma <literal>SessionFactory</literal> "
 "conveniente. Vamos dar uma olhada na implementação:"
 
 #. Tag: programlisting
-#: tutorial.xml:352
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -976,15 +919,24 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:354
+#: tutorial.xml:444
 #, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "Esta classe não só produz a global <literal>SessionFactory</literal> no seu "
 "static initializer (chamado uma vez pela JVM quando a classe é carregada), "
 "mas também esconde o fato de que isto usa um static singleton. Ela pode "
@@ -992,15 +944,15 @@
 "application server."
 
 #. Tag: para
-#: tutorial.xml:361
-#, no-c-format
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "Se você der à <literal>SessionFactory</literal> um nome, no seu arquivo de "
 "configuração. O Hibernate irá, de fato, tentar uni-lo ao JNDI depois que "
@@ -1010,47 +962,18 @@
 "são discutidas no documento de referência do Hibernate."
 
 #. Tag: para
-#: tutorial.xml:370
-#, no-c-format
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"Coloque o <literal>HibernateUtil.java</literal> no diretório de arquivos de "
-"desenvolvimento(source), em um pacote após o <literal>events</literal>:"
-
-#. Tag: programlisting
-#: tutorial.xml:375
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:377
-#, no-c-format
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "Novamente, isto deve compilar sem problemas. Finalmente, nós precisamos "
 "configurar um sistema de logging – o Hibernate usa commons logging e deixa "
 "você escolher entre o Log4j e o logging do JDK 1.4 . A maioria dos "
@@ -1062,43 +985,45 @@
 "startup e shwwn do Hibernate é mostrada no stdout."
 
 #. Tag: para
-#: tutorial.xml:387
-#, no-c-format
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr ""
 "O tutorial de infra-estrutura está completo - e nós já estamos preparados "
 "para algum trabalho de verdade com o Hibernate."
 
 #. Tag: title
-#: tutorial.xml:395
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "Carregando e salvando objetos"
 
 #. Tag: para
-#: tutorial.xml:397
-#, no-c-format
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "Finalmente, nós podemos usar o Hibernate para carregar e armazenar objetos. "
 "Nós escrevemos uma classe <literal>EventManager</literal> com um método main"
 "():"
 
 #. Tag: programlisting
-#: tutorial.xml:402
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1113,16 +1038,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1132,13 +1054,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:404
-#, no-c-format
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "Nós criamos um novo objeto <literal>Event</literal>, e passamos para o "
 "Hibernate. O Hibernate sabe como tomar conta do SQL e executa "
@@ -1147,15 +1069,17 @@
 "handling antes de executarmos."
 
 #. Tag: para
-#: tutorial.xml:411
-#, no-c-format
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "Um <literal>Session</literal> é uma unidade simples de trabalho. Por agora "
 "nós iremos pegar coisas simples e assumir uma granularidade de um-pra-um "
@@ -1166,19 +1090,17 @@
 "<literal>Session</literal> do Hibernate."
 
 #. Tag: para
-#: tutorial.xml:419
-#, no-c-format
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "O que a <literal>sessionFactory.getCurrentSession()</literal> faz? Primeiro, "
 "você pode chamar quantas vezes e de onde quiser, uma vez você recebe sua "
@@ -1191,21 +1113,28 @@
 "toda a verdade. Uma"
 
 #. Tag: para
-#: tutorial.xml:430
+#: tutorial.xml:529
 #, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "<literal>Session</literal> começa quando é primeiramente necessária, quando "
 "é feita a primeira chamada à <literal>getCurrentSession()</literal>. É então "
 "limitado pelo Hibernate para thread corrente. Quando a transação termina, "
@@ -1217,19 +1146,20 @@
 "é o modo mais popular de se usar o Hibernate."
 
 #. Tag: para
-#: tutorial.xml:441
-#, no-c-format
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "Related to the unit of work scope, should the Hibernate <literal>Session</"
 "literal> be used to execute one or several database operations? The above "
@@ -1243,69 +1173,44 @@
 "anti-pattern. A real (web) application is shown later in this tutorial."
 
 #. Tag: para
-#: tutorial.xml:452
-#, no-c-format
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "Dê uma olhada no <xref linkend=\"transactions\"/> para mais informações a "
 "respeito de manipulação de transação e demarcação. Nós também pulamos "
 "qualquer manipulação de erro e rollback no exemplo anterior."
 
 #. Tag: para
-#: tutorial.xml:458
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"Para executar esta primeira rotina, nos teremos que adicionar um ponto de "
-"chamada para o arquivo de build do Ant:"
 
-#. Tag: programlisting
-#: tutorial.xml:462
-#, no-c-format
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:464
+#: tutorial.xml:581
 #, no-c-format
-msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"O valor do argumento <literal>action</literal>, é setado na linha de comando "
-"quando chamando esse ponto:"
 
-#. Tag: programlisting
-#: tutorial.xml:469
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:471
-#, no-c-format
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 "Você deverá ver, após a compilação, o startup do Hibernate e, dependendo da "
 "sua configuração, muito log de saída. No final você verá a seguinte linha:"
 
 #. Tag: programlisting
-#: tutorial.xml:476
+#: tutorial.xml:591
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1313,80 +1218,67 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:478
+#: tutorial.xml:593
 #, no-c-format
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"Este é o <literal>INSERT</literal> executado pelo Hibernate, os pontos de "
-"interrogação representam parêmetros de união do JDBC. Para ver os valores "
-"substituídos, ou para diminuir a verbalidade do log, check seu "
-"l<literal>log4j.properties</literal>."
 
 #. Tag: para
-#: tutorial.xml:484
-#, no-c-format
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "Agora nós gostaríamos de listar os eventos arquivados, então nós adicionamos "
 "uma opção para o método main:"
 
 #. Tag: programlisting
-#: tutorial.xml:488
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
-#, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr "Nos também adicionamos um novo <literal>método listEvents()</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:494
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:496
-#, no-c-format
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "O que nós fazemos aqui, é usar uma query HQL (Hibernate Query Language), "
 "para carregar todos os objetos <literal>Event</literal> exitentes no banco "
@@ -1395,87 +1287,28 @@
 "criar queries mais complexas com HQL, claro."
 
 #. Tag: para
-#: tutorial.xml:503
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr "Agora, para executar e testar tudo isso, siga os passos a seguir:"
-
-#. Tag: para
-#: tutorial.xml:509
-#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"Execute <literal>ant run -Daction=store</literal> para armazenar algo no "
-"banco de dados e, claro, gerar o esquema do banco de dados antes pelo "
-"hbm2ddl."
 
-#. Tag: para
-#: tutorial.xml:515
-#, no-c-format
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-msgstr ""
-"Agora desabilite hbm2ddl comentando a propriedade no seu arquivo "
-"<literal>hibernate.cfg.xml</literal>. Normalmente só se deixa habilitado em "
-"teste unitários contínuos, mas outra carga de hbm2ddl pode "
-"<emphasis>remover</emphasis> tudo que você já tenha arquivado. Sa "
-"configuração <literal>create</literal>, atualmente são traduzidas para "
-"\"apague todas as tabelas do esquema, então recrie todas quando a "
-"SessionFactory estiver pronta\"."
-
-#. Tag: para
-#: tutorial.xml:525
-#, no-c-format
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"Se você agora chamar o Ant com <literal>-Daction=list</literal>, você deverá "
-"ver os eventos que você acabou de criar. Você pode também chamar a ação "
-"<literal>store</literal> mais algumas vezes."
-
-#. Tag: para
-#: tutorial.xml:531
-#, no-c-format
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"Nota: A maioria dos novos usuários do Hibernate falha nesse ponto e nós "
-"regularmente, vemos questões sobre mensagens de erro de <emphasis>tabela não "
-"encontrada </emphasis> . Entretanto, se você seguir os passos marcados "
-"acima, você não terá esse problema, com o hbm2ddl criando o esquema do banco "
-"de dados na primeira execução, e restarts subsequentes da aplicação irão "
-"usar este esquema. Se você mudar o mapeamento e/ou o esquema do banco de "
-"dados, terá de re-habilitar o hbm2ddl mais uma vez."
-
 #. Tag: title
-#: tutorial.xml:544
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "Part 2 - Mapeando associações"
 
 #. Tag: para
-#: tutorial.xml:546
-#, no-c-format
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr ""
 "Nós mapeamos uma classe de entidade de persistência para uma tabela. Agora "
 "vamos continuar e adicionar algumas associações de classe. Primeiro nos "
@@ -1483,22 +1316,22 @@
 "elas participam."
 
 #. Tag: title
-#: tutorial.xml:552
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "Mapeando a classe Person"
 
 #. Tag: para
-#: tutorial.xml:554
-#, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr "O primeiro código da classe <literal>Person</literal> é simples:"
 
 #. Tag: programlisting
-#: tutorial.xml:558
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1515,22 +1348,28 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:560
+#: tutorial.xml:645
 #, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"Crie um novo arquivo de mapeamento, chamado <literal>Person.hbm.xml</"
-"literal> (não esqueça a referencia ao DTD no topo)"
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid ""
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:565
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1543,13 +1382,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:567
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr "Finalmente, adicione o novo mapeamento a configuração do Hibernate:"
 
 #. Tag: programlisting
-#: tutorial.xml:571
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1557,13 +1396,12 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:573
-#, no-c-format
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "Nos iremos agora criar uma associação entre estas duas entidades. "
 "Obviamente, pessoas (Person) podem participar de eventos, e eventos possuem "
@@ -1571,21 +1409,22 @@
 "direcionalidade, multiplicidade e comportamento de coleção."
 
 #. Tag: title
-#: tutorial.xml:583
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "Uma associação Set-based unidirectional"
 
 #. Tag: para
-#: tutorial.xml:585
-#, no-c-format
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr ""
 "Nos iremos adicionar uma coleção de eventos na classe <literal>Person</"
 "literal>. Desse jeito poderemos navegar pelos eventos de uma pessoa em "
@@ -1594,17 +1433,8 @@
 "<literal>Set</literal>, porquê a coleção não conterá elementos duplicados e "
 "a ordem não é relevante para nós."
 
-#. Tag: para
-#: tutorial.xml:592
-#, no-c-format
-msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr "Vamos escrever o código para isto nas classes Java e então mapear:"
-
 #. Tag: programlisting
-#: tutorial.xml:597
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1622,19 +1452,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:599
-#, no-c-format
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "Antes de mapearmos esta associação, pense no outro lado. Claramente, "
 "poderíamos apenas fazer isto de forma unidirecional. Ou poderíamos criar "
@@ -1649,10 +1478,10 @@
 "muitos do Hibernate:"
 
 #. Tag: programlisting
-#: tutorial.xml:610
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1662,28 +1491,27 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:612
-#, no-c-format
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "O Hibernate suporta todo tipo de mapeamento de coleção , sendo um "
 "<literal>&lt;set&gt;</literal> mais comum. Para uma associação muitos-para-"
@@ -1699,13 +1527,13 @@
 "referência)."
 
 #. Tag: para
-#: tutorial.xml:624
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr "O esquema de mapeamento para o banco de dados está a seguir:"
 
 #. Tag: programlisting
-#: tutorial.xml:628
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1724,60 +1552,55 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:633
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr "Trabalhando a associação"
 
 #. Tag: para
-#: tutorial.xml:635
-#, no-c-format
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr ""
 "Vamos trazer juntos algumas pessoas e eventos em um novo método na classe "
 "<literal>EventManager</literal>::"
 
 #. Tag: programlisting
-#: tutorial.xml:639
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:641
-#, no-c-format
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "Após carregar um <literal>Person</literal> e um <literal>Event</literal>, "
 "simplesmente modifique a coleção usando os métodos normais de uma coleção. "
@@ -1798,14 +1621,14 @@
 "<literal>CurrentSessionContext</literal>."
 
 #. Tag: para
-#: tutorial.xml:656
-#, no-c-format
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "Você pode também querer carregar pessoas e eventos em diferentes unidades de "
 "trabalho. Ou você modifica um objeto fora de uma <literal>Session</literal>, "
@@ -1815,52 +1638,49 @@
 "detached."
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
-#, no-c-format
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "A chamada <literal>update</literal> cria um objeto persistent novamente, "
 "você poderia dizer que ele liga o objeto a uma nova unidade de trabalho, "
@@ -1870,16 +1690,15 @@
 "objeto."
 
 #. Tag: para
-#: tutorial.xml:672
-#, no-c-format
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "Bom, isso não foi muito usado na nossa situação, porém, é um importante "
 "conceito que você pode aplicar em seus aplicativos. Agora, complete este "
@@ -1890,34 +1709,35 @@
 "métodos anteriores para retornar aquele identificador):"
 
 #. Tag: programlisting
-#: tutorial.xml:680
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:682
-#, no-c-format
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "Este foi um exemplo de uma associação entre duas classes igualmente "
 "importantes, duas entidades. Como mencionado anteriormente, há outras "
@@ -1935,10 +1755,10 @@
 "literal>."
 
 #. Tag: para
-#: tutorial.xml:695
-#, no-c-format
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -1947,70 +1767,66 @@
 "Java parece ser quase a mesma coisa."
 
 #. Tag: title
-#: tutorial.xml:703
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr "Coleção de valores"
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:814
 #, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"Nós adicionamos uma coleção de objetos de tipo de valores à entidade "
-"<literal>Person</literal>. Nós querermos armazenar endereços de e-mail, para "
-"isso utilizamos o tipo <literal>String</literal>, e a coleção novamente será "
-"um <literal>Set</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:710
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:712
-#, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "O mapeamento deste <literal>Set</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:716
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:718
-#, no-c-format
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "A diferença comparada com o mapeamento anterior se encontra na parte "
 "<literal>element</literal>, que indica ao Hibernate que a coleção não contém "
@@ -2025,13 +1841,13 @@
 "armazenados."
 
 #. Tag: para
-#: tutorial.xml:728
-#, no-c-format
-msgid "Have a look at the updated schema:"
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "Dê uma olhada no esquema atualizado:"
 
 #. Tag: programlisting
-#: tutorial.xml:732
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2057,11 +1873,11 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:734
-#, no-c-format
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -2071,43 +1887,41 @@
 "semântica que precisamos para um set em Java."
 
 #. Tag: para
-#: tutorial.xml:740
-#, no-c-format
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "Você pode agora tentar adicionar elementos a essa coleção, do mesmo modo que "
 "fizemos anteriormente ligando pessoas e eventos. È o mesmo código em Java:"
 
 #. Tag: programlisting
-#: tutorial.xml:745
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:747
-#, no-c-format
+#: tutorial.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
 "collection. Hence, the call to its getter method will trigger an additional "
@@ -2115,21 +1929,19 @@
 "and try to optimize this with an eager fetch."
 
 #. Tag: title
-#: tutorial.xml:757
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "Associações bidirecionais"
 
 #. Tag: para
-#: tutorial.xml:759
-#, no-c-format
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "Agora iremos mapear uma associação bidirecional – fazendo a associação entre "
 "pessoas e eventos, de ambos os lados, em Java. Logicamente, o esquema do "
@@ -2139,60 +1951,68 @@
 "dados podem ser acessados em qualquer caminho possível."
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:882
 #, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr ""
 "Primeiramente, adicione uma coleção de participantes à classe "
 "<literal>Event</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:771
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:773
-#, no-c-format
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr ""
 "Agora mapeie este lado da associação em <literal>Event.hbm.xml</literal>."
 
 #. Tag: programlisting
-#: tutorial.xml:777
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:779
-#, no-c-format
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "Como você pode ver, esses é uma mapeamento normal usando <literal>set</"
 "literal> em ambos documenentos de mapeamento. Observe que o nome das colunas "
@@ -2202,13 +2022,13 @@
 "da coleção da classe <literal>Event</literal>."
 
 #. Tag: para
-#: tutorial.xml:787
-#, no-c-format
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "Isso significa que o Hibernate deve pegar o outro lado – a classe "
 "<literal>Person</literal> – quando necessitar encontrar informação sobre a "
@@ -2217,24 +2037,24 @@
 "entidades é criada."
 
 #. Tag: title
-#: tutorial.xml:796
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "Trabalhando com links bidirecionais"
 
 #. Tag: para
-#: tutorial.xml:798
-#, no-c-format
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "Primeiro tenha em mente que o Hibernate não afeta a semântica normal do "
 "Java. Como nós criamos um link entre uma <literal>Person</literal> e um "
@@ -2248,47 +2068,46 @@
 "lo."
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:932
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"Many developers program defensively and create link management methods to "
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "Muitos desenvolvedores programam de maneira defensiva e criam métodos "
 "gerenciador de associações que ajusta corretamente ambos os lados:"
 
 #. Tag: programlisting
-#: tutorial.xml:813
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:815
-#, no-c-format
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "Observe que os métodos set e get da a coleção estão protegidos – isso "
 "permite que classes e subclasses do mesmo pacote continuem acessando os "
@@ -2297,23 +2116,21 @@
 "coisa para a coleção do outro lado."
 
 #. Tag: para
-#: tutorial.xml:822
-#, no-c-format
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "E sobre o mapeamento do atributo <literal>inverse</literal>? Pra você, e "
 "para o Java, um link bidirecional é simplesmente o fato de ajustar "
@@ -2332,26 +2149,19 @@
 "associação de muitos-para-muitos você pode pegar qualquer lado, não há "
 "diferença."
 
-#. Tag: para
-#: tutorial.xml:837
-#, no-c-format
-msgid "Let's turn this into a small web application."
-msgstr ""
-"Agora, vamos portar este exemplo para um pequeno aplicativo para internet."
-
 #. Tag: title
-#: tutorial.xml:844
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "EventManager um aplicativo para internet"
 
 #. Tag: para
-#: tutorial.xml:846
-#, no-c-format
+#: tutorial.xml:964
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2363,86 +2173,84 @@
 "entrada de novos eventos."
 
 #. Tag: title
-#: tutorial.xml:854
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "Criando um servlet básico"
 
 #. Tag: para
-#: tutorial.xml:856
-#, no-c-format
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
 msgstr ""
-"Crie uma nova classe no seu diretório fonte, no pacote <literal>events</"
-"literal>:"
+"O servlet manuseia somente requisições <literal>GET</literal> do HTTP, "
+"portanto o método que iremos implementar é <literal>doGet()</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:861
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:863
-#, no-c-format
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"O servlet manuseia somente requisições <literal>GET</literal> do HTTP, "
-"portanto o método que iremos implementar é <literal>doGet()</literal>:"
-
-#. Tag: programlisting
-#: tutorial.xml:868
-#, no-c-format
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: tutorial.xml:982
+#, no-c-format
+msgid ""
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
 #, fuzzy, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
 msgstr ""
 "O pattern que estamos aplicando neste código é chamado <emphasis>session-per-"
 "request</emphasis>. Quando uma requisição chega ao servlet, uma nova "
@@ -2453,7 +2261,7 @@
 "leitura ou escrita. (nós não devemos usar o modo auto-commit em aplicações)."
 
 #. Tag: para
-#: tutorial.xml:879
+#: tutorial.xml:996
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2467,27 +2275,27 @@
 "literal>, so that it is automatically bound to the current Java thread."
 
 #. Tag: para
-#: tutorial.xml:886
-#, no-c-format
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "Agora, as possibilidades de ações de uma requisição serão processadas e uma "
 "resposta HTML será renderizada. Nós já iremos chegar nesta parte."
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:1008
 #, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occured during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "Finalmente, a unidade de trabalho termina quando o processamento e a "
 "restituição são completados. Se ocorrer algum erro durante o processamento "
@@ -2499,61 +2307,66 @@
 "in View</emphasis>."
 
 #. Tag: title
-#: tutorial.xml:905
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr "Processando e renderizando"
 
 #. Tag: para
-#: tutorial.xml:907
-#, no-c-format
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr ""
 "Vamos implementar o processamento da requisição e a restituição da página "
 "HTML."
 
 #. Tag: programlisting
-#: tutorial.xml:911
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:913
+#: tutorial.xml:1030
 #, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr ""
 "O estilo de código acima, misturando linguagem HTML e Java não será "
@@ -2565,22 +2378,24 @@
 "e apenas imprime uma página HTML:"
 
 #. Tag: programlisting
-#: tutorial.xml:922
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:924
+#: tutorial.xml:1041
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2590,37 +2405,37 @@
 "Hibernate associada a thread atual para executar um query:"
 
 #. Tag: programlisting
-#: tutorial.xml:930
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:932
+#: tutorial.xml:1049
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2632,31 +2447,32 @@
 "literal> da thread atual:"
 
 #. Tag: programlisting
-#: tutorial.xml:938
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
-#, no-c-format
+#: tutorial.xml:1057
+#, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "Pronto, o servlet está completo. Uma requisição para o servlet será "
 "processada em uma <literal>Session</literal> e uma <literal>Transaction</"
@@ -2669,54 +2485,24 @@
 "para maiores exemplos."
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "Instalando e testando"
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1073
 #, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"Para fazer o deploy desta aplicação você tem que criar um arquivo para web, "
-"um WAR. Adicione o alvo Ant abaixo em seu <literal>build.xml</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:961
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:963
-#, no-c-format
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"Esta target cria um arquivo chamado <literal>hibernate-tutorial.war</"
-"literal> no diretório do seu projeto. Ele empacota todas as bibliotecas e o "
-"arquivo de descrição <literal>web.xml</literal>, o qual é esperado no "
-"diretório base do seu projeto:"
-
-#. Tag: programlisting
-#: tutorial.xml:969
-#, no-c-format
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -2726,7 +2512,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -2737,31 +2524,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:971
-#, no-c-format
+#: tutorial.xml:1081
+#, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"Antes de você compilar e fazer o deploy desta aplicação web, note que uma "
-"biblioteca adicional é requerida: <literal>jsdk.jar</literal>. Esse é o Java "
-"servlet development kit, se você não possui esta biblioteca, faça seu "
-"download na página da Sun e copie-a para seu diretório de bibliotecas. "
-"Entretanto, será usado somente para a compilação e excluído do pacote WAR."
-
-#. Tag: para
-#: tutorial.xml:979
-#, no-c-format
-msgid ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
-msgstr ""
 "Para compilar e instalar execute <literal>ant war</literal> no seu diretório "
 "do projeto e copie o arquivo <literal>hibernate-tutorial.war</literal> para "
 "o diretório <literal>webapp</literal> do Tomcat. Se você não possui o Tomcat "
@@ -2769,9 +2538,18 @@
 "precisa modificar nenhuma configuração do Tomcat para rodar este aplicativo."
 
 #. Tag: para
-#: tutorial.xml:987
+#: tutorial.xml:1088
 #, no-c-format
 msgid ""
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:1096
+#, no-c-format
+msgid ""
 "Once deployed and Tomcat is running, access the application at "
 "<literal>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. "
 "Make sure you watch the Tomcat log to see Hibernate initialize when the "
@@ -2787,43 +2565,414 @@
 "detalhada se ocorrer alguma exceção."
 
 #. Tag: title
-#: tutorial.xml:1000
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr "Sumário"
 
 #. Tag: para
-#: tutorial.xml:1002
-#, no-c-format
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "Este manual cobriu os princípios básicos para criação de uma aplicação "
 "simples do Hibernate e uma pequena aplicação web."
 
-#. Tag: para
-#: tutorial.xml:1007
-#, no-c-format
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"Se você já se sente seguro com o Hibernate, continue navegando na "
-"documentação de referência por tópicos que você acha interessante – os "
-"tópicos mais questionados são: processo de transação (<xref linkend="
-"\"transactions\"/>), uso da API (<xref linkend=\"objectstate\"/>) e "
-"características de consulta (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Introdução ao Hibernate"
 
-#. Tag: para
-#: tutorial.xml:1015
-#, no-c-format
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr ""
-"Não esqueça de visitar o site do Hibernate para obter mais tutoriais "
-"especializados."
+#~ msgid "Preface"
+#~ msgstr "Prefácio"
+
+#~ msgid ""
+#~ "This chapter is an introductory tutorial for new users of Hibernate. We "
+#~ "start with a simple command line application using an in-memory database "
+#~ "and develop it in easy to understand steps."
+#~ msgstr ""
+#~ "Este capítulo é um tutorial introdutório para novos usuários do "
+#~ "Hibernate. Nós iniciaremos com uma simples linha de comando em uma "
+#~ "aplicação usando uma base de dados em memória tornando isto um passo de "
+#~ "fácil de compreender."
+
+#~ msgid ""
+#~ "This tutorial is intended for new users of Hibernate but requires Java "
+#~ "and SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-"
+#~ "party libraries we name are for JDK 1.4 and 5.0. You might need others "
+#~ "for JDK 1.3."
+#~ msgstr ""
+#~ "Este tutorial é voltado para novos usuários do Hibernate, mas requer um "
+#~ "conhecimento de Java e SQL. Este tutorial é baseado no tutorial de "
+#~ "Michael Gloegl, as bibliotecas Third Party foram nomeadas para JDK 1.4 e "
+#~ "5.0. Você pode precisar de outras bibliotecas para JDK 1.3."
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "O código fonte para o tutorial está incluído no diretório da distribuição "
+#~ "<literal>doc/reference/tutorial/</literal>."
+
+#~ msgid ""
+#~ "First, we'll create a simple console-based Hibernate application. We use "
+#~ "an Java database (HSQL DB), so we do not have to install any database "
+#~ "server."
+#~ msgstr ""
+#~ "Primeiro, iremos criar uma simples aplicação Hibernate baseada em "
+#~ "console. Usaremos uma base de dados Java (HSQL DB), então não teremos que "
+#~ "instalar nenhum servidor de base de dados."
+
+#~ msgid ""
+#~ "The first thing we do, is set up our development directory and put all "
+#~ "the Java libraries we need into it. Download the Hibernate distribution "
+#~ "from the Hibernate website. Extract the package and place all required "
+#~ "libraries found in <literal>/lib</literal> into into the <literal>/lib</"
+#~ "literal> directory of your new development working directory. It should "
+#~ "look like this:"
+#~ msgstr ""
+#~ "A primeira coisa que devemos fazer é configurar nosso diretório de "
+#~ "desenvolvimento, e colocar todas as bibliotecas Java que precisamos "
+#~ "dentro dele. Faça o download da distribuição do Hibernate no site do "
+#~ "Hibernate. Descompacte o pacote e coloque todas as bibliotecas "
+#~ "necessárias encontradas no diretório <literal>/lib</literal>, dentro do "
+#~ "diretório <literal>/lib</literal> do seu novo projeto. Você deverá ter "
+#~ "algo parecido com isso:"
+
+#~ msgid ""
+#~ "This is the minimum set of required libraries (note that we also copied "
+#~ "hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
+#~ "writing</emphasis>. The Hibernate release you are using might require "
+#~ "more or less libraries. See the <literal>README.txt</literal> file in the "
+#~ "<literal>lib/</literal> directory of the Hibernate distribution for more "
+#~ "information about required and optional third-party libraries. (Actually, "
+#~ "Log4j is not required but preferred by many developers.)"
+#~ msgstr ""
+#~ "Esta é a configuração mínima requerida das bibliotecas (observe que "
+#~ "também foi copiado o hibernate3.jar da pasta principal do Hibernate) para "
+#~ "o Hibernate <emphasis>na hora do desenvolvimento</emphasis>. O Hibernate "
+#~ "permite que você utilize mais ou menos bibliotecas. Veja o arquivo "
+#~ "<literal>README.txt</literal> no diretório <literal>lib/</literal> da "
+#~ "distribuição do Hibernate para maiores informaççes sobre bibliotecas "
+#~ "requeridas e opcionais. (Atualmente, a biblioteca Log4j não é requerida, "
+#~ "mas é preferida por muitos desenvolvedores.)"
+
+#~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "Nossa primeira classe de persistência é uma simples classe JavaBean com "
+#~ "algumas propriedades:"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "Coloque este fonte Java no diretório chamado <literal>src</literal> na "
+#~ "pasta de desenvolvimento, e em seu pacote correto. O diretório deverá ser "
+#~ "parecido como este:"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr ""
+#~ "No próximo passo, iremos falar sobre as classes de persistência do "
+#~ "Hibernate.."
+
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifer "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "O elemento <literal>id</literal> é a declaração da propriedade "
+#~ "identificadora, o <literal>name=\"id\"</literal> declara o nome da "
+#~ "propriedade Java – o Hibernate irá usar os métodos getter e setter para "
+#~ "acessar a propriedade. O atributo da coluna informa ao Hibernate qual "
+#~ "coluna da tabela <literal>EVENTS</literal> nós iremos usar como chave "
+#~ "primária. O elemento <literal>generator</literal> especifica a estratégia "
+#~ "de geração do identificador, neste caso usaremos <literal>native</"
+#~ "literal>, que escolhe a melhor estratégia dependendo da base de dados "
+#~ "(dialeto) configurada. O Hibernate suporta a base de dados gerada, "
+#~ "globalmente única, bem como a atribuição aos identificadores da aplicação "
+#~ "(ou toda estratégia escrita para uma extensão)."
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "Este arquivo de mapeamento deve ser salvo como <literal>Event.hbm.xml</"
+#~ "literal>, corretamente no diretório próximo ao arquivo fonte da Classe "
+#~ "Java <literal>Event</literal>. O nomeamento dos arquivos de mapeamento "
+#~ "podem ser arbitrários, porém o sufixo <literal>hbm.xml</literal> é uma "
+#~ "convenção da comunidade dos desenvolvedores do Hibernate. Esta estrutura "
+#~ "do diretório deve agora se parecer com isso:"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "Nós iremos continuar com a configuração principal do Hibernate."
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "Agora nós temos uma classe persistente e este arquivo de mapeamento no "
+#~ "lugar. Está na hora de configurar o Hibernate. Antes de fazermos isso, "
+#~ "iremos precisar de uma base de dados. O HSQL DB, um SQL DBMS feito em "
+#~ "java, pode ser baixado através do site do HSQL DB(http://hsqldb.org/). "
+#~ "Atualmente, você só precisa baixar o <literal>hsqldb.jar</literal>. "
+#~ "Coloque este arquivo no diretório da pasta de desenvolvimento "
+#~ "<literal>lib/</literal>."
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "O Hibernate é uma camada na sua aplicação na qual se conecta com a base "
+#~ "de dados, para isso necessita de informação da conexão. As conexões são "
+#~ "feitas através de um pool de conexão JDBC, na qual teremos que "
+#~ "configurar. A distribuição do Hibernate contém diversas ferramentas de "
+#~ "pooling da conexão JDBC de fonte aberta, mas iremos usar o pool de "
+#~ "conexão interna para este tutorial. Note que você tem que copiar a "
+#~ "biblioteca necessária em seu classpath e use configurações diferentes "
+#~ "para pooling de conexão caso você deseje utilizar um software de pooling "
+#~ "JDBC terceirizado para qualidade de produção."
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "Copie este arquivo no diretório fonte, assim isto irá terminar na raiz "
+#~ "(root) do classpath. O Hibernate automaticamente procura por um arquivo "
+#~ "chamado <literal>hibernate.cfg.xml</literal> na raiz do classpath, no "
+#~ "startup."
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "Nos iremos, agora, construir o tutorial com Ant. Você ira precisar o Ant "
+#~ "instalado – se encontra disponível <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">na página de download do Ant</ulink>. Como instalar o "
+#~ "Ant, não será abordado aqui. Caso tenha alguma dúvida, por favor, vá ao "
+#~ "<ulink url=\"http://ant.apache.org/manual/index.html\">Ant manual</"
+#~ "ulink>. Depois que tiver instalado o Ant, podemos começar a criar o "
+#~ "arquivo de construção <literal>build.xml</literal>. Este arquivo será "
+#~ "chamado de <literal>build.xml</literal> e posto diretamente no diretório "
+#~ "de desenvolvimento."
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "Um arquivo básico de build, se parece com isto:"
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr ""
+#~ "Isto irá avisar ao Ant para adicionar todos os arquivos no diretório lib "
+#~ "terminando com <literal>.jar</literal>, para o classpath usado para "
+#~ "compilação. Irá também copiar todos os arquivos não-java para o diretório "
+#~ "alvo (arquivos de configuração, mapeamento). Se você rodar o ant agora, "
+#~ "deverá ter esta saída."
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "Coloque o <literal>HibernateUtil.java</literal> no diretório de arquivos "
+#~ "de desenvolvimento(source), em um pacote após o <literal>events</literal>:"
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "Para executar esta primeira rotina, nos teremos que adicionar um ponto de "
+#~ "chamada para o arquivo de build do Ant:"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "O valor do argumento <literal>action</literal>, é setado na linha de "
+#~ "comando quando chamando esse ponto:"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "Este é o <literal>INSERT</literal> executado pelo Hibernate, os pontos de "
+#~ "interrogação representam parêmetros de união do JDBC. Para ver os valores "
+#~ "substituídos, ou para diminuir a verbalidade do log, check seu "
+#~ "l<literal>log4j.properties</literal>."
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr "Agora, para executar e testar tudo isso, siga os passos a seguir:"
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr ""
+#~ "Execute <literal>ant run -Daction=store</literal> para armazenar algo no "
+#~ "banco de dados e, claro, gerar o esquema do banco de dados antes pelo "
+#~ "hbm2ddl."
+
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "Agora desabilite hbm2ddl comentando a propriedade no seu arquivo "
+#~ "<literal>hibernate.cfg.xml</literal>. Normalmente só se deixa habilitado "
+#~ "em teste unitários contínuos, mas outra carga de hbm2ddl pode "
+#~ "<emphasis>remover</emphasis> tudo que você já tenha arquivado. Sa "
+#~ "configuração <literal>create</literal>, atualmente são traduzidas para "
+#~ "\"apague todas as tabelas do esquema, então recrie todas quando a "
+#~ "SessionFactory estiver pronta\"."
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "Se você agora chamar o Ant com <literal>-Daction=list</literal>, você "
+#~ "deverá ver os eventos que você acabou de criar. Você pode também chamar a "
+#~ "ação <literal>store</literal> mais algumas vezes."
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "Nota: A maioria dos novos usuários do Hibernate falha nesse ponto e nós "
+#~ "regularmente, vemos questões sobre mensagens de erro de <emphasis>tabela "
+#~ "não encontrada </emphasis> . Entretanto, se você seguir os passos "
+#~ "marcados acima, você não terá esse problema, com o hbm2ddl criando o "
+#~ "esquema do banco de dados na primeira execução, e restarts subsequentes "
+#~ "da aplicação irão usar este esquema. Se você mudar o mapeamento e/ou o "
+#~ "esquema do banco de dados, terá de re-habilitar o hbm2ddl mais uma vez."
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "Crie um novo arquivo de mapeamento, chamado <literal>Person.hbm.xml</"
+#~ "literal> (não esqueça a referencia ao DTD no topo)"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr "Vamos escrever o código para isto nas classes Java e então mapear:"
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "Nós adicionamos uma coleção de objetos de tipo de valores à entidade "
+#~ "<literal>Person</literal>. Nós querermos armazenar endereços de e-mail, "
+#~ "para isso utilizamos o tipo <literal>String</literal>, e a coleção "
+#~ "novamente será um <literal>Set</literal>:"
+
+#~ msgid "Let's turn this into a small web application."
+#~ msgstr ""
+#~ "Agora, vamos portar este exemplo para um pequeno aplicativo para internet."
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr ""
+#~ "Crie uma nova classe no seu diretório fonte, no pacote <literal>events</"
+#~ "literal>:"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "Para fazer o deploy desta aplicação você tem que criar um arquivo para "
+#~ "web, um WAR. Adicione o alvo Ant abaixo em seu <literal>build.xml</"
+#~ "literal>:"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "Esta target cria um arquivo chamado <literal>hibernate-tutorial.war</"
+#~ "literal> no diretório do seu projeto. Ele empacota todas as bibliotecas e "
+#~ "o arquivo de descrição <literal>web.xml</literal>, o qual é esperado no "
+#~ "diretório base do seu projeto:"
+
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+#~ msgstr ""
+#~ "Antes de você compilar e fazer o deploy desta aplicação web, note que uma "
+#~ "biblioteca adicional é requerida: <literal>jsdk.jar</literal>. Esse é o "
+#~ "Java servlet development kit, se você não possui esta biblioteca, faça "
+#~ "seu download na página da Sun e copie-a para seu diretório de "
+#~ "bibliotecas. Entretanto, será usado somente para a compilação e excluído "
+#~ "do pacote WAR."
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "Se você já se sente seguro com o Hibernate, continue navegando na "
+#~ "documentação de referência por tópicos que você acha interessante – os "
+#~ "tópicos mais questionados são: processo de transação (<xref linkend="
+#~ "\"transactions\"/>), uso da API (<xref linkend=\"objectstate\"/>) e "
+#~ "características de consulta (<xref linkend=\"objectstate-querying\"/>)."
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr ""
+#~ "Não esqueça de visitar o site do Hibernate para obter mais tutoriais "
+#~ "especializados."

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 07:48+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,36 +11,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
+#: xml.xml:29
 #, no-c-format
 msgid "XML Mapping"
 msgstr "Mapeamento XML"
 
 #. Tag: emphasis
-#: xml.xml:7
-#, no-c-format
+#: xml.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr ""
 "Note that this is an experimental feature in Hibernate 3.0 and is under "
 "extremely active development. Veja que essa é uma feature experimental no "
 "Hibernate 3.0 e o desenvolvimento esta bastante ativo."
 
 #. Tag: title
-#: xml.xml:13
+#: xml.xml:37
 #, no-c-format
 msgid "Working with XML data"
 msgstr "Trabalhando com dados em XML"
 
 #. Tag: para
-#: xml.xml:15
-#, no-c-format
+#: xml.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "O Hibernate permite que se trabalhe com dados persistentes em XML quase da "
 "mesma maneira como você trabalhar com POJOs persistentes. Uma árvore XML "
@@ -48,7 +48,7 @@
 "relacionais como objetos, ao invés dos POJOs."
 
 #. Tag: para
-#: xml.xml:22
+#: xml.xml:46
 #, no-c-format
 msgid ""
 "Hibernate supports dom4j as API for manipulating XML trees. You can write "
@@ -68,7 +68,7 @@
 "replicate()</literal> (merging ainda não é suportado)"
 
 #. Tag: para
-#: xml.xml:32
+#: xml.xml:56
 #, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
@@ -79,12 +79,12 @@
 "usando XSLT."
 
 #. Tag: para
-#: xml.xml:37
-#, no-c-format
+#: xml.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "Um mapeamento simples pode ser usado para simultaneamente mapear "
 "propriedades da classe e nós de um documento XML para um banco de dados ou, "
@@ -92,20 +92,20 @@
 "XML."
 
 #. Tag: title
-#: xml.xml:44
+#: xml.xml:68
 #, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr ""
 "Especificando o mapeamento de uma classe e de um arquivo XML simultaneamente"
 
 #. Tag: para
-#: xml.xml:46
+#: xml.xml:70
 #, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr "Segue um exemplo de como mapear um POJO e um XML ao mesmo tempo:"
 
 #. Tag: programlisting
-#: xml.xml:50
+#: xml.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Account\" \n"
@@ -131,19 +131,19 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:54
+#: xml.xml:78
 #, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr "Especificando somente um mapeamento XML"
 
 #. Tag: para
-#: xml.xml:56
+#: xml.xml:80
 #, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr "Segue um exemplo que não contém uma classe POJO:"
 
 #. Tag: programlisting
-#: xml.xml:60
+#: xml.xml:84
 #, no-c-format
 msgid ""
 "<![CDATA[<class entity-name=\"Account\" \n"
@@ -172,12 +172,12 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:62
-#, no-c-format
+#: xml.xml:86
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "Esse mapeamento permite que você acesse os dados como uma árvore dom4j ou um "
 "grafo de de pares nome de propriedade/valor (<literal>Map</literal>s do "
@@ -185,17 +185,17 @@
 "ser referenciadas em consultas HQL."
 
 #. Tag: title
-#: xml.xml:73
+#: xml.xml:97
 #, no-c-format
 msgid "XML mapping metadata"
 msgstr "Mapeando metadados com XML"
 
 #. Tag: para
-#: xml.xml:75
-#, no-c-format
+#: xml.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -205,40 +205,40 @@
 "formato do atributo <literal>node</literal> deve ser o seguinte:"
 
 #. Tag: para
-#: xml.xml:84
-#, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#: xml.xml:108
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr ""
 "<literal>\"element-name\"</literal> - mapeia para o elemento XML com "
 "determinado nome"
 
 #. Tag: para
-#: xml.xml:87
-#, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#: xml.xml:111
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr ""
 "<literal>\"@attribute-name\"</literal> - mapeia para o atributo XML com "
 "determinado nome"
 
 #. Tag: para
-#: xml.xml:90
-#, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+#: xml.xml:114
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - mapeia para o elemento pai"
 
 #. Tag: para
-#: xml.xml:93
-#, no-c-format
+#: xml.xml:117
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - mapeia para para o "
 "atributo com determinado nome do elemento com determinado nome"
 
 #. Tag: para
-#: xml.xml:100
-#, no-c-format
+#: xml.xml:124
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -246,7 +246,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "Para coleções e associações simples, existe o atributo adicional "
 "<literal>embed-xml</literal>. Se o atributo <literal>embed-xml=\"true\"</"
@@ -258,18 +258,18 @@
 "aparecer."
 
 #. Tag: para
-#: xml.xml:110
-#, no-c-format
+#: xml.xml:134
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "Você precisa tomar cuidado em não deixar o<literal>embed-xml=\"true\"</"
 "literal> para muitas associações, pois o XML não suporta bem referências "
 "circulares."
 
 #. Tag: programlisting
-#: xml.xml:115
+#: xml.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
@@ -309,17 +309,17 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:117
-#, no-c-format
+#: xml.xml:141
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "Nesse caso, decidimos embutir a colenção de account ids, e não os dados de "
 "accounts. A query HQL a seguir:"
 
 #. Tag: programlisting
-#: xml.xml:122
+#: xml.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[from Customer c left join fetch c.accounts where c.lastName like :"
@@ -327,13 +327,13 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:124
-#, no-c-format
-msgid "Would return datasets such as this:"
+#: xml.xml:148
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "Retornaria um conjunto de dados como esse:"
 
 #. Tag: programlisting
-#: xml.xml:128
+#: xml.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -349,7 +349,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:130
+#: xml.xml:154
 #, no-c-format
 msgid ""
 "If you set <literal>embed-xml=\"true\"</literal> on the <literal>&lt;one-to-"
@@ -360,7 +360,7 @@
 "seguinte:"
 
 #. Tag: programlisting
-#: xml.xml:135
+#: xml.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -382,23 +382,23 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:141
+#: xml.xml:165
 #, no-c-format
 msgid "Manipulating XML data"
 msgstr "Manipulando dados em XML"
 
 #. Tag: para
-#: xml.xml:143
-#, no-c-format
+#: xml.xml:167
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "Vamos reler e atualizar documentos em XML em nossa aplicação. Nós fazemos "
 "isso obtendo uma session do dom4j:"
 
 #. Tag: programlisting
-#: xml.xml:148
+#: xml.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
@@ -422,7 +422,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: xml.xml:150
+#: xml.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
@@ -444,12 +444,11 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:152
-#, no-c-format
+#: xml.xml:176
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "É extremamente útil combinar essa funcionalidade com a operação "
 "<literal>replicate()</literal> do Hibernate para implementar importação/"

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/Hibernate_Reference.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/Hibernate_Reference.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/Hibernate_Reference.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,24 +1,32 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:26
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: Hibernate_Reference.xml:35
+#, no-c-format
 msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
 msgstr "HIBERNATE - 符合Java习惯的关系数据库持久化"
 
-#: index.docbook:27
+#. Tag: subtitle
+#: Hibernate_Reference.xml:36
+#, no-c-format
 msgid "Hibernate Reference Documentation"
 msgstr "Hibernate参考文档"
 
-#: index.docbook:41
+#. Tag: holder
+#: Hibernate_Reference.xml:51
+#, no-c-format
 msgid "&copyrightHolder;"
 msgstr "&copyrightHolder;"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,29 +24,43 @@
 
 #. Tag: para
 #: architecture.xml:35
-#, no-c-format
-msgid "A (very) high-level view of the Hibernate architecture:"
+#, fuzzy, no-c-format
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "一个非常简要的Hibernate体系结构的概要图:"
 
 #. Tag: para
 #: architecture.xml:48
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This diagram shows Hibernate using the database and configuration data to "
-"provide persistence services (and persistent objects) to the application."
+"We do not have the scope in this document to provide a more detailed view of "
+"all the runtime architectures available; Hibernate is flexible and supports "
+"several different approaches. We will, however, show the two extremes: "
+"\"minimal\" architecture and \"comprehensive\" architecture."
 msgstr ""
+"我们来更详细地看一下Hibernate运行时体系结构。由于Hibernate非常灵活,且支持多"
+"种应用方案, 所以我们这只描述一下两种极端的情况。“轻型”的体系结构方案,要求应"
+"用程序提供自己的JDBC 连接并管理自己的事务。这种方案使用了Hibernate API的最小"
+"子集:"
+
+#. Tag: para
+#: architecture.xml:54
+#, fuzzy, no-c-format
+msgid ""
+"This next diagram illustrates how Hibernate utilizes database and "
+"configuration data to provide persistence services, and persistent objects, "
+"to the application."
+msgstr ""
 "从这个图可以看出,Hibernate使用数据库和配置信息来为应用程序提供持久化服务(以"
 "及持久的对象)。"
 
 #. Tag: para
-#: architecture.xml:53
-#, no-c-format
+#: architecture.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"We would like to show a more detailed view of the runtime architecture. "
-"Unfortunately, Hibernate is flexible and supports several approaches. We "
-"will show the two extremes. The \"lite\" architecture has the application "
-"provide its own JDBC connections and manage its own transactions. This "
-"approach uses a minimal subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application provide its own JDBC "
+"connections and manage its own transactions. This approach uses a minimal "
+"subset of Hibernate's APIs:"
 msgstr ""
 "我们来更详细地看一下Hibernate运行时体系结构。由于Hibernate非常灵活,且支持多"
 "种应用方案, 所以我们这只描述一下两种极端的情况。“轻型”的体系结构方案,要求应"
@@ -54,36 +68,36 @@
 "子集:"
 
 #. Tag: para
-#: architecture.xml:70
-#, no-c-format
+#: architecture.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"The \"full cream\" architecture abstracts the application away from the "
-"underlying JDBC/JTA APIs and lets Hibernate take care of the details."
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 "“全面解决”的体系结构方案,将应用层从底层的JDBC/JTA API中抽象出来,而让"
 "Hibernate来处理这些细节。"
 
 #. Tag: para
-#: architecture.xml:84
+#: architecture.xml:88
 #, fuzzy, no-c-format
-msgid "Heres some definitions of the objects in the diagrams:"
+msgid "Here are some definitions of the objects depicted in the diagrams:"
 msgstr "图中各个对象的定义如下: <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:89
+#: architecture.xml:93
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:91
-#, no-c-format
+#: architecture.xml:95
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe (immutable) cache of compiled mappings for a single database. A "
+"A threadsafe, immutable cache of compiled mappings for a single database. A "
 "factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>. Might hold an optional (second-level) "
-"cache of data that is reusable between transactions, at a process- or "
-"cluster-level."
+"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
+"hold an optional (second-level) cache of data that is reusable between "
+"transactions at a process, or cluster, level."
 msgstr ""
 "针对单个数据库映射关系经过编译后的内存镜像,是线程安全的(不可变)。 它是生成"
 "<literal>Session</literal>的工厂,本身要用到<literal>ConnectionProvider</"
@@ -91,41 +105,41 @@
 "选的二级缓存。"
 
 #. Tag: term
-#: architecture.xml:101
+#: architecture.xml:105
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:103
-#, no-c-format
+#: architecture.xml:107
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. Wraps a JDBC connection. Factory "
-"for <literal>Transaction</literal>. Holds a mandatory (first-level) cache of "
-"persistent objects, used when navigating the object graph or looking up "
-"objects by identifier."
+"the application and the persistent store. It wraps a JDBC connection and is "
+"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
+"holds a mandatory first-level cache of persistent objects that are used when "
+"navigating the object graph or looking up objects by identifier."
 msgstr ""
 "表示应用程序与持久储存层之间交互操作的一个单线程对象,此对象生存期很短。 其隐"
 "藏了JDBC连接,也是<literal>Transaction</literal>的工厂。 其会持有一个针对持久"
 "化对象的必选(第一级)缓存,在遍历对象图或者根据持久化标识查找对象时会用到。"
 
 #. Tag: term
-#: architecture.xml:113
+#: architecture.xml:117
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "持久的对象及其集合"
 
 #. Tag: para
-#: architecture.xml:115
-#, no-c-format
+#: architecture.xml:119
+#, fuzzy, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
-"business function. These might be ordinary JavaBeans/POJOs, the only special "
-"thing about them is that they are currently associated with (exactly one) "
-"<literal>Session</literal>. As soon as the <literal>Session</literal> is "
-"closed, they will be detached and free to use in any application layer (e.g. "
-"directly as data transfer objects to and from presentation)."
+"business function. These can be ordinary JavaBeans/POJOs. They are "
+"associated with exactly one <literal>Session</literal>. Once the "
+"<literal>Session</literal> is closed, they will be detached and free to use "
+"in any application layer (for example, directly as data transfer objects to "
+"and from presentation)."
 msgstr ""
 "带有持久化状态的、具有业务功能的单线程对象,此对象生存期很短。 这些对象可能是"
 "普通的JavaBeans/POJO,唯一特殊的是他们正与(仅仅一个)<literal>Session</"
@@ -134,18 +148,18 @@
 "据传输对象。)"
 
 #. Tag: term
-#: architecture.xml:126
+#: architecture.xml:129
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "瞬态(transient)和脱管(detached)的对象及其集合"
 
 #. Tag: para
-#: architecture.xml:128
-#, no-c-format
+#: architecture.xml:131
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<literal>Session</literal>. They may have been instantiated by the "
-"application and not (yet) persisted or they may have been instantiated by a "
+"application and not yet persisted, or they may have been instantiated by a "
 "closed <literal>Session</literal>."
 msgstr ""
 "那些目前没有与session关联的持久化类实例。 他们可能是在被应用程序实例化后,尚"
@@ -153,21 +167,21 @@
 "关闭而脱离持久化的对象。"
 
 #. Tag: term
-#: architecture.xml:137
+#: architecture.xml:140
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "事务Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:139
-#, no-c-format
+#: architecture.xml:142
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
-"specify atomic units of work. Abstracts application from underlying JDBC, "
-"JTA or CORBA transaction. A <literal>Session</literal> might span several "
-"<literal>Transaction</literal>s in some cases. However, transaction "
-"demarcation, either using the underlying API or <literal>Transaction</"
-"literal>, is never optional!"
+"specify atomic units of work. It abstracts the application from the "
+"underlying JDBC, JTA or CORBA transaction. A <literal>Session</literal> "
+"might span several <literal>Transaction</literal>s in some cases. However, "
+"transaction demarcation, either using the underlying API or "
+"<literal>Transaction</literal>, is never optional."
 msgstr ""
 "(可选的)应用程序用来指定原子操作单元范围的对象,它是单线程的,生命周期很"
 "短。 它通过抽象将应用从底层具体的JDBC、JTA以及CORBA事务隔离开。 某些情况下,"
@@ -176,7 +190,7 @@
 "<literal>Transaction</literal>对象,事务边界的开启与关闭是必不可少的。"
 
 #. Tag: term
-#: architecture.xml:150
+#: architecture.xml:153
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -186,20 +200,20 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:152
-#, no-c-format
+#: architecture.xml:155
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for (and pool of) JDBC connections. Abstracts "
+"(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
 "application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. Not exposed to application, but can be "
-"extended/implemented by the developer."
+"<literal>DriverManager</literal>. It is not exposed to application, but it "
+"can be extended and/or implemented by the developer."
 msgstr ""
 "(可选的)生成JDBC连接的工厂(同时也起到连接池的作用)。 它通过抽象将应用从底"
 "层的<literal>Datasource</literal>或<literal>DriverManager</literal>隔离开。 "
 "仅供开发者扩展/实现用,并不暴露给应用程序使用。"
 
 #. Tag: term
-#: architecture.xml:160
+#: architecture.xml:163
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -207,111 +221,113 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:162
-#, no-c-format
+#: architecture.xml:165
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. Not "
-"exposed to the application, but can be extended/implemented by the developer."
+"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
+"exposed to the application, but it can be extended and/or implemented by the "
+"developer."
 msgstr ""
 "(可选的)生成<literal>Transaction</literal>对象实例的工厂。 仅供开发者扩展/"
 "实现用,并不暴露给应用程序使用。"
 
 #. Tag: emphasis
-#: architecture.xml:169
+#: architecture.xml:172
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "扩展接口"
 
 #. Tag: para
-#: architecture.xml:171
-#, no-c-format
+#: architecture.xml:174
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate offers many optional extension interfaces you can implement to "
-"customize the behavior of your persistence layer. See the API documentation "
-"for details."
+"Hibernate offers a range of optional extension interfaces you can implement "
+"to customize the behavior of your persistence layer. See the API "
+"documentation for details."
 msgstr ""
 "Hibernate提供了很多可选的扩展接口,你可以通过实现它们来定制你的持久层的行"
 "为。 具体请参考API文档。"
 
 #. Tag: para
-#: architecture.xml:180
-#, no-c-format
+#: architecture.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"Given a \"lite\" architecture, the application bypasses the "
+"Given a \"minimal\" architecture, the application bypasses the "
 "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
+"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
+"directly."
 msgstr ""
 "在特定“轻型”的体系结构中,应用程序可能绕过 <literal>Transaction</literal>/"
 "<literal>TransactionFactory</literal> 以及 <literal>ConnectionProvider</"
 "literal> 等API直接跟JTA或JDBC打交道。"
 
 #. Tag: title
-#: architecture.xml:188
+#: architecture.xml:191
 #, no-c-format
 msgid "Instance states"
 msgstr "实例状态"
 
 #. Tag: para
-#: architecture.xml:189
-#, no-c-format
+#: architecture.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"An instance of a persistent classes may be in one of three different states, "
-"which are defined with respect to a <emphasis>persistence context</"
+"An instance of a persistent class can be in one of three different states. "
+"These states are defined in relation to a <emphasis>persistence context</"
 "emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context:"
+"persistence context. The three different states are as follows:"
 msgstr ""
 "一个持久化类的实例可能处于三种不同状态中的某一种。 这三种状态的定义则与所谓的"
 "<emphasis>持久化上下文(persistence context)</emphasis>有关。 Hibernate的"
 "<literal>Session</literal>对象就是这个所谓的持久化上下文:"
 
 #. Tag: term
-#: architecture.xml:197
+#: architecture.xml:200
 #, no-c-format
 msgid "transient"
 msgstr "瞬态(transient)"
 
 #. Tag: para
-#: architecture.xml:199
-#, no-c-format
+#: architecture.xml:202
+#, fuzzy, no-c-format
 msgid ""
-"The instance is not, and has never been associated with any persistence "
-"context. It has no persistent identity (primary key value)."
+"The instance is not associated with any persistence context. It has no "
+"persistent identity or primary key value."
 msgstr "该实例从未与任何持久化上下文关联过。它没有持久化标识(相当于主键值)。"
 
 #. Tag: term
-#: architecture.xml:207
+#: architecture.xml:210
 #, no-c-format
 msgid "persistent"
 msgstr "持久化(persistent)"
 
 #. Tag: para
-#: architecture.xml:209
-#, no-c-format
+#: architecture.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and, perhaps, a corresponding row in "
+"persistent identity (primary key value) and can have a corresponding row in "
 "the database. For a particular persistence context, Hibernate "
 "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity (in-memory location of the object)."
+"Java identity in relation to the in-memory location of the object."
 msgstr ""
 "实例目前与某个持久化上下文有关联。 它拥有持久化标识(相当于主键值),并且可能"
 "在数据库中有一个对应的行。 对于某一个特定的持久化上下文,Hibernate<emphasis>"
 "保证</emphasis>持久化标识与Java标识(其值代表对象在内存中的位置)等价。"
 
 #. Tag: term
-#: architecture.xml:221
+#: architecture.xml:224
 #, no-c-format
 msgid "detached"
 msgstr "脱管(detached)"
 
 #. Tag: para
-#: architecture.xml:223
+#: architecture.xml:226
 #, fuzzy, no-c-format
 msgid ""
 "The instance was once associated with a persistence context, but that "
 "context was closed, or the instance was serialized to another process. It "
-"has a persistent identity and, perhaps, a corresponding row in the database. "
-"For detached instances, Hibernate makes no guarantees about the relationship "
+"has a persistent identity and can have a corresponding row in the database. "
+"For detached instances, Hibernate does not guarantee the relationship "
 "between persistent identity and Java identity."
 msgstr ""
 "实例曾经与某个持久化上下文发生过关联,不过那个上下文被关闭了, 或者这个实例是"
@@ -320,47 +336,48 @@
 "系。"
 
 #. Tag: title
-#: architecture.xml:238
+#: architecture.xml:241
 #, no-c-format
 msgid "JMX Integration"
 msgstr "JMX整合"
 
 #. Tag: para
-#: architecture.xml:240
-#, no-c-format
+#: architecture.xml:243
+#, fuzzy, no-c-format
 msgid ""
-"JMX is the J2EE standard for management of Java components. Hibernate may be "
-"managed via a JMX standard service. We provide an MBean implementation in "
-"the distribution, <literal>org.hibernate.jmx.HibernateService</literal>."
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
 msgstr ""
 "JMX是管理Java组件(Java components)的J2EE标准。 Hibernate 可以通过一个JMX标准"
 "服务来管理。 在这个发行版本中,我们提供了一个MBean接口的实现,即 <literal>org."
 "hibernate.jmx.HibernateService</literal>。"
 
 #. Tag: para
-#: architecture.xml:246
-#, no-c-format
+#: architecture.xml:249
+#, fuzzy, no-c-format
 msgid ""
-"For an example how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. On JBoss AS, you also "
-"get these benefits if you deploy using JMX:"
+"For an example of how to deploy Hibernate as a JMX service on the JBoss "
+"Application Server, please see the JBoss User Guide. JBoss AS also provides "
+"these benefits if you deploy using JMX:"
 msgstr ""
 "想要看如何在JBoss应用服务器上将Hibernate部署为一个JMX服务的例子,您可以参考"
 "JBoss用户指南。 我们现在说一下在Jboss应用服务器上,使用JMX来部署Hibernate的好"
 "处:"
 
 #. Tag: para
-#: architecture.xml:254
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
+"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
 "literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means you no longer have to manually open and close the "
-"<literal>Session</literal>, this becomes the job of a JBoss EJB interceptor. "
-"You also don't have to worry about transaction demarcation in your code "
-"anymore (unless you'd like to write a portable persistence layer of course, "
-"use the optional Hibernate <literal>Transaction</literal> API for this). You "
-"call the <literal>HibernateContext</literal> to access a <literal>Session</"
+"transaction. This means that you no longer have to manually open and close "
+"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+"interceptor. You also do not have to worry about transaction demarcation in "
+"your code (if you would like to write a portable persistence layer use the "
+"optional Hibernate <literal>Transaction</literal> API for this). You call "
+"the <literal>HibernateContext</literal> to access a <literal>Session</"
 "literal>."
 msgstr ""
 "<emphasis>Session管理:</emphasis> Hibernate的<literal>Session</literal>对象"
@@ -371,16 +388,16 @@
 "用<literal>HibernateContext</literal>来访问<literal>Session</literal>。"
 
 #. Tag: para
-#: architecture.xml:266
-#, no-c-format
+#: architecture.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
-"service using a JBoss service deployment descriptor (in an EAR and/or SAR "
-"file), it supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still have to name all your "
-"mapping files in the deployment descriptor. If you decide to use the "
-"optional HAR deployment, JBoss will automatically detect all mapping files "
-"in your HAR file."
+"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
+"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
+"supports all the usual configuration options of a Hibernate "
+"<literal>SessionFactory</literal>. However, you still need to name all your "
+"mapping files in the deployment descriptor. If you use the optional HAR "
+"deployment, JBoss will automatically detect all mapping files in your HAR "
+"file."
 msgstr ""
 "<emphasis>HAR 部署:</emphasis> 通常情况下,你会使用JBoss的服务部署描述符(在"
 "EAR或/和SAR文件中)来部署Hibernate JMX服务。 这种部署方式支持所有常见的"
@@ -389,57 +406,58 @@
 "你的HAR文件中所有的映射文件。"
 
 #. Tag: para
-#: architecture.xml:277
+#: architecture.xml:280
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
 msgstr "这些选项更多的描述,请参考JBoss 应用程序用户指南。"
 
 #. Tag: para
-#: architecture.xml:281
-#, no-c-format
+#: architecture.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"Another feature available as a JMX service are runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\"/>."
+"Another feature available as a JMX service is runtime Hibernate statistics. "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
+"information."
 msgstr ""
 "将Hibernate以部署为JMX服务的另一个好处,是可以查看Hibernate的运行时统计信息。"
 "参看 <xref linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:288
+#: architecture.xml:291
 #, no-c-format
 msgid "JCA Support"
 msgstr "对JCA的支持"
 
 #. Tag: para
-#: architecture.xml:289
-#, no-c-format
+#: architecture.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate may also be configured as a JCA connector. Please see the website "
-"for more details. Please note that Hibernate JCA support is still considered "
-"experimental."
+"Hibernate can also be configured as a JCA connector. Please see the website "
+"for more information. Please note, however, that at this stage Hibernate JCA "
+"support is under development."
 msgstr ""
 "Hibernate也可以被配置为一个JCA连接器(JCA connector)。更多信息请参看网站。 "
 "请注意,Hibernate对JCA的支持,仍处于实验性阶段。"
 
 #. Tag: title
-#: architecture.xml:296
-#, no-c-format
-msgid "Contextual Sessions"
+#: architecture.xml:299
+#, fuzzy, no-c-format
+msgid "Contextual sessions"
 msgstr "上下文相关的(Contextual)Session"
 
 #. Tag: para
-#: architecture.xml:297
-#, no-c-format
+#: architecture.xml:300
+#, fuzzy, no-c-format
 msgid ""
-"Most applications using Hibernate need some form of \"contextual\" sessions, "
+"Most applications using Hibernate need some form of \"contextual\" session, "
 "where a given session is in effect throughout the scope of a given context. "
 "However, across applications the definition of what constitutes a context is "
-"typically different; and different contexts define different scopes to the "
+"typically different; different contexts define different scopes to the "
 "notion of current. Applications using Hibernate prior to version 3.0 tended "
 "to utilize either home-grown <literal>ThreadLocal</literal>-based contextual "
 "sessions, helper classes such as <literal>HibernateUtil</literal>, or "
-"utilized third-party frameworks (such as Spring or Pico) which provided "
+"utilized third-party frameworks, such as Spring or Pico, which provided "
 "proxy/interception-based contextual sessions."
 msgstr ""
 "使用Hibernate的大多数应用程序需要某种形式的“上下文相关的” session,特定的"
@@ -452,19 +470,18 @@
 "session。"
 
 #. Tag: para
-#: architecture.xml:306
-#, no-c-format
+#: architecture.xml:309
+#, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
 "getCurrentSession()</literal> method. Initially, this assumed usage of "
 "<literal>JTA</literal> transactions, where the <literal>JTA</literal> "
-"transaction defined both the scope and context of a current session. The "
-"Hibernate team maintains that, given the maturity of the numerous stand-"
-"alone <literal>JTA TransactionManager</literal> implementations out there, "
-"most (if not all) applications should be using <literal>JTA</literal> "
-"transaction management whether or not they are deployed into a "
-"<literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-"
-"based contextual sessions is all you should ever need to use."
+"transaction defined both the scope and context of a current session. Given "
+"the maturity of the numerous stand-alone <literal>JTA TransactionManager</"
+"literal> implementations, most, if not all, applications should be using "
+"<literal>JTA</literal> transaction management, whether or not they are "
+"deployed into a <literal>J2EE</literal> container. Based on that, the "
+"<literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 "从3.0.1版本开始,Hibernate增加了<literal>SessionFactory.getCurrentSession()</"
 "literal>方法。一开始,它假定了采用<literal>JTA</literal>事务,<literal>JTA</"
@@ -475,14 +492,14 @@
 "<literal>JTA</literal>的上下文相关session可以满足你一切需要。"
 
 #. Tag: para
-#: architecture.xml:316
-#, no-c-format
+#: architecture.xml:319
+#, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
 "getCurrentSession()</literal> is now pluggable. To that end, a new extension "
-"interface (<literal>org.hibernate.context.CurrentSessionContext</literal>) "
-"and a new configuration parameter (<literal>hibernate."
-"current_session_context_class</literal>) have been added to allow "
+"interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, "
+"and a new configuration parameter, <literal>hibernate."
+"current_session_context_class</literal>, have been added to allow "
 "pluggability of the scope and context of defining current sessions."
 msgstr ""
 "更好的是,从3.1开始,<literal>SessionFactory.getCurrentSession()</literal>的"
@@ -492,15 +509,15 @@
 "下文(scope and context)的定义进行拔插。"
 
 #. Tag: para
-#: architecture.xml:323
-#, no-c-format
+#: architecture.xml:326
+#, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
 "CurrentSessionContext</literal> interface for a detailed discussion of its "
 "contract. It defines a single method, <literal>currentSession()</literal>, "
 "by which the implementation is responsible for tracking the current "
 "contextual session. Out-of-the-box, Hibernate comes with three "
-"implementations of this interface."
+"implementations of this interface:"
 msgstr ""
 "请参阅<literal>org.hibernate.context.CurrentSessionContext</literal>接口的"
 "Javadoc,那里有关于它的契约的详细讨论。它定义了单一的方法,"
@@ -508,11 +525,11 @@
 "session。Hibernate内置了此接口的三种实现。"
 
 #. Tag: para
-#: architecture.xml:333
-#, no-c-format
+#: architecture.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.JTASessionContext</literal> - current "
-"sessions are tracked and scoped by a <literal>JTA</literal> transaction. The "
+"<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
+"are tracked and scoped by a <literal>JTA</literal> transaction. The "
 "processing here is exactly the same as in the older JTA-only approach. See "
 "the Javadocs for details."
 msgstr ""
@@ -521,24 +538,23 @@
 "情请参阅Javadoc。"
 
 #. Tag: para
-#: architecture.xml:341
-#, no-c-format
+#: architecture.xml:344
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
-"sessions are tracked by thread of execution. Again, see the Javadocs for "
-"details."
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - 当前"
 "session通过当前执行的线程来跟踪和界定。详情也请参阅Javadoc。"
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:350
+#, fuzzy, no-c-format
 msgid ""
-"<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
 "sessions are tracked by thread of execution. However, you are responsible to "
 "bind and unbind a <literal>Session</literal> instance with static methods on "
-"this class, it does never open, flush, or close a <literal>Session</literal>."
+"this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - 当前session"
 "通过当前执行的线程来跟踪和界定。但是,你需要负责使用这个类的静态方法将"
@@ -546,20 +562,21 @@
 "者关闭(close)任何<literal>Session</literal>。"
 
 #. Tag: para
-#: architecture.xml:356
+#: architecture.xml:359
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
-"transaction\" programming model, also known and used as <emphasis>session-"
-"per-request</emphasis>. The beginning and end of a Hibernate session is "
-"defined by the duration of a database transaction. If you use programmatic "
-"transaction demarcation in plain JSE without JTA, you are advised to use the "
-"Hibernate <literal>Transaction</literal> API to hide the underlying "
-"transaction system from your code. If you use JTA, use the JTA interfaces to "
-"demarcate transactions. If you execute in an EJB container that supports "
-"CMT, transaction boundaries are defined declaratively and you don't need any "
-"transaction or session demarcation operations in your code. Refer to <xref "
-"linkend=\"transactions\"/> for more information and code examples."
+"transaction\" programming model. This is also also known and used as "
+"<emphasis>session-per-request</emphasis>. The beginning and end of a "
+"Hibernate session is defined by the duration of a database transaction. If "
+"you use programmatic transaction demarcation in plain JSE without JTA, you "
+"are advised to use the Hibernate <literal>Transaction</literal> API to hide "
+"the underlying transaction system from your code. If you use JTA, you can "
+"utilize the JTA interfaces to demarcate transactions. If you execute in an "
+"EJB container that supports CMT, transaction boundaries are defined "
+"declaratively and you do not need any transaction or session demarcation "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
+"information and code examples."
 msgstr ""
 "前两种实现都提供了“每数据库事务对应一个session”的编程模型,也称作<emphasis>每"
 "次请求一个session</emphasis>。Hibernate session的起始和终结由数据库事务的生存"
@@ -571,18 +588,18 @@
 "示例代码。"
 
 #. Tag: para
-#: architecture.xml:368
-#, no-c-format
+#: architecture.xml:371
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
 "parameter defines which <literal>org.hibernate.context."
-"CurrentSessionContext</literal> implementation should be used. Note that for "
-"backwards compatibility, if this config param is not set but a <literal>org."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
 "hibernate.transaction.TransactionManagerLookup</literal> is configured, "
 "Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
 "literal>. Typically, the value of this parameter would just name the "
-"implementation class to use; for the three out-of-the-box implementations, "
-"however, there are three corresponding short names, \"jta\", \"thread\", and "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
 "\"managed\"."
 msgstr ""
 "<literal>hibernate.current_session_context_class</literal>配置参数定义了应该"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,24 +11,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: association_mapping.xml:6
+#: association_mapping.xml:30
 #, no-c-format
 msgid "Association Mappings"
 msgstr "关联关系映射"
 
 #. Tag: title
-#: association_mapping.xml:9
+#: association_mapping.xml:33
 #, no-c-format
 msgid "Introduction"
 msgstr "介绍"
 
 #. Tag: para
-#: association_mapping.xml:11
-#, no-c-format
+#: association_mapping.xml:35
+#, fuzzy, no-c-format
 msgid ""
-"Association mappings are the often most difficult thing to get right. In "
-"this section we'll go through the canonical cases one by one, starting with "
-"unidirectional mappings, and then considering the bidirectional cases. We'll "
+"Association mappings are often the most difficult thing to implement "
+"correctly. In this section we examine some canonical cases one by one, "
+"starting with unidirectional mappings and then bidirectional cases. We will "
 "use <literal>Person</literal> and <literal>Address</literal> in all the "
 "examples."
 msgstr ""
@@ -37,20 +37,20 @@
 "<literal>Person</literal>和<literal>Address</literal>。"
 
 #. Tag: para
-#: association_mapping.xml:19
-#, no-c-format
+#: association_mapping.xml:43
+#, fuzzy, no-c-format
 msgid ""
-"We'll classify associations by whether or not they map to an intervening "
-"join table, and by multiplicity."
+"Associations will be classified by multiplicity and whether or not they map "
+"to an intervening join table."
 msgstr "我们根据映射关系是否涉及连接表以及多样性来划分关联类型。"
 
 #. Tag: para
-#: association_mapping.xml:24
-#, no-c-format
+#: association_mapping.xml:48
+#, fuzzy, no-c-format
 msgid ""
-"Nullable foreign keys are not considered good practice in traditional data "
-"modelling, so all our examples use not null foreign keys. This is not a "
-"requirement of Hibernate, and the mappings will all work if you drop the "
+"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 "
+"not a requirement of Hibernate, and the mappings will work if you drop the "
 "nullability constraints."
 msgstr ""
 "在传统的数据建模中,允许为Null值的外键被认为是一种不好的实践,因此我们所有的"
@@ -58,15 +58,15 @@
 "Null的约束,Hibernate映射一样可以工作的很好。"
 
 #. Tag: title
-#: association_mapping.xml:34
+#: association_mapping.xml:58
 #, no-c-format
 msgid "Unidirectional associations"
 msgstr "单向关联(Unidirectional associations)"
 
 #. Tag: title
-#: association_mapping.xml:37 association_mapping.xml:108
+#: association_mapping.xml:61 association_mapping.xml:132
 #, fuzzy, no-c-format
-msgid "many to one"
+msgid "Many-to-one"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "多对一(many to one)\n"
@@ -74,7 +74,7 @@
 "多对一(many to one)"
 
 #. Tag: para
-#: association_mapping.xml:39
+#: association_mapping.xml:63
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association</emphasis> is the most "
@@ -82,7 +82,7 @@
 msgstr "<emphasis>单向many-to-one关联</emphasis>是最常见的单向关联关系。"
 
 #. Tag: programlisting
-#: association_mapping.xml:44
+#: association_mapping.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -102,7 +102,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:45 association_mapping.xml:161
+#: association_mapping.xml:69 association_mapping.xml:185
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -113,14 +113,14 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:50 association_mapping.xml:121
-#: association_mapping.xml:185 association_mapping.xml:225
-#, no-c-format
-msgid "one to one"
+#: association_mapping.xml:74 association_mapping.xml:145
+#: association_mapping.xml:210
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "一对一(one to one)"
 
 #. Tag: para
-#: association_mapping.xml:52
+#: association_mapping.xml:76
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a foreign key</"
@@ -132,7 +132,7 @@
 "束。"
 
 #. Tag: programlisting
-#: association_mapping.xml:57
+#: association_mapping.xml:81
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -153,7 +153,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:58 association_mapping.xml:193
+#: association_mapping.xml:82 association_mapping.xml:218
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -164,18 +164,18 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:60
-#, no-c-format
+#: association_mapping.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
-"emphasis> usually uses a special id generator. (Notice that we've reversed "
-"the direction of the association in this example.)"
+"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:66
+#: association_mapping.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -195,7 +195,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:67 association_mapping.xml:201
+#: association_mapping.xml:91 association_mapping.xml:226
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -205,9 +205,9 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:72 association_mapping.xml:94
+#: association_mapping.xml:96 association_mapping.xml:118
 #, fuzzy, no-c-format
-msgid "one to many"
+msgid "One-to-many"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "一对多(one to many)\n"
@@ -215,17 +215,17 @@
 "一对多(one to many)"
 
 #. Tag: para
-#: association_mapping.xml:74
-#, no-c-format
+#: association_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
-"emphasis> is a very unusual case, and is not really recommended."
+"emphasis> is an unusual case, and is not recommended."
 msgstr ""
 "<emphasis>基于外键关联的单向一对多关联</emphasis>是一种很少见的情况,并不推荐"
 "使用。"
 
 #. Tag: programlisting
-#: association_mapping.xml:79
+#: association_mapping.xml:103
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -247,7 +247,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:80
+#: association_mapping.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -258,32 +258,31 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:82
-#, no-c-format
-msgid "We think it's better to use a join table for this kind of association."
+#: association_mapping.xml:106
+#, fuzzy, no-c-format
+msgid "You should instead use a join table for this kind of association."
 msgstr "我们认为对于这种关联关系最好使用连接表。"
 
 #. Tag: title
-#: association_mapping.xml:91
+#: association_mapping.xml:115
 #, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "使用连接表的单向关联(Unidirectional associations with join tables)"
 
 #. Tag: para
-#: association_mapping.xml:96
-#, no-c-format
+#: association_mapping.xml:120
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
-"emphasis> is much preferred. Notice that by specifying <literal>unique=\"true"
-"\"</literal>, we have changed the multiplicity from many-to-many to one-to-"
-"many."
+"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>,我们可以把多样性从多对多改变为一对"
 "多。"
 
 #. Tag: programlisting
-#: association_mapping.xml:102
+#: association_mapping.xml:126
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -306,7 +305,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:103
+#: association_mapping.xml:127
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -318,17 +317,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:110
-#, no-c-format
+#: association_mapping.xml:134
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
-"emphasis> is quite common when the association is optional."
+"emphasis> is common when the association is optional. For example:"
 msgstr ""
 "<emphasis>基于连接表的单向多对一关联</emphasis>在关联关系可选的情况下应用也很"
 "普遍。"
 
 #. Tag: programlisting
-#: association_mapping.xml:115
+#: association_mapping.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -352,7 +351,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:116
+#: association_mapping.xml:140
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -364,16 +363,16 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:123
-#, no-c-format
+#: association_mapping.xml:147
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>基于连接表的单向一对一关联</emphasis>非常少见,但也是可行的。"
 
 #. Tag: programlisting
-#: association_mapping.xml:128
+#: association_mapping.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -399,7 +398,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:129 association_mapping.xml:233
+#: association_mapping.xml:153 association_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -411,21 +410,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:134 association_mapping.xml:238
-#, no-c-format
-msgid "many to many"
+#: association_mapping.xml:158 association_mapping.xml:263
+#, fuzzy, no-c-format
+msgid "Many-to-many"
 msgstr "多对多(many to many)"
 
 #. Tag: para
-#: association_mapping.xml:136
-#, no-c-format
+#: association_mapping.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>unidirectional many-to-many association</"
-"emphasis>."
+"Finally, here is an example of a <emphasis>unidirectional many-to-many "
+"association</emphasis>."
 msgstr "最后,还有 <emphasis>单向多对多关联</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:140
+#: association_mapping.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -447,7 +446,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:141 association_mapping.xml:246
+#: association_mapping.xml:165 association_mapping.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -459,15 +458,15 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:148
+#: association_mapping.xml:172
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "双向关联(Bidirectional associations)"
 
 #. Tag: title
-#: association_mapping.xml:151 association_mapping.xml:211
+#: association_mapping.xml:175 association_mapping.xml:236
 #, fuzzy, no-c-format
-msgid "one to many / many to one"
+msgid "one-to-many / many-to-one"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "一对多(one to many) / 多对一(many to one)\n"
@@ -475,17 +474,18 @@
 "一对多(one to many) /多对一( many to one)"
 
 #. Tag: para
-#: association_mapping.xml:153
-#, no-c-format
+#: association_mapping.xml:177
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
-"common kind of association. (This is the standard parent/child relationship.)"
+"common kind of association. The following example illustrates the standard "
+"parent/child relationship."
 msgstr ""
 "<emphasis>双向多对一关联</emphasis> 是最常见的关联关系。(这也是标准的父/子关"
 "联关系。)"
 
 #. Tag: programlisting
-#: association_mapping.xml:159
+#: association_mapping.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -509,15 +509,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:163
-#, no-c-format
+#: association_mapping.xml:187
+#, fuzzy, no-c-format
 msgid ""
-"If you use a <literal>List</literal> (or other indexed collection) you need "
-"to set the <literal>key</literal> column of the foreign key to <literal>not "
-"null</literal>, and let Hibernate manage the association from the "
-"collections side to maintain the index of each element (making the other "
-"side virtually inverse by setting <literal>update=\"false\"</literal> and "
-"<literal>insert=\"false\"</literal>):"
+"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</"
+"literal>. Hibernate will manage the association from the collections side to "
+"maintain the index of each element, making the other side virtually inverse "
+"by setting <literal>update=\"false\"</literal> and <literal>insert=\"false"
+"\"</literal>:"
 msgstr ""
 "如果你使用<literal>List</literal>(或者其他有序集合类),你需要设置外键对应的"
 "<literal>key</literal>列为 <literal>not null</literal>,让Hibernate来从集合端"
@@ -525,7 +525,7 @@
 "and <literal>insert=\"false\"</literal>来对另一端反向操作)。"
 
 #. Tag: programlisting
-#: association_mapping.xml:171
+#: association_mapping.xml:195
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -550,13 +550,13 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:173
-#, no-c-format
+#: association_mapping.xml:197
+#, fuzzy, no-c-format
 msgid ""
-"It is important that you define <literal>not-null=\"true\"</literal> on the "
-"<literal>&lt;key&gt;</literal> element of the collection mapping if the "
-"underlying foreign key column is <literal>NOT NULL</literal>. Don't only "
-"declare <literal>not-null=\"true\"</literal> on a possible nested "
+"If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
+"important that you define <literal>not-null=\"true\"</literal> on the "
+"<literal>&lt;key&gt;</literal> element of the collection mapping. Do not "
+"only declare <literal>not-null=\"true\"</literal> on a possible nested "
 "<literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -567,15 +567,15 @@
 "元素也是需要的。"
 
 #. Tag: para
-#: association_mapping.xml:187
-#, no-c-format
+#: association_mapping.xml:212
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
-"is quite common."
+"is common:"
 msgstr "<emphasis>基于外键关联的双向一对一关联</emphasis>也很常见。"
 
 #. Tag: programlisting
-#: association_mapping.xml:192
+#: association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -598,15 +598,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:195
-#, no-c-format
+#: association_mapping.xml:220
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
-"uses the special id generator."
+"uses the special id generator:"
 msgstr "<emphasis>基于主键关联的一对一关联</emphasis>需要使用特定的id生成器。"
 
 #. Tag: programlisting
-#: association_mapping.xml:200
+#: association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -628,24 +628,25 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:208
+#: association_mapping.xml:233
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "使用连接表的双向关联(Bidirectional associations with join tables)"
 
 #. Tag: para
-#: association_mapping.xml:213
-#, no-c-format
+#: association_mapping.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>bidirectional one-to-many association on a join table</"
-"emphasis>. Note that the <literal>inverse=\"true\"</literal> can go on "
-"either end of the association, on the collection, or on the join."
+"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"
 "\"</literal>可以出现在关联的任意一端,即collection端或者join端。"
 
 #. Tag: programlisting
-#: association_mapping.xml:219
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -677,7 +678,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:220
+#: association_mapping.xml:245
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -688,17 +689,23 @@
 "        ]]>"
 msgstr ""
 
+#. Tag: title
+#: association_mapping.xml:250
+#, no-c-format
+msgid "one to one"
+msgstr "一对一(one to one)"
+
 #. Tag: para
-#: association_mapping.xml:227
-#, no-c-format
+#: association_mapping.xml:252
+#, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
-"is extremely unusual, but possible."
+"is possible, but extremely unusual."
 msgstr ""
 "<emphasis>基于连接表的双向一对一关联</emphasis>极为罕见,但也是可行的。"
 
 #. Tag: programlisting
-#: association_mapping.xml:232
+#: association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -734,15 +741,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:240
-#, no-c-format
+#: association_mapping.xml:265
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we have a <emphasis>bidirectional many-to-many association</"
+"Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
 msgstr "最后,还有 <emphasis>双向多对多关联</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -769,21 +776,21 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:253
+#: association_mapping.xml:278
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "更复杂的关联映射"
 
 #. Tag: para
-#: association_mapping.xml:255
-#, no-c-format
+#: association_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
-"Hibernate makes it possible to handle more complex situations using SQL "
-"fragments embedded in the mapping document. For example, if a table with "
-"historical account information data defines <literal>accountNumber</"
-"literal>, <literal>effectiveEndDate</literal> and "
-"<literal>effectiveStartDate</literal>columns, mapped as follows:"
+"Hibernate handles more complex situations by using SQL fragments embedded in "
+"the mapping document. For example, if a table with historical account "
+"information data defines <literal>accountNumber</literal>, "
+"<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
+"literal>columns, it would be mapped as follows:"
 msgstr ""
 "更复杂的关联连接<emphasis>极为</emphasis>罕见。 通过在映射文档中嵌入SQL片断,"
 "Hibernate也可以处理更为复杂的情况。比如,假若包含历史帐户数据的表定义了"
@@ -791,7 +798,7 @@
 "<literal>effectiveStartDate</literal>字段,按照下面映射:"
 
 #. Tag: programlisting
-#: association_mapping.xml:264
+#: association_mapping.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -806,17 +813,17 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:266
-#, no-c-format
+#: association_mapping.xml:291
+#, fuzzy, no-c-format
 msgid ""
-"Then we can map an association to the <emphasis>current</emphasis> instance "
-"(the one with null <literal>effectiveEndDate</literal>) using:"
+"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)使用这样的关联映射:"
 
 #. Tag: programlisting
-#: association_mapping.xml:271
+#: association_mapping.xml:296
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -828,15 +835,15 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:273
-#, no-c-format
+#: association_mapping.xml:298
+#, fuzzy, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
 "maintained in an <literal>Employment</literal> table full of historical "
-"employment data. Then an association to the employee's <emphasis>most "
-"recent</emphasis> employer (the one with the most recent <literal>startDate</"
-"literal>) might be mapped this way:"
+"employment data. An association to the employee's <emphasis>most recent</"
+"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>中间表维护的,而中间表中填充"
@@ -844,7 +851,7 @@
 "就是<literal>startDate</literal>最后的那个)可以这样映射:"
 
 #. Tag: programlisting
-#: association_mapping.xml:281
+#: association_mapping.xml:306
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -862,10 +869,10 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:283
-#, no-c-format
+#: association_mapping.xml:308
+#, fuzzy, no-c-format
 msgid ""
-"You can get quite creative with this functionality, but it is usually more "
-"practical to handle these kinds of cases using HQL or a criteria query."
+"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或条件查询来处理这些情形。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/basic_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/basic_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/basic_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,12 +24,12 @@
 
 #. Tag: para
 #: basic_mapping.xml:34
-#, no-c-format
+#, fuzzy, 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, not table declarations."
+"persistent class declarations and not table declarations."
 msgstr ""
 "对象和关系数据库之间的映射通常是用一个XML文档(XML document)来定义的。这个映射"
 "文档被设计为易读的, 并且可以手工修改。映射语言是以Java为中心,这意味着映射文"
@@ -37,19 +37,19 @@
 
 #. Tag: para
 #: basic_mapping.xml:41
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that, even though many Hibernate users choose to write the XML by hand, "
-"a number of tools exist to generate the mapping document, including XDoclet, "
-"Middlegen and AndroMDA."
+"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。"
 
 #. Tag: para
 #: basic_mapping.xml:47
-#, no-c-format
-msgid "Lets kick off with an example mapping:"
+#, fuzzy, no-c-format
+msgid "Here is an example mapping:"
 msgstr "让我们从一个映射的例子开始:"
 
 #. Tag: programlisting
@@ -124,13 +124,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
-"describe the document elements and attributes that are used by Hibernate at "
-"runtime. The mapping document also contains some extra optional attributes "
-"and elements that affect the database schemas exported by the schema export "
-"tool. (For example the <literal> not-null</literal> attribute.)"
+"describe, however, the document elements and attributes that are used by "
+"Hibernate at runtime. The mapping document also contains some extra optional "
+"attributes and elements that affect the database schemas exported by the "
+"schema export tool (for example, the <literal> not-null</literal> attribute)."
 msgstr ""
 "我们现在开始讨论映射文档的内容。我们只描述Hibernate在运行时用到的文档元素和属"
 "性。 映射文档还包括一些额外的可选属性和元素,它们在使用schema导出工具的时候会"
@@ -144,14 +144,14 @@
 
 #. Tag: para
 #: basic_mapping.xml:66
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"All XML mappings should declare the doctype shown. The actual DTD may be "
+"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/"
-"hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernate will "
-"always look for the DTD in its classpath first. If you experience lookups of "
-"the DTD using an Internet connection, check your DTD declaration against the "
-"contents of your claspath."
+"hibernate </literal>, or in <literal>hibernate3.jar</literal>. Hibernate "
+"will always look for the DTD in its classpath first. If you experience "
+"lookups of the DTD using an Internet connection, check the DTD declaration "
+"against the contents of your classpath."
 msgstr ""
 "所有的XML映射都需要定义如上所示的doctype。DTD可以从上述URL中获取, 也可以从"
 "<literal>hibernate-x.x.x/src/net/sf/hibernate</literal>目录中、 或"
@@ -167,14 +167,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:77
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
-"classpath. The manner in which it does this is by registering a custom "
-"<literal>org.xml.sax.EntityResolver</literal> implementation with the "
-"SAXReader it uses to read in the xml files. This custom "
-"<literal>EntityResolver</literal> recognizes two different systemId "
-"namespaces."
+"Hibernate will first attempt to resolve DTDs in its classpath. It does this "
+"is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
+"implementation with the SAXReader it uses to read in the xml files. This "
+"custom <literal>EntityResolver</literal> recognizes two different systemId "
+"namespaces:"
 msgstr ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
 "classpath. The manner in which it does this is by registering a custom "
@@ -188,12 +187,12 @@
 
 #. Tag: para
 #: basic_mapping.xml:85
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId starting with <literal>http://hibernate.sourceforge."
-"net/</literal>; the resolver attempts to resolve these entities via the "
-"classlaoder which loaded the Hibernate classes."
+"encounters a systemId starting with <literal>http://hibernate.sourceforge."
+"net/</literal>. The resolver attempts to resolve these entities via the "
+"classloader which loaded the Hibernate classes."
 msgstr ""
 "若resolver遇到了一个以<literal>http://hibernate.sourceforge.net/</literal>为"
 "开头的systemId,它会辨认出是<literal>hibernate namespace</literal>,resolver"
@@ -201,11 +200,11 @@
 
 #. Tag: para
 #: basic_mapping.xml:94
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
-"encounteres a systemId using a <literal>classpath://</literal> URL protocol; "
-"the resolver will attempt to resolve these entities via (1) the current "
+"encounters a systemId using a <literal>classpath://</literal> URL protocol. "
+"The resolver will attempt to resolve these entities via (1) the current "
 "thread context classloader and (2) the classloader which loaded the "
 "Hibernate classes."
 msgstr ""
@@ -215,8 +214,8 @@
 
 #. Tag: para
 #: basic_mapping.xml:103
-#, no-c-format
-msgid "An example of utilizing user namespacing:"
+#, fuzzy, no-c-format
+msgid "The following is an example of utilizing user namespacing:"
 msgstr "使用user namespace(用户命名空间)的例子:"
 
 #. Tag: programlisting
@@ -253,23 +252,24 @@
 
 #. Tag: title
 #: basic_mapping.xml:115
-#, no-c-format
-msgid "hibernate-mapping"
+#, fuzzy, no-c-format
+msgid "Hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
 #: basic_mapping.xml:117
-#, no-c-format
+#, fuzzy, 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 "
-"this mapping belong to the named schema and/or catalog. If specified, "
-"tablenames will be qualified by the given schema and catalog names. If "
-"missing, tablenames will be unqualified. The <literal>default-cascade</"
-"literal> attribute specifies what cascade style should be assumed for "
-"properties and collections which do not specify a <literal>cascade</literal> "
-"attribute. The <literal>auto-import</literal> attribute lets us use "
-"unqualified class names in the query language, by default."
+"this mapping belong to the named schema and/or catalog. If they are "
+"specified, tablenames will be qualified by the given schema and catalog "
+"names. If they are missing, tablenames will be unqualified. The "
+"<literal>default-cascade</literal> attribute specifies what cascade style "
+"should be assumed for properties and collections that do not specify a "
+"<literal>cascade</literal> attribute. By default, the <literal>auto-import</"
+"literal> attribute allows you to use unqualified class names in the query "
+"language."
 msgstr ""
 "这个元素包括一些可选的属性。<literal>schema</literal>和<literal>catalog</"
 "literal>属性, 指明了这个映射所连接(refer)的表所在的schema和/或catalog名"
@@ -296,33 +296,33 @@
 
 #. Tag: para
 #: basic_mapping.xml:141
-#, no-c-format
-msgid "<literal>schema</literal> (optional): The name of a database schema."
+#, fuzzy, no-c-format
+msgid "<literal>schema</literal> (optional): the name of a database schema."
 msgstr "<literal>schema</literal> (可选): 数据库schema的名称。"
 
 #. Tag: para
 #: basic_mapping.xml:146
-#, no-c-format
-msgid "<literal>catalog</literal> (optional): The name of a database catalog."
+#, fuzzy, no-c-format
+msgid "<literal>catalog</literal> (optional): the name of a database catalog."
 msgstr "<literal>catalog</literal> (可选): 数据库catalog的名称。"
 
 #. Tag: para
 #: basic_mapping.xml:151
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
-"literal>): A default cascade style."
+"literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal> (可选 - 默认为 <literal>none</literal>): "
 "默认的级联风格。"
 
 #. Tag: para
 #: basic_mapping.xml:157
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing all properties. "
-"Can be a custom implementation of <literal>PropertyAccessor</literal>."
+"literal>): the strategy Hibernate should use for accessing all properties. "
+"It can be a custom implementation of <literal>PropertyAccessor</literal>."
 msgstr ""
 "<literal>default-access</literal> (可选 - 默认为 <literal>property</"
 "literal>): Hibernate用来访问所有属性的策略。可以通过实现"
@@ -330,10 +330,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:164
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
-"literal>): The default value for unspecifed <literal>lazy</literal> "
+"literal>): the default value for unspecified <literal>lazy</literal> "
 "attributes of class and collection mappings."
 msgstr ""
 "<literal>default-lazy</literal> (可选 - 默认为 <literal>true</literal>): 指定"
@@ -342,32 +342,32 @@
 
 #. Tag: para
 #: basic_mapping.xml:171
-#, no-c-format
+#, fuzzy, 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."
+"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
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>package</literal> (optional): Specifies a package prefix to assume "
-"for unqualified class names in the mapping document."
+"<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
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you have two persistent classes with the same (unqualified) name, you "
-"should set <literal>auto-import=\"false\"</literal>. Hibernate will throw an "
-"exception if you attempt to assign two classes to the same \"imported\" name."
+"If you have two persistent classes with the same unqualified name, you "
+"should set <literal>auto-import=\"false\"</literal>. An exception will "
+"result if you attempt to assign two classes to the same \"imported\" name."
 msgstr ""
 "假若你有两个持久化类,它们的非全限定名是一样的(就是两个类的名字一样,所在的"
 "包不一样--译者注), 你应该设置<literal>auto-import=\"false\"</literal>。如果"
@@ -375,13 +375,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:192
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>hibernate-mapping</literal> element allows you to "
-"nest several persistent <literal>&lt;class&gt;</literal> mappings, as shown "
-"above. It is however good practice (and expected by some tools) to map only "
-"a single persistent class (or a single class hierarchy) in one mapping file "
-"and name it after the persistent superclass, e.g. <literal>Cat.hbm.xml</"
+"The <literal>hibernate-mapping</literal> element allows you to nest several "
+"persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
+"however, good practice (and expected by some tools) to map only a single "
+"persistent class, or a single class hierarchy, in one mapping file and name "
+"it after the persistent superclass. For example, <literal>Cat.hbm.xml</"
 "literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, "
 "<literal>Animal.hbm.xml</literal>."
 msgstr ""
@@ -393,16 +393,16 @@
 
 #. Tag: title
 #: basic_mapping.xml:205
-#, no-c-format
-msgid "<title>class</title>"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "class"
 
 #. Tag: para
 #: basic_mapping.xml:207
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may declare a persistent class using the <literal>class</literal> "
-"element:"
+"You can declare a persistent class using the <literal>class</literal> "
+"element. For example:"
 msgstr "你可以使用<literal>class</literal>元素来定义一个持久化类:"
 
 #. Tag: programlisting
@@ -437,10 +437,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:238
-#, no-c-format
+#, fuzzy, 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 "
+"<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全限定名。 如果这个"
@@ -448,20 +448,20 @@
 
 #. Tag: para
 #: basic_mapping.xml:245
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
-"name): The name of its database table."
+"name): the name of its database table."
 msgstr ""
 "<literal>table</literal> (可选 - 默认是类的非全限定名): 对应的数据库表名。"
 
 #. Tag: para
 #: basic_mapping.xml:251
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses, used for polymorphic "
-"behaviour. Acceptable values include <literal>null</literal> and "
+"name): a value that distinguishes individual subclasses that is used for "
+"polymorphic behavior. Acceptable values include <literal>null</literal> and "
 "<literal>not null</literal>."
 msgstr ""
 "<literal>discriminator-value</literal> (可选 - 默认和类名一样): 一个用于区分"
@@ -470,19 +470,19 @@
 
 #. Tag: para
 #: basic_mapping.xml:258
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
-"Specifies that instances of the class are (not) mutable."
+"<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:2228
+#: basic_mapping.xml:264 basic_mapping.xml:2231
 #, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional): Override the schema name specified by "
+"<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -493,10 +493,10 @@
 "literal>元素指定的模式名称。"
 
 #. Tag: para
-#: basic_mapping.xml:270 basic_mapping.xml:2234
+#: basic_mapping.xml:270 basic_mapping.xml:2237
 #, fuzzy, no-c-format
 msgid ""
-"<literal>catalog</literal> (optional): Override the catalog name specified "
+"<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -508,21 +508,21 @@
 
 #. Tag: para
 #: basic_mapping.xml:276
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
-"initializing proxies. You may specify the name of the class itself."
+"<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> (可选): 指定一个接口,在延迟装载时作为代理使用。 你"
 "可以在这里使用该类自己的名字。"
 
 #. Tag: para
 #: basic_mapping.xml:282
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>UPDATE</literal> SQL should be generated "
-"at runtime and contain only those columns whose values have changed."
+"<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
+"at runtime and can contain only those columns whose values have changed."
 msgstr ""
 "<literal>dynamic-update</literal> (可选, 默认为 <literal>false</literal>): 指"
 "定用于<literal>UPDATE</literal> 的SQL将会在运行时动态生成,并且只更新那些改变"
@@ -530,10 +530,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:289
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
-"literal>): Specifies that <literal>INSERT</literal> SQL should be generated "
+"<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
+"literal>): specifies that <literal>INSERT</literal> SQL should be generated "
 "at runtime and contain only the columns whose values are not null."
 msgstr ""
 "<literal>dynamic-insert</literal> (可选, 默认为 <literal>false</literal>): 指"
@@ -542,16 +542,15 @@
 
 #. Tag: para
 #: basic_mapping.xml:296
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>select-before-update</literal> (optional, defaults to "
-"<literal>false</literal>): Specifies that Hibernate should <emphasis>never</"
+"<literal>select-before-update</literal> (optional - defaults to "
+"<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
 "emphasis> perform an SQL <literal>UPDATE</literal> unless it is certain that "
-"an object is actually modified. In certain cases (actually, only when a "
-"transient object has been associated with a new session using <literal>update"
-"()</literal>), this means that Hibernate will perform an extra SQL "
-"<literal>SELECT</literal> to determine if an <literal>UPDATE</literal> is "
-"actually required."
+"an object is actually modified. Only when a transient object has been "
+"associated with a new session using <literal>update()</literal>, will "
+"Hibernate perform an extra SQL <literal>SELECT</literal> to determine if an "
+"<literal>UPDATE</literal> is actually required."
 msgstr ""
 "<literal>select-before-update</literal> (可选, 默认为 <literal>false</"
 "literal>): 指定Hibernate除非确定对象真正被修改了(如果该值为true-译注),否"
@@ -563,10 +562,10 @@
 
 #. Tag: para
 #: basic_mapping.xml:306
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
-"literal>): Determines whether implicit or explicit query polymorphism is "
+"<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
+"literal>): determines whether implicit or explicit query polymorphism is "
 "used."
 msgstr ""
 "<literal>polymorphism(多态)</literal> (可选, 默认值为 <literal>implicit (隐"
@@ -575,19 +574,20 @@
 
 #. Tag: para
 #: basic_mapping.xml:312
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving objects of this class"
+"<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
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>persister</literal> (optional): Specifies a custom "
+"<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal> (可选): 指定一个定制的<literal>ClassPersister</"
@@ -595,44 +595,45 @@
 
 #. Tag: para
 #: basic_mapping.xml:323
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for fetching instances of this class by identifier."
+"<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\"(批次抓取数量)。"
 
 #. Tag: para
 #: basic_mapping.xml:329
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
-"literal>): Determines the optimistic locking strategy."
+"<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
+"literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock(乐观锁定)</literal> (可选,默认是"
 "<literal>version</literal>): 决定乐观锁定的策略。"
 
 #. Tag: para
 #: basic_mapping.xml:335
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
-"by setting <literal>lazy=\"false\"</literal>."
+"<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)。"
 
 #. Tag: para
 #: basic_mapping.xml:341
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional, defaults to the class name): "
-"Hibernate3 allows a class to be mapped multiple times (to different tables, "
-"potentially), and allows entity mappings that are represented by Maps or XML "
-"at the Java level. In these cases, you should provide an explicit arbitrary "
-"name for the entity. See <xref linkend=\"persistent-classes-dynamicmodels\"/"
-"> and <xref linkend=\"xml\"/> for more information."
+"<literal>entity-name</literal> (optional - defaults to the class name): "
+"Hibernate3 allows a class to be mapped multiple times, potentially to "
+"different tables. It also allows entity mappings that are represented by "
+"Maps or XML at the Java level. In these cases, you should provide an "
+"explicit arbitrary name for the entity. See <xref linkend=\"persistent-"
+"classes-dynamicmodels\"/> and <xref linkend=\"xml\"/> for more information."
 msgstr ""
 "<literal>entity-name</literal> (可选,默认为类名): Hibernate3允许一个类进行多"
 "次映射( 前提是映射到不同的表),并且允许使用Maps或XML代替Java层次的实体映射 "
@@ -641,9 +642,9 @@
 
 #. Tag: para
 #: basic_mapping.xml:351
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>check</literal> (optional): A SQL expression used to generate a "
+"<literal>check</literal> (optional): an SQL expression used to generate a "
 "multi-row <emphasis>check</emphasis> constraint for automatic schema "
 "generation."
 msgstr ""
@@ -652,13 +653,13 @@
 
 #. Tag: para
 #: basic_mapping.xml:357
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
-"databases which support. E.g. on Oracle, Hibernate can use the "
-"<literal>rowid</literal> extra column for fast updates if you set this "
-"option to <literal>rowid</literal>. A ROWID is an implementation detail and "
-"represents the physical location of a stored tuple."
+"<literal>rowid</literal> (optional): Hibernate can use ROWIDs on databases. "
+"On Oracle, for example, Hibernate can use the <literal>rowid</literal> extra "
+"column for fast updates once this option has been set to <literal>rowid</"
+"literal>. A ROWID is an implementation detail and represents the physical "
+"location of a stored tuple."
 msgstr ""
 "<literal>rowid</literal> (可选): Hibernate可以使用数据库支持的所谓的ROWIDs,"
 "例如: Oracle数据库,如果你设置这个可选的<literal>rowid</literal>, Hibernate"
@@ -666,36 +667,36 @@
 "重点, 它代表了一个存储元组(tuple)的物理位置。"
 
 #. Tag: para
-#: basic_mapping.xml:365
-#, no-c-format
+#: basic_mapping.xml:364
+#, fuzzy, no-c-format
 msgid ""
-"<literal>subselect</literal> (optional): Maps an immutable and read-only "
-"entity to a database subselect. Useful if you want to have a view instead of "
-"a base table, but don't. See below for more information."
+"<literal>subselect</literal> (optional): maps an immutable and read-only "
+"entity to a database subselect. This is useful if you want to have a view "
+"instead of a base table. See below for more information."
 msgstr ""
 "<literal>subselect</literal> (可选): 它将一个不可变(immutable)并且只读的实"
 "体映射到一个数据库的 子查询中。当你想用视图代替一张基本表的时候,这是有用的,"
 "但最好不要这样做。更多的介绍请看下面内容。"
 
 #. Tag: para
-#: basic_mapping.xml:372
-#, no-c-format
+#: basic_mapping.xml:371
+#, fuzzy, no-c-format
 msgid ""
-"<literal>abstract</literal> (optional): Used to mark abstract superclasses "
-"in <literal>&lt;union-subclass&gt;</literal> hierarchies."
+"<literal>abstract</literal> (optional): is used to mark abstract "
+"superclasses in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 "<literal>abstract</literal> (可选): 用于在<literal>&lt;union-subclass&gt;</"
 "literal>的继承结构 (hierarchies)中标识抽象超类。"
 
 #. Tag: para
-#: basic_mapping.xml:380
-#, no-c-format
+#: basic_mapping.xml:379
+#, fuzzy, no-c-format
 msgid ""
-"It is perfectly acceptable for the named persistent class to be an "
-"interface. You would then declare implementing classes of that interface "
-"using the <literal>&lt;subclass&gt;</literal> element. You may persist any "
-"<emphasis>static</emphasis> inner class. You should specify the class name "
-"using the standard form ie. <literal>eg.Foo$Bar</literal>."
+"It is acceptable for the named persistent class to be an interface. You can "
+"declare implementing classes of that interface using the <literal>&lt;"
+"subclass&gt;</literal> element. You can persist any <emphasis>static</"
+"emphasis> inner class. Specify the class name using the standard form i.e. "
+"<literal>e.g.Foo$Bar</literal>."
 msgstr ""
 "若指明的持久化类实际上是一个接口,这也是完全可以接受的。 之后你可以用元素"
 "<literal>&lt;subclass&gt;</literal>来指定该接口的实际实现类。 你可以持久化任"
@@ -703,10 +704,10 @@
 "定类名,<literal>比如:Foo$Bar</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:387
-#, no-c-format
+#: basic_mapping.xml:386
+#, fuzzy, no-c-format
 msgid ""
-"Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
+"Immutable classes, <literal>mutable=\"false\"</literal>, cannot be updated "
 "or deleted by the application. This allows Hibernate to make some minor "
 "performance optimizations."
 msgstr ""
@@ -714,36 +715,36 @@
 "这可以让Hibernate做一些小小的性能优化。"
 
 #. Tag: para
-#: basic_mapping.xml:392
-#, no-c-format
+#: basic_mapping.xml:391
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
 "of persistent instances of the class. Hibernate will initially return CGLIB "
-"proxies which implement the named interface. The actual persistent object "
-"will be loaded when a method of the proxy is invoked. See \"Initializing "
-"collections and proxies\" below."
+"proxies that implement the named interface. The persistent object will load "
+"when a method of the proxy is invoked. See \"Initializing collections and "
+"proxies\" below."
 msgstr ""
 "可选的<literal>proxy</literal>属性允许延迟加载类的持久化实例。 Hibernate开始"
 "会返回实现了这个命名接口的CGLIB代理。当代理的某个方法被实际调用的时候, 真实"
 "的持久化对象才会被装载。参见下面的“用于延迟装载的代理”。"
 
 #. Tag: para
-#: basic_mapping.xml:399
-#, no-c-format
+#: basic_mapping.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
 "will be returned by a query that names any superclass or implemented "
-"interface or the class and that instances of any subclass of the class will "
-"be returned by a query that names the class itself. <emphasis>Explicit</"
+"interface or class, and that instances of any subclass of the class will be "
+"returned by a query that names the class itself. <emphasis>Explicit</"
 "emphasis> polymorphism means that class instances will be returned only by "
-"queries that explicitly name that class and that queries that name the class "
-"will return only instances of subclasses mapped inside this <literal>&lt;"
-"class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
-"<literal>&lt;joined-subclass&gt;</literal>. For most purposes the default, "
-"<literal>polymorphism=\"implicit\"</literal>, is appropriate. Explicit "
+"queries that explicitly name that class. Queries that name the class will "
+"return only instances of subclasses mapped inside this <literal>&lt;class&gt;"
+"</literal> declaration as a <literal>&lt;subclass&gt;</literal> or "
+"<literal>&lt;joined-subclass&gt;</literal>. For most purposes, the default "
+"<literal>polymorphism=\"implicit\"</literal> is appropriate. Explicit "
 "polymorphism is useful when two different classes are mapped to the same "
-"table (this allows a \"lightweight\" class that contains a subset of the "
-"table columns)."
+"table This allows a \"lightweight\" class that contains a subset of the "
+"table columns."
 msgstr ""
 "<emphasis>Implicit</emphasis> (隐式)的多态是指,如果查询时给出的是任何超类、"
 "该类实现的接口或者该类的 名字,都会返回这个类的实例;如果查询中给出的是子类的"
@@ -756,17 +757,17 @@
 "型”的类,只包含部分表字段)。"
 
 #. Tag: para
-#: basic_mapping.xml:411
-#, no-c-format
+#: basic_mapping.xml:410
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
-"persistence strategy used for the class. You may, for example, specify your "
-"own subclass of <literal>org.hibernate.persister.EntityPersister</literal> "
-"or you might even provide a completely new implementation of the interface "
-"<literal>org.hibernate.persister.ClassPersister</literal> that implements "
-"persistence via, for example, stored procedure calls, serialization to flat "
+"persistence strategy used for the class. You can, for example, specify your "
+"own subclass of <literal>org.hibernate.persister.EntityPersister</literal>, "
+"or you can even provide a completely new implementation of the interface "
+"<literal>org.hibernate.persister.ClassPersister</literal> that implements, "
+"for example, persistence via stored procedure calls, serialization to flat "
 "files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> for "
-"a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
+"a simple example of \"persistence\" to a <literal>Hashtable</literal>."
 msgstr ""
 "<literal>persister</literal>属性可以让你定制这个类使用的持久化策略。 你可以指"
 "定你自己实现 <literal>org.hibernate.persister.EntityPersister</literal>的子"
@@ -776,15 +777,14 @@
 "literal>,这是一个简单的例子 (“持久化”到一个<literal>Hashtable</literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:422
-#, no-c-format
+#: basic_mapping.xml:421
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
-"literal> settings are not inherited by subclasses and so may also be "
-"specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-"
-"subclass&gt;</literal> elements. These settings may increase performance in "
-"some cases, but might actually decrease performance in others. Use "
-"judiciously."
+"The <literal>dynamic-update</literal> and <literal>dynamic-insert</literal> "
+"settings are not inherited by subclasses, so they can also be specified on "
+"the <literal>&lt;subclass&gt;</literal> or <literal>&lt;joined-subclass&gt;</"
+"literal> elements. Although these settings can increase performance in some "
+"cases, they can actually decrease performance in others."
 msgstr ""
 "请注意<literal>dynamic-update</literal>和<literal>dynamic-insert</literal>的"
 "设置并不会继承到子类, 所以在<literal>&lt;subclass&gt;</literal>或者"
@@ -792,12 +792,12 @@
 "否能够提高效率要视情形而定。请用你的智慧决定是否使用。"
 
 #. Tag: para
-#: basic_mapping.xml:430
-#, no-c-format
+#: basic_mapping.xml:429
+#, fuzzy, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
-"performance. It is very useful to prevent a database update trigger being "
-"called unnecessarily if you reattach a graph of detached instances to a "
+"performance. It is useful to prevent a database update trigger being called "
+"unnecessarily if you reattach a graph of detached instances to a "
 "<literal>Session</literal>."
 msgstr ""
 "使用<literal>select-before-update</literal>通常会降低性能。如果你重新连接一个"
@@ -805,7 +805,7 @@
 "库不必要的触发update。 这就很有用了。"
 
 #. Tag: para
-#: basic_mapping.xml:436
+#: basic_mapping.xml:435
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -814,55 +814,54 @@
 "如果你打开了<literal>dynamic-update</literal>,你可以选择几种乐观锁定的策略:"
 
 #. Tag: para
-#: basic_mapping.xml:442
-#, no-c-format
-msgid "<literal>version</literal> check the version/timestamp columns"
+#: basic_mapping.xml:441
+#, fuzzy, no-c-format
+msgid "<literal>version</literal>: check the version/timestamp columns"
 msgstr "<literal>version(版本检查)</literal> 检查version/timestamp字段"
 
 #. Tag: para
-#: basic_mapping.xml:447
-#, no-c-format
-msgid "<literal>all</literal> check all columns"
+#: basic_mapping.xml:446
+#, fuzzy, no-c-format
+msgid "<literal>all</literal>: check all columns"
 msgstr "<literal>all(全部)</literal> 检查全部字段"
 
 #. Tag: para
-#: basic_mapping.xml:452
-#, no-c-format
+#: basic_mapping.xml:451
+#, fuzzy, no-c-format
 msgid ""
-"<literal>dirty</literal> check the changed columns, allowing some concurrent "
-"updates"
+"<literal>dirty</literal>: check the changed columns, allowing some "
+"concurrent updates"
 msgstr "<literal>dirty(脏检查)</literal>只检察修改过的字段"
 
 #. Tag: para
-#: basic_mapping.xml:457
-#, no-c-format
-msgid "<literal>none</literal> do not use optimistic locking"
+#: basic_mapping.xml:456
+#, fuzzy, no-c-format
+msgid "<literal>none</literal>: do not use optimistic locking"
 msgstr "<literal>none(不检查)</literal>不使用乐观锁定"
 
 #. Tag: para
-#: basic_mapping.xml:462
-#, no-c-format
+#: basic_mapping.xml:461
+#, fuzzy, no-c-format
 msgid ""
-"We <emphasis>very</emphasis> strongly recommend that you use version/"
-"timestamp columns for optimistic locking with Hibernate. This is the optimal "
-"strategy with respect to performance and is the only strategy that correctly "
-"handles modifications made to detached instances (ie. when <literal>Session."
-"merge()</literal> is used)."
+"It is <emphasis>strongly</emphasis> recommended that you use version/"
+"timestamp columns for optimistic locking with Hibernate. This strategy "
+"optimizes performance and correctly handles modifications made to detached "
+"instances (i.e. when <literal>Session.merge()</literal> is used)."
 msgstr ""
 "我们<emphasis>非常</emphasis>强烈建议你在Hibernate中使用version/timestamp字段"
 "来进行乐观锁定。 对性能来说,这是最好的选择,并且这也是唯一能够处理在session"
 "外进行操作的策略(例如: 在使用<literal>Session.merge()</literal>的时候)。"
 
 #. Tag: para
-#: basic_mapping.xml:469
-#, no-c-format
+#: basic_mapping.xml:468
+#, fuzzy, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
-"mapping, as expected this is transparent at the database level (note that "
-"some DBMS don't support views properly, especially with updates). Sometimes "
-"you want to use a view, but can't create one in the database (ie. with a "
-"legacy schema). In this case, you can map an immutable and read-only entity "
-"to a given SQL subselect expression:"
+"mapping. This is transparent at the database level, although some DBMS do "
+"not support views properly, especially with updates. Sometimes you want to "
+"use a view, but you cannot create one in the database (i.e. with a legacy "
+"schema). In this case, you can map an immutable and read-only entity to a "
+"given SQL subselect expression:"
 msgstr ""
 "对Hibernate映射来说视图和表是没有区别的,这是因为它们在数据层都是透明的( 注"
 "意:一些数据库不支持视图属性,特别是更新的时候)。有时你想使用视图,但却不能"
@@ -870,7 +869,7 @@
 "(immutable)并且是 只读的实体到一个给定的SQL子查询表达式:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:477
+#: basic_mapping.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -888,26 +887,26 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:479
-#, no-c-format
+#: basic_mapping.xml:478
+#, fuzzy, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
-"happens correctly, and that queries against the derived entity do not return "
-"stale data. The <literal>&lt;subselect&gt;</literal> is available as both as "
-"an attribute and a nested mapping element."
+"happens correctly and that queries against the derived entity do not return "
+"stale data. The <literal>&lt;subselect&gt;</literal> is available both as an "
+"attribute and a nested mapping element."
 msgstr ""
 "定义这个实体用到的表为同步(synchronize),确保自动刷新(auto-flush)正确执"
 "行, 并且依赖原实体的查询不会返回过期数据。<literal>&lt;subselect&gt;</"
 "literal>在属性元素 和一个嵌套映射元素中都可见。"
 
 #. Tag: title
-#: basic_mapping.xml:489
+#: basic_mapping.xml:488
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:491
+#: basic_mapping.xml:490
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -921,7 +920,7 @@
 "literal> 元素定义了该属性到数据库表主键字段的映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:506
+#: basic_mapping.xml:505
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -937,35 +936,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:509
-#, no-c-format
+#: basic_mapping.xml:508
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional): The name of the identifier property."
+"<literal>name</literal> (optional): the name of the identifier property."
 msgstr "<literal>name</literal> (可选): 标识属性的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:514
+#: basic_mapping.xml:513 basic_mapping.xml:1351
 #, no-c-format
 msgid ""
-"<literal>type</literal> (optional): A name that indicates the Hibernate type."
-msgstr "<literal>type</literal> (可选): 标识Hibernate类型的名字。"
+"<literal>type</literal> (optional): a name that indicates the Hibernate type."
+msgstr "<literal>type</literal> (可选): 一个Hibernate类型的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:519
-#, no-c-format
+#: basic_mapping.xml:518
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the primary key column."
 msgstr "<literal>column</literal> (可选 - 默认为属性名): 主键字段的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:525
-#, no-c-format
+#: basic_mapping.xml:524
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
-"value): An identifier property value that indicates that an instance is "
-"newly instantiated (unsaved), distinguishing it from detached instances that "
-"were saved or loaded in a previous session."
+"value): an identifier property value that indicates an instance is newly "
+"instantiated (unsaved), distinguishing it from detached instances that were "
+"saved or loaded in a previous session."
 msgstr ""
 "<literal>unsaved-value</literal> (可选 - 默认为一个切合实际(sensible)的"
 "值): 一个特定的标识属性值,用来标志该实例是刚刚创建的,尚未保存。 这可以把这"
@@ -973,13 +972,11 @@
 "例区分开来。"
 
 #. Tag: para
-#: basic_mapping.xml:533 basic_mapping.xml:1041 basic_mapping.xml:1180
-#: basic_mapping.xml:1262 basic_mapping.xml:1369 basic_mapping.xml:1558
-#: basic_mapping.xml:1732 basic_mapping.xml:1902 basic_mapping.xml:2481
+#: basic_mapping.xml:532
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the property "
+"literal>): the strategy Hibernate should use for accessing the property "
 "value."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1011,7 +1008,7 @@
 "Hibernate 用来访问属性值的策略。"
 
 #. Tag: para
-#: basic_mapping.xml:541
+#: basic_mapping.xml:540
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1019,7 +1016,7 @@
 msgstr "如果 <literal>name</literal>属性不存在,会认为这个类没有标识属性。"
 
 #. Tag: para
-#: basic_mapping.xml:546
+#: basic_mapping.xml:545
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1027,24 +1024,24 @@
 msgstr "<literal>unsaved-value</literal> 属性在Hibernate3中几乎不再需要。"
 
 #. Tag: para
-#: basic_mapping.xml:550
-#, no-c-format
+#: basic_mapping.xml:549
+#, fuzzy, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
-"to allow access to legacy data with composite keys. We strongly discourage "
-"its use for anything else."
+"that allows access to legacy data with composite keys. Its use is strongly "
+"discouraged for anything else."
 msgstr ""
 "还有一个另外的<literal>&lt;composite-id&gt;</literal>定义可以访问旧式的多主键"
 "数据。 我们强烈不建议使用这种方式。"
 
 #. Tag: title
-#: basic_mapping.xml:556
+#: basic_mapping.xml:555
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:558
+#: basic_mapping.xml:557
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1058,7 +1055,7 @@
 "数, 用<literal>&lt;param&gt;</literal>元素来传递。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:565
+#: basic_mapping.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1070,14 +1067,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:567
+#: basic_mapping.xml:566
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
-"IdentifierGenerator</literal>. This is a very simple interface; some "
-"applications may choose to provide their own specialized implementations. "
-"However, Hibernate provides a range of built-in implementations. There are "
-"shortcut names for the built-in generators:"
+"IdentifierGenerator</literal>. This is a very simple interface. Some "
+"applications can choose to provide their own specialized implementations, "
+"however, Hibernate provides a range of built-in implementations. The "
+"shortcut names for the built-in generators are as follows:"
 msgstr ""
 "所有的生成器都实现<literal>org.hibernate.id.IdentifierGenerator</literal>接"
 "口。 这是一个非常简单的接口;某些应用程序可以选择提供他们自己特定的实现。当"
@@ -1085,13 +1082,13 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:575
+#: basic_mapping.xml:574
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:577
+#: basic_mapping.xml:576
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1104,13 +1101,13 @@
 "用。 <emphasis>在集群下不要使用。</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:586
+#: basic_mapping.xml:585
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:588
+#: basic_mapping.xml:587
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1122,13 +1119,13 @@
 "<literal>int</literal>类型的。"
 
 #. Tag: literal
-#: basic_mapping.xml:596
+#: basic_mapping.xml:595
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:598
+#: basic_mapping.xml:597
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1140,13 +1137,13 @@
 "<literal>short</literal>或者 <literal>int</literal>类型的。"
 
 #. Tag: literal
-#: basic_mapping.xml:606
+#: basic_mapping.xml:605
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:608
+#: basic_mapping.xml:607
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1162,13 +1159,13 @@
 "高位值的来源。 高/低位算法生成的标识符只在一个特定的数据库中是唯一的。"
 
 #. Tag: literal
-#: basic_mapping.xml:618
+#: basic_mapping.xml:617
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:620
+#: basic_mapping.xml:619
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1180,45 +1177,45 @@
 "(sequence)的名字。"
 
 #. Tag: literal
-#: basic_mapping.xml:628
+#: basic_mapping.xml:627
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:630
-#, no-c-format
+#: basic_mapping.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
-"within a network (the IP address is used). The UUID is encoded as a string "
-"of hexadecimal digits of length 32."
+"uses a 128-bit UUID algorithm to generate identifiers of type string that "
+"are unique within a network (the IP address is used). The UUID is encoded as "
+"a string of 32 hexadecimal digits in length."
 msgstr ""
 "用一个128-bit的UUID算法生成字符串类型的标识符, 这在一个网络中是唯一的(使用"
 "了IP地址)。UUID被编码为一个32位16进制数字的字符串。"
 
 #. Tag: literal
-#: basic_mapping.xml:638
+#: basic_mapping.xml:637
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:640
+#: basic_mapping.xml:639
 #, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr "在MS SQL Server 和 MySQL 中使用数据库生成的GUID字符串。"
 
 #. Tag: literal
-#: basic_mapping.xml:646
+#: basic_mapping.xml:645
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:648
-#, no-c-format
+#: basic_mapping.xml:647
+#, fuzzy, no-c-format
 msgid ""
-"picks <literal>identity</literal>, <literal>sequence</literal> or "
+"selects <literal>identity</literal>, <literal>sequence</literal> or "
 "<literal>hilo</literal> depending upon the capabilities of the underlying "
 "database."
 msgstr ""
@@ -1226,47 +1223,47 @@
 "literal> 或者<literal>hilo</literal>中的一个。"
 
 #. Tag: literal
-#: basic_mapping.xml:656
+#: basic_mapping.xml:655
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:658
-#, no-c-format
+#: basic_mapping.xml:657
+#, fuzzy, no-c-format
 msgid ""
-"lets the application to assign an identifier to the object before "
-"<literal>save()</literal> is called. This is the default strategy if no "
-"<literal>&lt;generator&gt;</literal> element is specified."
+"lets the application assign an identifier to the object before <literal>save"
+"()</literal> is called. This is the default strategy if no <literal>&lt;"
+"generator&gt;</literal> element is specified."
 msgstr ""
 "让应用程序在<literal>save()</literal>之前为对象分配一个标示符。这是 "
 "<literal>&lt;generator&gt;</literal>元素没有指定时的默认生成策略。"
 
 #. Tag: literal
-#: basic_mapping.xml:666
+#: basic_mapping.xml:665
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:668
-#, no-c-format
+#: basic_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"retrieves a primary key assigned by a database trigger by selecting the row "
-"by some unique key and retrieving the primary key value."
+"retrieves a primary key, assigned by a database trigger, by selecting the "
+"row by some unique key and retrieving the primary key value."
 msgstr "通过数据库触发器选择一些唯一主键的行并返回主键值来分配一个主键。"
 
 #. Tag: literal
-#: basic_mapping.xml:675
+#: basic_mapping.xml:674
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:677
-#, no-c-format
+#: basic_mapping.xml:676
+#, fuzzy, no-c-format
 msgid ""
-"uses the identifier of another associated object. Usually used in "
+"uses the identifier of another associated object. It is usually used in "
 "conjunction with a <literal>&lt;one-to-one&gt;</literal> primary key "
 "association."
 msgstr ""
@@ -1274,21 +1271,21 @@
 "联合起来使用。"
 
 #. Tag: literal
-#: basic_mapping.xml:684
+#: basic_mapping.xml:683
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:686
-#, no-c-format
+#: basic_mapping.xml:685
+#, fuzzy, no-c-format
 msgid ""
-"a specialized sequence generation strategy which utilizes a database "
-"sequence for the actual value generation, but combines this with JDBC3 "
-"getGeneratedKeys to actually return the generated identifier value as part "
-"of the insert statement execution. This strategy is only known to be "
-"supported on Oracle 10g drivers targetted for JDK 1.4. Note comments on "
-"these insert statements are disabled due to a bug in the Oracle drivers."
+"a specialized sequence generation strategy that utilizes a database sequence "
+"for the actual value generation, but combines this with JDBC3 "
+"getGeneratedKeys to return the generated identifier value as part of the "
+"insert statement execution. This strategy is only supported on Oracle 10g "
+"drivers targeted for JDK 1.4. Comments on these insert statements are "
+"disabled due to a bug in the Oracle drivers."
 msgstr ""
 "一种特别的序列生成策略,使用数据库序列来生成实际值,但将它和JDBC3的"
 "getGeneratedKeys结合在一起,使得在插入语句执行的时候就返回生成的值。目前为止只"
@@ -1297,20 +1294,20 @@
 "statements are disabled due to a bug in the Oracle drivers.)"
 
 #. Tag: title
-#: basic_mapping.xml:703
+#: basic_mapping.xml:702
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "高/低位算法(Hi/Lo Algorithm)"
 
 #. Tag: para
-#: basic_mapping.xml:704
-#, no-c-format
+#: basic_mapping.xml:703
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
-"provide two alternate implementations of the hi/lo algorithm, a favorite "
-"approach to identifier generation. The first implementation requires a "
-"\"special\" database table to hold the next available \"hi\" value. The "
-"second uses an Oracle-style sequence (where supported)."
+"provide two alternate implementations of the hi/lo algorithm. The first "
+"implementation requires a \"special\" database table to hold the next "
+"available \"hi\" value. Where supported, the second uses an Oracle-style "
+"sequence."
 msgstr ""
 "<literal>hilo</literal> 和 <literal>seqhilo</literal>生成器给出了两种hi/lo算"
 "法的实现, 这是一种很令人满意的标识符生成算法。第一种实现需要一个“特殊”的数据"
@@ -1318,7 +1315,7 @@
 "情况下)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:711
+#: basic_mapping.xml:710
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1331,7 +1328,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:713
+#: basic_mapping.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1343,53 +1340,53 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:715
-#, no-c-format
+#: basic_mapping.xml:714
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
-"<literal>Connection</literal> to Hibernate. When Hibernate is using an "
+"Unfortunately, you cannot use <literal>hilo</literal> when supplying your "
+"own <literal>Connection</literal> to Hibernate. When Hibernate uses an "
 "application server datasource to obtain connections enlisted with JTA, you "
-"must properly configure the <literal>hibernate.transaction."
-"manager_lookup_class</literal>."
+"must configure the <literal>hibernate.transaction.manager_lookup_class</"
+"literal>."
 msgstr ""
 "很不幸,你在为Hibernate自行提供<literal>Connection</literal>时无法使用"
 "<literal>hilo</literal>。 当Hibernate使用JTA获取应用服务器的数据源连接时,你必"
 "须正确地配置 <literal>hibernate.transaction.manager_lookup_class</literal>。"
 
 #. Tag: title
-#: basic_mapping.xml:724
+#: basic_mapping.xml:723
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID算法(UUID Algorithm )"
 
 #. Tag: para
-#: basic_mapping.xml:725
-#, no-c-format
+#: basic_mapping.xml:724
+#, fuzzy, no-c-format
 msgid ""
-"The UUID contains: IP address, startup time of the JVM (accurate to a "
-"quarter second), system time and a counter value (unique within the JVM). "
-"It's not possible to obtain a MAC address or memory address from Java code, "
-"so this is the best we can do without using JNI."
+"The UUID contains: IP address, startup time of the JVM that is accurate to a "
+"quarter second, system time and a counter value that is unique within the "
+"JVM. It is not possible to obtain a MAC address or memory address from Java "
+"code, so this is the best option without using JNI."
 msgstr ""
 "UUID包含:IP地址,JVM的启动时间(精确到1/4秒),系统时间和一个计数器值(在JVM"
 "中唯一)。 在Java代码中不可能获得MAC地址或者内存地址,所以这已经是我们在不使"
 "用JNI的前提下的能做的最好实现了。"
 
 #. Tag: title
-#: basic_mapping.xml:734
+#: basic_mapping.xml:733
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "标识字段和序列(Identity columns and Sequences)"
 
 #. Tag: para
-#: basic_mapping.xml:735
-#, no-c-format
+#: basic_mapping.xml:734
+#, fuzzy, no-c-format
 msgid ""
-"For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
-"you may use <literal>identity</literal> key generation. For databases that "
+"For databases that support identity columns (DB2, MySQL, Sybase, MS SQL), "
+"you can use <literal>identity</literal> key generation. For databases that "
 "support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP DB) you "
-"may use <literal>sequence</literal> style key generation. Both these "
-"strategies require two SQL queries to insert a new object."
+"can use <literal>sequence</literal> style key generation. Both of these "
+"strategies require two SQL queries to insert a new object. For example:"
 msgstr ""
 "对于内部支持标识字段的数据库(DB2,MySQL,Sybase,MS SQL),你可以使用"
 "<literal>identity</literal>关键字生成。 对于内部支持序列的数据库(DB2,"
@@ -1397,7 +1394,7 @@
 "literal>风格的关键字生成。 这两种方式对于插入一个新的对象都需要两次SQL查询。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:743
+#: basic_mapping.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1408,7 +1405,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:745
+#: basic_mapping.xml:744
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1418,34 +1415,34 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:747
-#, no-c-format
+#: basic_mapping.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"For cross-platform development, the <literal>native</literal> strategy will "
-"choose from the <literal>identity</literal>, <literal>sequence</literal> and "
-"<literal>hilo</literal> strategies, dependant upon the capabilities of the "
-"underlying database."
+"For cross-platform development, the <literal>native</literal> strategy will, "
+"depending on the capabilities of the underlying database, choose from the "
+"<literal>identity</literal>, <literal>sequence</literal> and <literal>hilo</"
+"literal> strategies."
 msgstr ""
 "对于跨平台开发,<literal>native</literal>策略会从<literal>identity</"
 "literal>, <literal>sequence</literal> 和<literal>hilo</literal>中进行选择,选"
 "择哪一个,这取决于底层数据库的支持能力。"
 
 #. Tag: title
-#: basic_mapping.xml:756
+#: basic_mapping.xml:754
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "程序分配的标识符(Assigned Identifiers)"
 
 #. Tag: para
-#: basic_mapping.xml:757
-#, no-c-format
+#: basic_mapping.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"If you want the application to assign identifiers (as opposed to having "
-"Hibernate generate them), you may use the <literal>assigned</literal> "
-"generator. This special generator will use the identifier value already "
-"assigned to the object's identifier property. This generator is used when "
-"the primary key is a natural key instead of a surrogate key. This is the "
-"default behavior if you do no specify a <literal>&lt;generator&gt;</literal> "
+"If you want the application to assign identifiers, as opposed to having "
+"Hibernate generate them, you can use the <literal>assigned</literal> "
+"generator. This special generator uses the identifier value already assigned "
+"to the object's identifier property. The generator is used when the primary "
+"key is a natural key instead of a surrogate key. This is the default "
+"behavior if you do not specify a <literal>&lt;generator&gt;</literal> "
 "element."
 msgstr ""
 "如果你需要应用程序分配一个标示符(而非Hibernate来生成),你可以使用"
@@ -1455,12 +1452,12 @@
 "注)。这是没有指定<literal>&lt;generator&gt;</literal>元素时的默认行为"
 
 #. Tag: para
-#: basic_mapping.xml:766
-#, no-c-format
+#: basic_mapping.xml:764
+#, fuzzy, no-c-format
 msgid ""
-"Choosing the <literal>assigned</literal> generator makes Hibernate use "
-"<literal>unsaved-value=\"undefined\"</literal>, forcing Hibernate to go to "
-"the database to determine if an instance is transient or detached, unless "
+"The <literal>assigned</literal> generator makes Hibernate use "
+"<literal>unsaved-value=\"undefined\"</literal>. This forces Hibernate to go "
+"to the database to determine if an instance is transient or detached, unless "
 "there is a version or timestamp property, or you define <literal>Interceptor."
 "isUnsaved()</literal>."
 msgstr ""
@@ -1470,20 +1467,20 @@
 "来确定一个实例是瞬时的(transient) 还是脱管的(detached)。"
 
 #. Tag: title
-#: basic_mapping.xml:776
+#: basic_mapping.xml:774
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "触发器实现的主键生成器(Primary keys assigned by triggers)"
 
 #. Tag: para
-#: basic_mapping.xml:777
-#, no-c-format
+#: basic_mapping.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"For legacy schemas only (Hibernate does not generate DDL with triggers)."
+"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr "仅仅用于遗留的schema中 (Hibernate不能使用触发器生成DDL)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:781
+#: basic_mapping.xml:779
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1494,35 +1491,35 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:783
-#, no-c-format
+#: basic_mapping.xml:781
+#, fuzzy, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
-"<literal>socialSecurityNumber</literal> defined by the class, as a natural "
-"key, and a surrogate key named <literal>person_id</literal> whose value is "
-"generated by a trigger."
+"<literal>socialSecurityNumber</literal>. It is defined by the class, as a "
+"natural key and a surrogate key named <literal>person_id</literal>, whose "
+"value is generated by a trigger."
 msgstr ""
 "在上面的例子中,类定义了一个命名为<literal>socialSecurityNumber</literal>的唯"
 "一值属性, 它是一个自然键(natural key),命名为<literal>person_id</literal>"
 "的代理键(surrogate key) 的值由触发器生成。"
 
 #. Tag: title
-#: basic_mapping.xml:795
+#: basic_mapping.xml:793
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:797
-#, no-c-format
+#: basic_mapping.xml:795
+#, fuzzy, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
-"is database portability; the second is optimization (not having to query the "
-"database for every request for a new identifier value). These two new "
-"generators are intended to take the place of some of the named generators "
-"described above (starting in 3.3.x); however, they are included in the "
-"current releases and can be referenced by FQN."
+"is database portability; the second is optimization Optimization means that "
+"you do not have to query the database for every request for a new identifier "
+"value. These two new generators are intended to take the place of some of "
+"the named generators described above, starting in 3.3.x. However, they are "
+"included in the current releases and can be referenced by FQN."
 msgstr ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
 "thinking of 2 different aspects of identifier generation. The first aspect "
@@ -1533,24 +1530,25 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:805
+#: basic_mapping.xml:803
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
-"SequenceStyleGenerator</literal> which is intended firstly as a replacement "
-"for the <literal>sequence</literal> generator and secondly as a better "
-"portability generator than <literal>native</literal> (because "
-"<literal>native</literal> (generally) chooses between <literal>identity</"
-"literal> and <literal>sequence</literal> which have largely different "
-"semantics which can cause subtle isssues in applications eyeing "
-"portability). <literal>org.hibernate.id.enhanced.SequenceStyleGenerator</"
-"literal> however achieves portability in a different manner. It chooses "
-"between using a table or a sequence in the database to store its "
-"incrementing values depending on the capabilities of the dialect being used. "
-"The difference between this and <literal>native</literal> is that table-"
-"based and sequence-based storage have the same exact semantic (in fact "
-"sequences are exactly what Hibernate tries to emmulate with its table-based "
-"generators). This generator has a number of configuration parameters:"
+"SequenceStyleGenerator</literal> which is intended, firstly, as a "
+"replacement for the <literal>sequence</literal> generator and, secondly, as "
+"a better portability generator than <literal>native</literal>. This is "
+"because <literal>native</literal> generally chooses between "
+"<literal>identity</literal> and <literal>sequence</literal> which have "
+"largely different semantics that can cause subtle issues in applications "
+"eyeing portability. <literal>org.hibernate.id.enhanced."
+"SequenceStyleGenerator</literal>, however, achieves portability in a "
+"different manner. It chooses between a table or a sequence in the database "
+"to store its incrementing values, depending on the capabilities of the "
+"dialect being used. The difference between this and <literal>native</"
+"literal> is that table-based and sequence-based storage have the same exact "
+"semantic. In fact, sequences are exactly what Hibernate tries to emulate "
+"with its table-based generators. This generator has a number of "
+"configuration parameters:"
 msgstr ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
 "SequenceStyleGenerator</literal> which is intended firstly as a replacement "
@@ -1570,24 +1568,24 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:819
-#, no-c-format
+#: basic_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
-"<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
-"to be used."
+"<literal>hibernate_sequence</literal>): the name of the sequence or table to "
+"be used."
 msgstr ""
 "<literal>sequence_name</literal> (optional, defaults to "
 "<literal>hibernate_sequence</literal>): The name of the sequence (or table) "
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:825
-#, no-c-format
+#: basic_mapping.xml:823
+#, fuzzy, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
-"literal>): The initial value to be retrieved from the sequence/table. In "
-"sequence creation terms, this is analogous to the clause typical named "
+"literal>): the initial value to be retrieved from the sequence/table. In "
+"sequence creation terms, this is analogous to the clause typically named "
 "\"STARTS WITH\"."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1596,13 +1594,13 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:832
-#, no-c-format
+#: basic_mapping.xml:830
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
-"literal>): The value by which subsequent calls to the sequence/table should "
-"differ. In sequence creation terms, this is analogous to the clause typical "
-"named \"INCREMENT BY\"."
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
+"literal>): the value by which subsequent calls to the sequence/table should "
+"differ. In sequence creation terms, this is analogous to the clause "
+"typically named \"INCREMENT BY\"."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the sequence/table should "
@@ -1610,11 +1608,11 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:839
-#, no-c-format
+#: basic_mapping.xml:837
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force_table_use</literal> (optional, defaults to <literal>false</"
-"literal>): Should we force the use of a table as the backing structure even "
+"<literal>force_table_use</literal> (optional - defaults to <literal>false</"
+"literal>): should we force the use of a table as the backing structure even "
 "though the dialect might support sequence?"
 msgstr ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1622,39 +1620,39 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:846
-#, no-c-format
+#: basic_mapping.xml:844
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column</literal> (optional, defaults to <literal>next_val</"
-"literal>): Only relevant for table structures! The name of the column on the "
-"table which is used to hold the value."
+"<literal>value_column</literal> (optional - defaults to <literal>next_val</"
+"literal>): only relevant for table structures, it is the name of the column "
+"on the table which is used to hold the value."
 msgstr ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
 "literal>): Only relevant for table structures! The name of the column on the "
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:853
+#: basic_mapping.xml:851
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal>none</"
+"<literal>optimizer</literal> (optional - defaults to <literal>none</"
 "literal>): See"
 msgstr ""
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: para
-#: basic_mapping.xml:860
+#: basic_mapping.xml:858
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
-"TableGenerator</literal> which is intended firstly as a replacement for the "
-"<literal>table</literal> generator (although it actually functions much more "
-"like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</literal>) and "
-"secondly as a re-implementation of <literal>org.hibernate.id."
-"MultipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable "
-"optimiziers. Essentially this generator defines a table capable of holding a "
-"number of different increment values simultaneously by using multiple "
-"distinctly keyed rows. This generator has a number of configuration "
+"TableGenerator</literal>, which is intended, firstly, as a replacement for "
+"the <literal>table</literal> generator, even though it actually functions "
+"much more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</"
+"literal>, and secondly, as a re-implementation of <literal>org.hibernate.id."
+"MultipleHiLoPerTableGenerator</literal> that utilizes the notion of "
+"pluggable optimizers. Essentially this generator defines a table capable of "
+"holding a number of different increment values simultaneously by using "
+"multiple distinctly keyed rows. This generator has a number of configuration "
 "parameters:"
 msgstr ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1669,21 +1667,21 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:870
-#, no-c-format
+#: basic_mapping.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table_name</literal> (optional, defaults to "
-"<literal>hibernate_sequences</literal>): The name of the table to be used."
+"<literal>table_name</literal> (optional - defaults to "
+"<literal>hibernate_sequences</literal>): the name of the table to be used."
 msgstr ""
 "<literal>table_name</literal> (optional, defaults to "
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:876
-#, no-c-format
+#: basic_mapping.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"<literal>value_column_name</literal> (optional, defaults to "
-"<literal>next_val</literal>): The name of the column on the table which is "
+"<literal>value_column_name</literal> (optional - defaults to "
+"<literal>next_val</literal>): the name of the column on the table that is "
 "used to hold the value."
 msgstr ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1691,13 +1689,13 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:882
-#, no-c-format
+#: basic_mapping.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_column_name</literal> (optional, defaults to "
-"<literal>sequence_name</literal>): The name of the column on the table which "
-"is used to hold the \"segement key\". This is the value which distinctly "
-"identifies which increment value to use."
+"<literal>segment_column_name</literal> (optional - defaults to "
+"<literal>sequence_name</literal>): the name of the column on the table that "
+"is used to hold the \"segment key\". This is the value which identifies "
+"which increment value to use."
 msgstr ""
 "<literal>segment_column_name</literal> (optional, defaults to "
 "<literal>sequence_name</literal>): The name of the column on the table which "
@@ -1705,10 +1703,10 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:889
-#, no-c-format
+#: basic_mapping.xml:887
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value</literal> (optional, defaults to <literal>default</"
+"<literal>segment_value</literal> (optional - defaults to <literal>default</"
 "literal>): The \"segment key\" value for the segment from which we want to "
 "pull increment values for this generator."
 msgstr ""
@@ -1717,62 +1715,63 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:896
-#, no-c-format
+#: basic_mapping.xml:894
+#, fuzzy, no-c-format
 msgid ""
-"<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
-"literal>): Used for schema generation; the column size to create this "
-"segment key column."
+"<literal>segment_value_length</literal> (optional - defaults to "
+"<literal>255</literal>): Used for schema generation; the column size to "
+"create this segment key column."
 msgstr ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
 "literal>): Used for schema generation; the column size to create this "
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:902
-#, no-c-format
+#: basic_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"<literal>initial_value</literal> (optional, defaults to <literal>1</"
+"<literal>initial_value</literal> (optional - defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 msgstr ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:908
-#, no-c-format
+#: basic_mapping.xml:906
+#, fuzzy, no-c-format
 msgid ""
-"<literal>increment_size</literal> (optional, defaults to <literal>1</"
+"<literal>increment_size</literal> (optional - defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 msgstr ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:914
+#: basic_mapping.xml:912
 #, fuzzy, no-c-format
 msgid ""
-"<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
+"<literal>optimizer</literal> (optional - defaults to <literal></literal>): "
+"See"
 msgstr ""
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: title
-#: basic_mapping.xml:924
+#: basic_mapping.xml:922
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:925
+#: basic_mapping.xml:923
 #, fuzzy, no-c-format
 msgid ""
-"For identifier generators which store values in the database, it is "
+"For identifier generators that store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
-"a new identifier value. Instead, you'd ideally want to group a bunch of them "
-"in memory and only hit the database when you have exhausted your in-memory "
-"value group. This is the role of the pluggable optimizers. Currently only "
-"the two enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced"
-"\"/> support this notion."
+"a new identifier value. Instead, you can group a bunch of them in memory and "
+"only hit the database when you have exhausted your in-memory value group. "
+"This is the role of the pluggable optimizers. Currently only the two "
+"enhanced generators (<xref linkend=\"mapping-declaration-id-enhanced\"/> "
+"support this operation."
 msgstr ""
 "For identifier generators which store values in the database, it is "
 "inefficient for them to hit the database on each and every call to generate "
@@ -1783,11 +1782,11 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:933
-#, no-c-format
+#: basic_mapping.xml:931
+#, fuzzy, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
-"specified): This says to not perform any optimizations, and hit the database "
+"specified): this will not perform any optimizations and hit the database for "
 "each and every request."
 msgstr ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1795,13 +1794,13 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:939
-#, no-c-format
+#: basic_mapping.xml:937
+#, fuzzy, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
 "retrieved values. The values from the database for this optimizer are "
 "expected to be sequential. The values retrieved from the database structure "
-"for this optimizer indicates the \"group number\"; the "
+"for this optimizer indicates the \"group number\". The "
 "<literal>increment_size</literal> is multiplied by that value in memory to "
 "define a group \"hi value\"."
 msgstr ""
@@ -1813,15 +1812,15 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:948
-#, no-c-format
+#: basic_mapping.xml:946
+#, fuzzy, no-c-format
 msgid ""
-"<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
-"this optimizers attempts to minimize the number of hits to the database. "
-"Here, however, we simply store the starting value for the \"next group\" "
-"into the database structure rather than a sequential value in combination "
-"with an in-memory grouping algorithm. <literal>increment_size</literal> here "
-"refers to the values coming from the database."
+"<literal>pooled</literal>: as with the case of <literal>hilo</literal>, this "
+"optimizer attempts to minimize the number of hits to the database. Here, "
+"however, we simply store the starting value for the \"next group\" into the "
+"database structure rather than a sequential value in combination with an in-"
+"memory grouping algorithm. Here, <literal>increment_size</literal> refers to "
+"the values coming from the database."
 msgstr ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
 "this optimizers attempts to minimize the number of hits to the database. "
@@ -1831,13 +1830,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:961
+#: basic_mapping.xml:959
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:963
+#: basic_mapping.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1856,10 +1855,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:965
-#, no-c-format
+#: basic_mapping.xml:963
+#, fuzzy, no-c-format
 msgid ""
-"For a table with a composite key, you may map multiple properties of the "
+"A table with a composite key can be mapped with multiple properties of the "
 "class as identifier properties. The <literal>&lt;composite-id&gt;</literal> "
 "element accepts <literal>&lt;key-property&gt;</literal> property mappings "
 "and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elements."
@@ -1869,7 +1868,7 @@
 "性映射和<literal>&lt;key-many-to-one&gt;</literal>属性映射作为子元素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:972
+#: basic_mapping.xml:970
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -1879,28 +1878,28 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:974
-#, no-c-format
+#: basic_mapping.xml:972
+#, fuzzy, no-c-format
 msgid ""
-"Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
+"The persistent class <emphasis>must</emphasis> override <literal>equals()</"
 "literal> and <literal>hashCode()</literal> to implement composite identifier "
-"equality. It must also implements <literal>Serializable</literal>."
+"equality. It must also implement <literal>Serializable</literal>."
 msgstr ""
 "你的持久化类<emphasis>必须</emphasis>重载<literal>equals()</literal>和 "
 "<literal>hashCode()</literal>方法,来实现组合的标识符的相等判断。 实现"
 "<literal>Serializable</literal>接口也是必须的。"
 
 #. Tag: para
-#: basic_mapping.xml:980
-#, no-c-format
+#: basic_mapping.xml:978
+#, fuzzy, no-c-format
 msgid ""
-"Unfortunately, this approach to composite identifiers means that a "
-"persistent object is its own identifier. There is no convenient \"handle\" "
-"other than the object itself. You must instantiate an instance of the "
-"persistent class itself and populate its identifier properties before you "
-"can <literal>load()</literal> the persistent state associated with a "
-"composite key. We call this approach an <emphasis>embedded</emphasis> "
-"composite identifier, and discourage it for serious applications."
+"Unfortunately, this approach means that a persistent object is its own "
+"identifier. There is no convenient \"handle\" other than the object itself. "
+"You must instantiate an instance of the persistent class itself and populate "
+"its identifier properties before you can <literal>load()</literal> the "
+"persistent state associated with a composite key. We call this approach an "
+"<emphasis>embedded</emphasis> composite identifier, and discourage it for "
+"serious applications."
 msgstr ""
 "不幸的是,这种组合关键字的方法意味着一个持久化类是它自己的标识。除了对象自己"
 "之外, 没有什么方便的“把手”可用。你必须初始化持久化类的实例,填充它的标识符属"
@@ -1909,7 +1908,7 @@
 "这种用法。"
 
 #. Tag: para
-#: basic_mapping.xml:989
+#: basic_mapping.xml:987
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -1922,7 +1921,7 @@
 "属性不但在持久化类出现,还形成一个独立的标识符类。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:995
+#: basic_mapping.xml:993
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -1932,16 +1931,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:997
-#, no-c-format
+#: basic_mapping.xml:995
+#, fuzzy, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
 "literal>, and the entity class itself have properties named "
 "<literal>medicareNumber</literal> and <literal>dependent</literal>. The "
 "identifier class must override <literal>equals()</literal> and "
-"<literal>hashCode()</literal> and implement. <literal>Serializable</"
-"literal>. The disadvantage of this approach is quite obvious&mdash;code "
-"duplication."
+"<literal>hashCode()</literal> and implement <literal>Serializable</literal>. "
+"The main disadvantage of this approach is code duplication."
 msgstr ""
 "在这个例子中,组合标识符类<literal>MedicareId</literal>和实体类都含有"
 "<literal>medicareNumber</literal>和<literal>dependent</literal>属性。标识符类"
@@ -1949,17 +1947,17 @@
 "<literal>Serializable</literal>接口。这种方法的缺点是出现了明显的代码重复。"
 
 #. Tag: para
-#: basic_mapping.xml:1006
+#: basic_mapping.xml:1004
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
 msgstr "下面列出的属性是用来指定一个映射式组合标识符的:"
 
 #. Tag: para
-#: basic_mapping.xml:1012
-#, no-c-format
+#: basic_mapping.xml:1010
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
+"<literal>mapped</literal> (optional - defaults to <literal>false</literal>): "
 "indicates that a mapped composite identifier is used, and that the contained "
 "property mappings refer to both the entity class and the composite "
 "identifier class."
@@ -1968,20 +1966,20 @@
 "个映射式组合标识符,其包含的属性映射同时在实体类和组合标识符类中出现。"
 
 #. Tag: para
-#: basic_mapping.xml:1020
-#, no-c-format
+#: basic_mapping.xml:1018
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal> (optional, but required for a mapped composite "
-"identifier): The class used as a composite identifier."
+"<literal>class</literal> (optional - but required for a mapped composite "
+"identifier): the class used as a composite identifier."
 msgstr ""
 "<literal>class</literal> (可选,但对映射式组合标识符必须指定): 作为组合标识符"
 "类使用的类名."
 
 #. Tag: para
-#: basic_mapping.xml:1027
-#, no-c-format
+#: basic_mapping.xml:1025
+#, fuzzy, no-c-format
 msgid ""
-"We will describe a third, even more convenient approach where the composite "
+"We will describe a third, even more convenient approach, where the composite "
 "identifier is implemented as a component class in <xref linkend=\"components-"
 "compositeid\"/>. The attributes described below apply only to this "
 "alternative approach:"
@@ -1991,51 +1989,89 @@
 "三种方法有效:"
 
 #. Tag: para
-#: basic_mapping.xml:1035
-#, no-c-format
+#: basic_mapping.xml:1033
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal> (optional, required for this approach): A property "
-"of component type that holds the composite identifier (see chapter 9)."
+"<literal>name</literal> (optional - required for this approach): a property "
+"of component type that holds the composite identifier. Please see chapter 9 "
+"for more information."
 msgstr ""
 "<literal>name</literal> (可选,但对这种方法而言必须): 包含此组件标识符的组件类"
 "型的名字 (参阅第9章)."
 
 #. Tag: para
-#: basic_mapping.xml:1047
-#, no-c-format
+#: basic_mapping.xml:1039 basic_mapping.xml:1260 basic_mapping.xml:1372
+#: basic_mapping.xml:1561 basic_mapping.xml:1735 basic_mapping.xml:1905
+#: basic_mapping.xml:2484
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses for accessing the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认为<literal>property</literal>): "
+"Hibernate用来访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认为<literal>property</literal>): "
+"Hibernate应该使用的访问此属性值的策略\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用于访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用于访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认值为 <literal>property</literal>): "
+"Hibernate用来访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 -默认是 <literal>property</literal>): "
+"Hibernate 用来访问属性值的策略。"
+
+#. Tag: para
+#: basic_mapping.xml:1045
+#, fuzzy, no-c-format
+msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The component class used as a composite "
-"identifier (see next section)."
+"determined by reflection): the component class used as a composite "
+"identifier. Please see the next section for more information."
 msgstr ""
 "<literal>class</literal> (可选 - 默认会用反射来自动判定属性类型 ): 用来作为组"
 "合标识符的组件类的类名(参阅下一节)"
 
 #. Tag: para
-#: basic_mapping.xml:1054
-#, no-c-format
+#: basic_mapping.xml:1052
+#, fuzzy, no-c-format
 msgid ""
-"This third approach, an <emphasis>identifier component</emphasis> is the one "
-"we recommend for almost all applications."
+"The third approach, an <emphasis>identifier component</emphasis>, is "
+"recommended for almost all applications."
 msgstr ""
 "第三种方式,被称为<emphasis>identifier component(标识符组件)</emphasis>是我们"
 "对几乎所有应用都推荐使用的方式。"
 
 #. Tag: title
-#: basic_mapping.xml:1062
-#, no-c-format
-msgid "discriminator"
+#: basic_mapping.xml:1060
+#, fuzzy, no-c-format
+msgid "Discriminator"
 msgstr "鉴别器(discriminator)"
 
 #. Tag: para
-#: basic_mapping.xml:1064
-#, no-c-format
+#: basic_mapping.xml:1062
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
-"polymorphic persistence using the table-per-class-hierarchy mapping strategy "
-"and declares a discriminator column of the table. The discriminator column "
-"contains marker values that tell the persistence layer what subclass to "
-"instantiate for a particular row. A restricted set of types may be used: "
+"polymorphic persistence using the table-per-class-hierarchy mapping "
+"strategy. It declares a discriminator column of the table. The discriminator "
+"column contains marker values that tell the persistence layer what subclass "
+"to instantiate for a particular row. A restricted set of types can be used: "
 "<literal>string</literal>, <literal>character</literal>, <literal>integer</"
 "literal>, <literal>byte</literal>, <literal>short</literal>, "
 "<literal>boolean</literal>, <literal>yes_no</literal>, <literal>true_false</"
@@ -2050,7 +2086,7 @@
 "<literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1082
+#: basic_mapping.xml:1080
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2063,44 +2099,44 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1085
-#, no-c-format
+#: basic_mapping.xml:1083
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to <literal>class</literal>) "
+"<literal>column</literal> (optional - defaults to <literal>class</literal>): "
 "the name of the discriminator column."
 msgstr ""
 "<literal>column</literal> (可选 - 默认为 <literal>class</literal>) 鉴别器字段"
 "的名字"
 
 #. Tag: para
-#: basic_mapping.xml:1091
-#, no-c-format
+#: basic_mapping.xml:1089
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
-"name that indicates the Hibernate type"
+"<literal>type</literal> (optional - defaults to <literal>string</literal>): "
+"a name that indicates the Hibernate type"
 msgstr ""
 "<literal>type</literal> (可选 - 默认为 <literal>string</literal>) 一个"
 "Hibernate字段类型的名字"
 
 #. Tag: para
-#: basic_mapping.xml:1097
-#, no-c-format
+#: basic_mapping.xml:1095
+#, fuzzy, no-c-format
 msgid ""
-"<literal>force</literal> (optional - defaults to <literal>false</literal>) "
-"\"force\" Hibernate to specify allowed discriminator values even when "
+"<literal>force</literal> (optional - defaults to <literal>false</literal>): "
+"\"forces\" Hibernate to specify the allowed discriminator values, even when "
 "retrieving all instances of the root class."
 msgstr ""
 "<literal>force(强制)</literal> (可选 - 默认为 <literal>false</literal>) \"强"
 "制\"Hibernate指定允许的鉴别器值,即使当取得的所有实例都是根类的。"
 
 #. Tag: para
-#: basic_mapping.xml:1104
-#, no-c-format
+#: basic_mapping.xml:1102
+#, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
+"<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
 "set this to <literal>false</literal> if your discriminator column is also "
-"part of a mapped composite identifier. (Tells Hibernate to not include the "
-"column in SQL <literal>INSERT</literal>s.)"
+"part of a mapped composite identifier. It tells Hibernate not to include the "
+"column in SQL <literal>INSERTs</literal>."
 msgstr ""
 "<literal>insert</literal> (可选 - 默认为<literal>true</literal>) 如果你的鉴别"
 "器字段也是映射为复合标识(composite identifier)的一部分,则需将 这个值设为"
@@ -2108,18 +2144,18 @@
 "不包含该列)"
 
 #. Tag: para
-#: basic_mapping.xml:1112
-#, no-c-format
+#: basic_mapping.xml:1110
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional) an arbitrary SQL expression that is "
-"executed when a type has to be evaluated. Allows content-based "
+"<literal>formula</literal> (optional): an arbitrary SQL expression that is "
+"executed when a type has to be evaluated. It allows content-based "
 "discrimination."
 msgstr ""
 "<literal>formula</literal> (可选) 一个SQL表达式,在类型判断(判断是父类还是具"
 "体子类-译注)时执行。可用于基于内容的鉴别器。"
 
 #. Tag: para
-#: basic_mapping.xml:1120
+#: basic_mapping.xml:1118
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2131,28 +2167,28 @@
 "的。"
 
 #. Tag: para
-#: basic_mapping.xml:1126
-#, no-c-format
+#: basic_mapping.xml:1124
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>force</literal> attribute is (only) useful if the table "
-"contains rows with \"extra\" discriminator values that are not mapped to a "
-"persistent class. This will not usually be the case."
+"The <literal>force</literal> attribute is only useful if the table contains "
+"rows with \"extra\" discriminator values that are not mapped to a persistent "
+"class. This will not usually be the case."
 msgstr ""
 "<literal>force</literal>属性仅仅在这种情况下有用的:表中包含没有被映射到持久"
 "化类的附加辨别器值。 这种情况不会经常遇到。"
 
 #. Tag: para
-#: basic_mapping.xml:1132
-#, no-c-format
+#: basic_mapping.xml:1130
+#, fuzzy, no-c-format
 msgid ""
-"Using the <literal>formula</literal> attribute you can declare an arbitrary "
-"SQL expression that will be used to evaluate the type of a row:"
+"The <literal>formula</literal> attribute allows you to declare an arbitrary "
+"SQL expression that will be used to evaluate the type of a row. For example:"
 msgstr ""
 "使用<literal>formula</literal>属性你可以定义一个SQL表达式,用来判断一个行数据"
 "的类型。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1137
+#: basic_mapping.xml:1135
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2161,25 +2197,26 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1142
-#, no-c-format
-msgid "version (optional)"
+#: basic_mapping.xml:1140
+#, fuzzy, no-c-format
+msgid "Version (optional)"
 msgstr "版本(version)(可选)"
 
 #. Tag: para
-#: basic_mapping.xml:1144
-#, no-c-format
+#: basic_mapping.xml:1142
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
 "that the table contains versioned data. This is particularly useful if you "
-"plan to use <emphasis>long transactions</emphasis> (see below)."
+"plan to use <emphasis>long transactions</emphasis>. See below for more "
+"information:"
 msgstr ""
 "<literal>&lt;version&gt;</literal>元素是可选的,表明表中包含附带版本信息的数"
 "据。 这在你准备使用<emphasis> 长事务(long transactions)</emphasis>的时候特"
 "别有用。(见后)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1160
+#: basic_mapping.xml:1158
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2195,40 +2232,75 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1163
-#, no-c-format
+#: basic_mapping.xml:1161
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
 msgstr ""
 "<literal>column</literal> (可选 - 默认为属性名): 指定持有版本号的字段名。"
 
 #. Tag: para
-#: basic_mapping.xml:1169
-#, no-c-format
+#: basic_mapping.xml:1167
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a property of the persistent class."
+"<literal>name</literal>: the name of a property of the persistent class."
 msgstr "<literal>name</literal>: 持久化类的属性名。"
 
 #. Tag: para
-#: basic_mapping.xml:1174
-#, no-c-format
+#: basic_mapping.xml:1172
+#, fuzzy, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
-"The type of the version number."
+"the type of the version number."
 msgstr ""
 "<literal>type</literal> (可选 - 默认是 <literal>integer</literal>): 版本号的"
 "类型。"
 
 #. Tag: para
-#: basic_mapping.xml:1186
-#, no-c-format
+#: basic_mapping.xml:1178
+#, fuzzy, no-c-format
 msgid ""
+"<literal>access</literal> (optional - defaults to <literal>property</"
+"literal>): the strategy Hibernate uses to access the property value."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认为<literal>property</literal>): "
+"Hibernate用来访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认为<literal>property</literal>): "
+"Hibernate应该使用的访问此属性值的策略\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用于访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用于访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认值为 <literal>property</literal>): "
+"Hibernate用来访问属性值的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 - 默认是 <literal>property</literal>): "
+"Hibernate用来访问属性的策略。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>access</literal> (可选 -默认是 <literal>property</literal>): "
+"Hibernate 用来访问属性值的策略。"
+
+#. Tag: para
+#: basic_mapping.xml:1184
+#, fuzzy, no-c-format
+msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (可选 - 默认是<literal>undefined</"
 "literal>): 用于标明某个实例时刚刚被实例化的(尚未保存)版本属性值,依靠这个值"
@@ -2236,36 +2308,36 @@
 "开来。 (<literal>undefined</literal>指明应被使用的标识属性值。)"
 
 #. Tag: para
-#: basic_mapping.xml:1195
+#: basic_mapping.xml:1193
 #, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this version property value is actually generated "
-"by the database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"literal>): specifies that this version property value is generated by the "
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认是 <literal>never</literal>): 表明此"
 "版本属性值是否实际上是由数据库生成的。请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>部分的讨论。"
 
 #. Tag: para
-#: basic_mapping.xml:1202
-#, no-c-format
+#: basic_mapping.xml:1200
+#, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
-"Specifies whether the version column should be included in SQL insert "
-"statements. May be set to <literal>false</literal> if and only if the "
-"database column is defined with a default value of <literal>0</literal>."
+"specifies whether the version column should be included in SQL insert "
+"statements. It can be set to <literal>false</literal> if the database column "
+"is defined with a default value of <literal>0</literal>."
 msgstr ""
 "<literal>insert</literal> (可选 - 默认是 <literal>true</literal>): 表明此版本"
 "列应该包含在SQL插入语句中。只有当数据库字段有默认值<literal>0</literal>的时"
 "候,才可以设置为<literal>false</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:1212
-#, no-c-format
+#: basic_mapping.xml:1210
+#, fuzzy, no-c-format
 msgid ""
-"Version numbers may be of Hibernate type <literal>long</literal>, "
+"Version numbers can be of Hibernate type <literal>long</literal>, "
 "<literal>integer</literal>, <literal>short</literal>, <literal>timestamp</"
 "literal> or <literal>calendar</literal>."
 msgstr ""
@@ -2274,16 +2346,16 @@
 "literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:1217
-#, no-c-format
+#: basic_mapping.xml:1215
+#, fuzzy, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
-"instance, so Hibernate will detect any instance with a null version or "
-"timestamp as transient, no matter what other <literal>unsaved-value</"
+"instance. Hibernate will detect any instance with a null version or "
+"timestamp as transient, irrespective of what other <literal>unsaved-value</"
 "literal> strategies are specified. <emphasis>Declaring a nullable version or "
-"timestamp property is an easy way to avoid any problems with transitive "
-"reattachment in Hibernate, especially useful for people using assigned "
-"identifiers or composite keys!</emphasis>"
+"timestamp property is an easy way to avoid problems with transitive "
+"reattachment in Hibernate. It is especially useful for people using assigned "
+"identifiers or composite keys</emphasis>."
 msgstr ""
 "一个脱管(detached)实例的version或timestamp属性不能为空(null),因为"
 "Hibernate不管 <literal>unsaved-value</literal>被指定为何种策略,它将任何属性"
@@ -2293,27 +2365,26 @@
 "identifiers) 或复合主键时非常有用!</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1228
-#, no-c-format
-msgid "timestamp (optional)"
+#: basic_mapping.xml:1226
+#, fuzzy, no-c-format
+msgid "Timestamp (optional)"
 msgstr "timestamp (可选)"
 
 #. Tag: para
-#: basic_mapping.xml:1230
-#, no-c-format
+#: basic_mapping.xml:1228
+#, fuzzy, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
-"table contains timestamped data. This is intended as an alternative to "
-"versioning. Timestamps are by nature a less safe implementation of "
-"optimistic locking. However, sometimes the application might use the "
-"timestamps in other ways."
+"table contains timestamped data. This provides an alternative to versioning. "
+"Timestamps are a less safe implementation of optimistic locking. However, "
+"sometimes the application might use the timestamps in other ways."
 msgstr ""
 "可选的<literal>&lt;timestamp&gt;</literal>元素指明了表中包含时间戳数据。 这用"
 "来作为版本的替代。时间戳本质上是一种对乐观锁定的一种不是特别安全的实现。当"
 "然, 有时候应用程序可能在其他方面使用时间戳。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1246
+#: basic_mapping.xml:1244
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2328,18 +2399,18 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1249
-#, no-c-format
+#: basic_mapping.xml:1247
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional - defaults to the property name): The "
+"<literal>column</literal> (optional - defaults to the property name): the "
 "name of a column holding the timestamp."
 msgstr "<literal>column</literal> (可选 - 默认为属性名): 持有时间戳的字段名。"
 
 #. Tag: para
-#: basic_mapping.xml:1255
-#, no-c-format
+#: basic_mapping.xml:1253
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The name of a JavaBeans style property of Java type "
+"<literal>name</literal>: the name of a JavaBeans style property of Java type "
 "<literal>Date</literal> or <literal>Timestamp</literal> of the persistent "
 "class."
 msgstr ""
@@ -2347,14 +2418,14 @@
 "<literal>Date</literal> 或者 <literal>Timestamp</literal>的。"
 
 #. Tag: para
-#: basic_mapping.xml:1268
-#, no-c-format
+#: basic_mapping.xml:1266
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
-"literal>): A version property value that indicates that an instance is newly "
+"literal>): a version property value that indicates that an instance is newly "
 "instantiated (unsaved), distinguishing it from detached instances that were "
-"saved or loaded in a previous session. (<literal>undefined</literal> "
-"specifies that the identifier property value should be used.)"
+"saved or loaded in a previous session. <literal>Undefined</literal> "
+"specifies that the identifier property value should be used."
 msgstr ""
 "<literal>unsaved-value</literal> (可选 - 默认是<literal>null</literal>): 用于"
 "标明某个实例时刚刚被实例化的(尚未保存)版本属性值,依靠这个值就可以把这种情"
@@ -2362,17 +2433,17 @@
 "(<literal>undefined</literal> 指明使用标识属性值进行这种判断。)"
 
 #. Tag: para
-#: basic_mapping.xml:1277
-#, no-c-format
+#: basic_mapping.xml:1275
+#, fuzzy, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
-"From where should Hibernate retrieve the timestamp value? From the database, "
+"Where should Hibernate retrieve the timestamp value from? From the database, "
 "or from the current JVM? Database-based timestamps incur an overhead because "
-"Hibernate must hit the database in order to determine the \"next value\", "
-"but will be safer for use in clustered environments. Note also, that not all "
-"<literal>Dialect</literal>s are known to support retrieving of the "
-"database's current timestamp, while others might be unsafe for usage in "
-"locking due to lack of precision (Oracle 8 for example)."
+"Hibernate must hit the database in order to determine the \"next value\". It "
+"is safer to use in clustered environments. Not all <literal>Dialects</"
+"literal> are known to support the retrieval of the database's current "
+"timestamp. Others may also be unsafe for usage in locking due to lack of "
+"precision (Oracle 8, for example)."
 msgstr ""
 "<literal>source</literal> (可选 - 默认是 <literal>vm</literal>): Hibernate如"
 "何才能获取到时间戳的值呢?从数据库,还是当前JVM?从数据库获取会带来一些负担,"
@@ -2382,25 +2453,31 @@
 "Oracle 8)。"
 
 #. Tag: para
-#: basic_mapping.xml:1289
+#: basic_mapping.xml:1287
 #, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this timestamp property value is actually "
+"literal>): specifies that this timestamp property value is actually "
 "generated by the database. See the discussion of <link linkend=\"mapping-"
-"generated\">generated properties</link>."
+"generated\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认是 <literal>never</literal>): 指出时"
 "间戳值是否实际上是由数据库生成的.请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>的讨论。"
 
+#. Tag: title
+#: basic_mapping.xml:1298 basic_mapping.xml:2890
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: basic_mapping.xml:1298
-#, no-c-format
+#: basic_mapping.xml:1299
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
-"version type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source="
-"\"db\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
+"<literal>&lt;Timestamp&gt;</literal> is equivalent to <literal>&lt;version "
+"type=\"timestamp\"&gt;</literal>. And <literal>&lt;timestamp source=\"db"
+"\"&gt;</literal> is equivalent to <literal>&lt;version type=\"dbtimestamp"
 "\"&gt;</literal>"
 msgstr ""
 "注意,<literal>&lt;timestamp&gt;</literal> 和<literal>&lt;version type="
@@ -2409,23 +2486,23 @@
 "价的。"
 
 #. Tag: title
-#: basic_mapping.xml:1308
-#, no-c-format
-msgid "property"
+#: basic_mapping.xml:1311
+#, fuzzy, no-c-format
+msgid "Property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1310
-#, no-c-format
+#: basic_mapping.xml:1313
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;property&gt;</literal> element declares a persistent, "
+"The <literal>&lt;property&gt;</literal> element declares a persistent "
 "JavaBean style property of the class."
 msgstr ""
 "<literal>&lt;property&gt;</literal>元素为类定义了一个持久化的,JavaBean风格的"
 "属性。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1332
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2451,7 +2528,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1335
+#: basic_mapping.xml:1338
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2459,33 +2536,26 @@
 msgstr "<literal>name</literal>: 属性的名字,以小写字母开头。"
 
 #. Tag: para
-#: basic_mapping.xml:1341
-#, no-c-format
+#: basic_mapping.xml:1344
+#, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
-"name of the mapped database table column. This may also be specified by "
+"name of the mapped database table column. This can also be specified by "
 "nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 "<literal>column</literal> (可选 - 默认为属性名字): 对应的数据库字段名。 也可"
 "以通过嵌套的<literal>&lt;column&gt;</literal>元素指定。"
 
 #. Tag: para
-#: basic_mapping.xml:1348
-#, no-c-format
+#: basic_mapping.xml:1356
+#, fuzzy, no-c-format
 msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
-msgstr "<literal>type</literal> (可选): 一个Hibernate类型的名字。"
-
-#. Tag: para
-#: basic_mapping.xml:1353
-#, no-c-format
-msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) : specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" property "
 "whose value is initialized from some other property that maps to the same "
-"colum(s) or by a trigger or other application."
+"column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (可选 - 默认为 <literal>true</literal>) : "
 "表明用于<literal>UPDATE</literal> 和/或 <literal>INSERT</literal> 的SQL语句中"
@@ -2494,7 +2564,7 @@
 "某些其他属性,或者通过一个trigger(触发器)或其他程序生成。"
 
 #. Tag: para
-#: basic_mapping.xml:1362
+#: basic_mapping.xml:1365
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2505,22 +2575,22 @@
 "(computed)</emphasis> 属性的值。计算属性没有和它对应的数据库字段。"
 
 #. Tag: para
-#: basic_mapping.xml:1375
-#, no-c-format
+#: basic_mapping.xml:1378
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this property should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this property should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (可选 - 默认为 <literal>false</literal>): 指定 指定实"
 "例变量第一次被访问时,这个属性是否延迟抓取(fetched lazily)( 需要运行时字节"
 "码增强)。"
 
 #. Tag: para
-#: basic_mapping.xml:1382
-#, no-c-format
+#: basic_mapping.xml:1385
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
 "constraint for the columns. Also, allow this to be the target of a "
 "<literal>property-ref</literal>."
 msgstr ""
@@ -2528,96 +2598,96 @@
 "它作为<literal>property-ref</literal>引用的目标。"
 
 #. Tag: para
-#: basic_mapping.xml:1389
-#, no-c-format
+#: basic_mapping.xml:1392
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the columns."
 msgstr ""
 "<literal>not-null</literal> (可选): 使用DDL为该字段添加可否为空"
 "(nullability)的约束。"
 
 #. Tag: para
-#: basic_mapping.xml:1395
-#, no-c-format
+#: basic_mapping.xml:1398 basic_mapping.xml:1581
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
-"increment should occur when this property is dirty."
+"literal>): specifies that updates to this property do or do not require "
+"acquisition of the optimistic lock. In other words, it determines if a "
+"version increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (可选 - 默认为 <literal>true</literal>): "
 "指定这个属性在做更新时是否需要获得乐观锁定(optimistic lock)。 换句话说,它"
 "决定这个属性发生脏数据时版本(version)的值是否增长。"
 
 #. Tag: para
-#: basic_mapping.xml:1403
+#: basic_mapping.xml:1406
 #, fuzzy, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
-"literal>): Specifies that this property value is actually generated by the "
+"literal>): specifies that this property value is actually generated by the "
 "database. See the discussion of <link linkend=\"mapping-generated"
-"\">generated properties</link>."
+"\">generated properties</link> for more information."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认为 <literal>never</literal>): 表明此"
 "属性值是否实际上是由数据库生成的。请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>的讨论。"
 
 #. Tag: para
-#: basic_mapping.xml:1412
+#: basic_mapping.xml:1415
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis>可以是如下几种:"
 
 #. Tag: para
-#: basic_mapping.xml:1418
-#, no-c-format
+#: basic_mapping.xml:1421
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Hibernate basic type (eg. <literal>integer, string, character, "
-"date, timestamp, float, binary, serializable, object, blob</literal>)."
+"The name of a Hibernate basic type: <literal>integer, string, character, "
+"date, timestamp, float, binary, serializable, object, blob</literal> etc."
 msgstr ""
 "Hibernate基本类型名(比如:<literal>integer, string, character,date, "
 "timestamp, float, binary, serializable, object, blob</literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1424
-#, no-c-format
+#: basic_mapping.xml:1427
+#, fuzzy, no-c-format
 msgid ""
-"The name of a Java class with a default basic type (eg. <literal>int, float, "
+"The name of a Java class with a default basic type: <literal>int, float, "
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
-"literal>)."
+"literal> etc."
 msgstr ""
 "一个Java类的名字,这个类属于一种默认基础类型 (比如: <literal>int, float,"
 "char, java.lang.String, java.util.Date, java.lang.Integer, java.sql.Clob</"
 "literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1430
+#: basic_mapping.xml:1433
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "一个可以序列化的Java类的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1435
-#, no-c-format
+#: basic_mapping.xml:1438
+#, fuzzy, no-c-format
 msgid ""
-"The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
-"literal>)."
+"The class name of a custom type: <literal>com.illflow.type.MyCustomType</"
+"literal> etc."
 msgstr ""
 "一个自定义类型的类的名字。(比如: <literal>com.illflow.type.MyCustomType</"
 "literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1441
-#, no-c-format
+#: basic_mapping.xml:1444
+#, fuzzy, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
-"property to take a guess at the correct Hibernate type. Hibernate will try "
-"to interpret the name of the return class of the property getter using rules "
-"2, 3, 4 in that order. However, this is not always enough. In certain cases "
-"you will still need the <literal>type</literal> attribute. (For example, to "
-"distinguish between <literal>Hibernate.DATE</literal> and <literal>Hibernate."
-"TIMESTAMP</literal>, or to specify a custom type.)"
+"property and guess the correct Hibernate type. Hibernate will attempt to "
+"interpret the name of the return class of the property getter using, in "
+"order, rules 2, 3, and 4. In certain cases you will need the <literal>type</"
+"literal> attribute. For example, to distinguish between <literal>Hibernate."
+"DATE</literal> and <literal>Hibernate.TIMESTAMP</literal>, or to specify a "
+"custom type."
 msgstr ""
 "如果你没有指定类型,Hibernarte会使用反射来得到这个名字的属性,以此来猜测正确"
 "的Hibernate类型。 Hibernate会按照规则2,3,4的顺序对属性读取器(getter方法)的返"
@@ -2626,14 +2696,14 @@
 "TIMESTAMP</literal>,或者为了指定一个自定义类型。)"
 
 #. Tag: para
-#: basic_mapping.xml:1451
-#, no-c-format
+#: basic_mapping.xml:1454
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>access</literal> attribute lets you control how Hibernate will "
-"access the property at runtime. By default, Hibernate will call the property "
-"get/set pair. If you specify <literal>access=\"field\"</literal>, Hibernate "
-"will bypass the get/set pair and access the field directly, using "
-"reflection. You may specify your own strategy for property access by naming "
+"The <literal>access</literal> attribute allows you to control how Hibernate "
+"accesses the property at runtime. By default, Hibernate will call the "
+"property get/set pair. If you specify <literal>access=\"field\"</literal>, "
+"Hibernate will bypass the get/set pair and access the field directly using "
+"reflection. You can specify your own strategy for property access by naming "
 "a class that implements the interface <literal>org.hibernate.property."
 "PropertyAccessor</literal>."
 msgstr ""
@@ -2645,21 +2715,20 @@
 "策略类的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1460
-#, no-c-format
+#: basic_mapping.xml:1463
+#, fuzzy, no-c-format
 msgid ""
-"An especially powerful feature are derived properties. These properties are "
-"by definition read-only, the property value is computed at load time. You "
-"declare the computation as a SQL expression, this translates to a "
-"<literal>SELECT</literal> clause subquery in the SQL query that loads an "
-"instance:"
+"A powerful feature is derived properties. These properties are by definition "
+"read-only. The property value is computed at load time. You declare the "
+"computation as an SQL expression. This then translates to a <literal>SELECT</"
+"literal> clause subquery in the SQL query that loads an instance:"
 msgstr ""
 "衍生属性(derive propertie)是一个特别强大的特征。这些属性应该定义为只读,属"
 "性值在装载时计算生成。 你用一个SQL表达式生成计算的结果,它会在这个实例转载时"
 "翻译成一个SQL查询的<literal>SELECT</literal> 子查询语句。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1467
+#: basic_mapping.xml:1470
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2672,31 +2741,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1469
-#, no-c-format
+#: basic_mapping.xml:1472
+#, fuzzy, no-c-format
 msgid ""
-"Note that you can reference the entities own table by not declaring an alias "
-"on a particular column (<literal>customerId</literal> in the given example). "
-"Also note that you can use the nested <literal>&lt;formula&gt;</literal> "
-"mapping element if you don't like to use the attribute."
+"You can reference the entity table by not declaring an alias on a particular "
+"column. This would be <literal>customerId</literal> in the given example. "
+"You can also use the nested <literal>&lt;formula&gt;</literal> mapping "
+"element if you do not want to use the attribute."
 msgstr ""
 "注意,你可以使用实体自己的表,而不用为这个特别的列定义别名( 上面例子中的"
 "<literal>customerId</literal>)。同时注意,如果你不喜欢使用属性, 你可以使用"
 "嵌套的<literal>&lt;formula&gt;</literal>映射元素。"
 
 #. Tag: title
-#: basic_mapping.xml:1479
-#, no-c-format
-msgid "many-to-one"
+#: basic_mapping.xml:1482
+#, fuzzy, no-c-format
+msgid "Many-to-one"
 msgstr "多对一(many-to-one)"
 
 #. Tag: para
-#: basic_mapping.xml:1481
-#, no-c-format
+#: basic_mapping.xml:1484
+#, fuzzy, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
 "<literal>many-to-one</literal> element. The relational model is a many-to-"
-"one association: a foreign key in one table is referencing the primary key "
+"one association; a foreign key in one table is referencing the primary key "
 "column(s) of the target table."
 msgstr ""
 "通过<literal>many-to-one</literal>元素,可以定义一种常见的与另一个持久化类的关"
@@ -2704,7 +2773,7 @@
 "引用目标表的 主键字段。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1509
+#: basic_mapping.xml:1512
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2733,9 +2802,9 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
+#: basic_mapping.xml:1515 basic_mapping.xml:1696 basic_mapping.xml:1882
 #, fuzzy, no-c-format
-msgid "<literal>name</literal>: The name of the property."
+msgid "<literal>name</literal>: the name of the property."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>name</literal>: 属性名。\n"
@@ -2745,11 +2814,11 @@
 "<literal>name</literal>: 属性名"
 
 #. Tag: para
-#: basic_mapping.xml:1517 basic_mapping.xml:2308
+#: basic_mapping.xml:1520 basic_mapping.xml:2311
 #, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> (optional): The name of the foreign key column. "
-"This may also be specified by nested <literal>&lt;column&gt;</literal> "
+"<literal>column</literal> (optional): the name of the foreign key column. "
+"This can also be specified by nested <literal>&lt;column&gt;</literal> "
 "element(s)."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2760,11 +2829,11 @@
 "<literal>&lt;column&gt;</literal>指定。"
 
 #. Tag: para
-#: basic_mapping.xml:1524 basic_mapping.xml:1698
+#: basic_mapping.xml:1527 basic_mapping.xml:1701
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the associated class."
+"determined by reflection): the name of the associated class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>class</literal> (可选 - 默认是通过反射得到属性类型): 关联的类的名"
@@ -2774,21 +2843,21 @@
 "名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1530
-#, no-c-format
+#: basic_mapping.xml:1533 basic_mapping.xml:1707
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional): Specifies which operations should be "
+"<literal>cascade</literal> (optional): specifies which operations should be "
 "cascaded from the parent object to the associated object."
 msgstr ""
-"<literal>cascade(级联)</literal> (可选): 指明哪些操作会从父对象级联到关联的"
-"对象。"
+"<literal>cascade(级联)</literal> (可选) 表明操作是否从父对象级联到被关联的对"
+"象。"
 
 #. Tag: para
-#: basic_mapping.xml:1536 basic_mapping.xml:1719
+#: basic_mapping.xml:1539 basic_mapping.xml:1722
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
-"Chooses between outer-join fetching or sequential select fetching."
+"chooses between outer-join fetching or sequential select fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>fetch</literal> (可选 - 默认为 <literal>select</literal>): 在外连接"
@@ -2799,15 +2868,15 @@
 "抓取或者序列选择抓取选择其一."
 
 #. Tag: para
-#: basic_mapping.xml:1542
-#, no-c-format
+#: basic_mapping.xml:1545
+#, fuzzy, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
-"literal>) specifies that the mapped columns should be included in SQL "
+"literal>): specifies that the mapped columns should be included in SQL "
 "<literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. "
 "Setting both to <literal>false</literal> allows a pure \"derived\" "
-"association whose value is initialized from some other property that maps to "
-"the same colum(s) or by a trigger or other application."
+"association whose value is initialized from another property that maps to "
+"the same column(s), or by a trigger or other application."
 msgstr ""
 "<literal>update, insert</literal> (可选 - 默认为 <literal>true</literal>) 指"
 "定对应的字段是否包含在用于<literal>UPDATE</literal> 和/或 <literal>INSERT</"
@@ -2816,10 +2885,10 @@
 "得到 或者通过trigger(触发器)、或其他程序生成。"
 
 #. Tag: para
-#: basic_mapping.xml:1551
-#, no-c-format
+#: basic_mapping.xml:1554
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to this foreign key. If not specified, the "
 "primary key of the associated class is used."
 msgstr ""
@@ -2827,49 +2896,36 @@
 "本外键相对应。 如果没有指定,会使用对方关联类的主键。"
 
 #. Tag: para
-#: basic_mapping.xml:1564
-#, no-c-format
+#: basic_mapping.xml:1567
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Enable the DDL generation of a unique "
-"constraint for the foreign-key column. Also, allow this to be the target of "
-"a <literal>property-ref</literal>. This makes the association multiplicity "
-"effectively one to one."
+"<literal>unique</literal> (optional): enables the DDL generation of a unique "
+"constraint for the foreign-key column. By allowing this to be the target of "
+"a <literal>property-ref</literal>, you can make the association multiplicity "
+"one-to-one."
 msgstr ""
 "<literal>unique</literal> (可选): 使用DDL为外键字段生成一个唯一约束。此外, "
 "这也可以用作<literal>property-ref</literal>的目标属性。这使关联同时具有 一对"
 "一的效果。"
 
 #. Tag: para
-#: basic_mapping.xml:1572
-#, no-c-format
+#: basic_mapping.xml:1575
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Enable the DDL generation of a "
+"<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
 msgstr ""
 "<literal>not-null</literal> (可选): 使用DDL为外键字段生成一个非空约束。"
 
 #. Tag: para
-#: basic_mapping.xml:1578
-#, no-c-format
+#: basic_mapping.xml:1589
+#, fuzzy, no-c-format
 msgid ""
-"<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, dertermines if a version "
-"increment should occur when this property is dirty."
-msgstr ""
-"<literal>optimistic-lock</literal> (可选 - 默认为 <literal>true</literal>): "
-"指定这个属性在做更新时是否需要获得乐观锁定(optimistic lock)。 换句话说,它"
-"决定这个属性发生脏数据时版本(version)的值是否增长。"
-
-#. Tag: para
-#: basic_mapping.xml:1586
-#, no-c-format
-msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. This requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched."
 msgstr ""
 "<literal>lazy</literal> (可选 - 默认为 <literal>proxy</literal>): 默认情况"
@@ -2878,12 +2934,12 @@
 "强)。 <literal>lazy=\"false\"</literal>指定此关联总是被预先抓取。"
 
 #. Tag: para
-#: basic_mapping.xml:1596
-#, no-c-format
+#: basic_mapping.xml:1599
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how foreign keys that reference missing rows will be "
-"handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how foreign keys that reference missing rows will be "
+"handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>not-found</literal> (可选 - 默认为 <literal>exception</literal>): 指"
@@ -2891,15 +2947,15 @@
 "视为一个空(null)关联。"
 
 #. Tag: para
-#: basic_mapping.xml:1603 basic_mapping.xml:1757
-#, no-c-format
+#: basic_mapping.xml:1606 basic_mapping.xml:1760
+#, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class."
 msgstr "<literal>entity-name</literal> (可选): 被关联的类的实体名。"
 
 #. Tag: para
-#: basic_mapping.xml:1608
+#: basic_mapping.xml:1611
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2909,20 +2965,20 @@
 "算出的)</emphasis>外键值。"
 
 #. Tag: para
-#: basic_mapping.xml:1616
-#, no-c-format
+#: basic_mapping.xml:1619
+#, fuzzy, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
 "meaningful value other than <literal>none</literal> will propagate certain "
-"operations to the associated object. The meaningful values are the names of "
-"Hibernate's basic operations, <literal>persist, merge, delete, save-update, "
-"evict, replicate, lock, refresh</literal>, as well as the special values "
-"<literal>delete-orphan</literal> and <literal>all</literal> and comma-"
-"separated combinations of operation names, for example, <literal>cascade="
-"\"persist,merge,evict\"</literal> or <literal>cascade=\"all,delete-orphan\"</"
-"literal>. See <xref linkend=\"objectstate-transitive\"/> for a full "
-"explanation. Note that single valued associations (many-to-one and one-to-"
-"one associations) do not support orphan delete."
+"operations to the associated object. The meaningful values are divided into "
+"three categories. First, basic operations, which include: <literal>persist, "
+"merge, delete, save-update, evict, replicate, lock and refresh</literal>; "
+"second, special values: <literal>delete-orphan</literal>; and third,"
+"<literal>all</literal> comma-separated combinations of operation names: "
+"<literal>cascade=\"persist,merge,evict\"</literal> or <literal>cascade=\"all,"
+"delete-orphan\"</literal>. See <xref linkend=\"objectstate-transitive\"/> "
+"for a full explanation. Note that single valued, many-to-one and one-to-one, "
+"associations do not support orphan delete."
 msgstr ""
 "<literal>cascade</literal>属性设置为除了<literal>none</literal>以外任何有意义"
 "的值, 它将把特定的操作传递到关联对象中。这个值就代表着Hibernate基本操作的名"
@@ -2935,14 +2991,14 @@
 "儿(orphan delete,删除不再被引用的值)."
 
 #. Tag: para
-#: basic_mapping.xml:1629
-#, no-c-format
+#: basic_mapping.xml:1632
+#, fuzzy, no-c-format
 msgid ""
-"A typical <literal>many-to-one</literal> declaration looks as simple as this:"
+"Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr "一个典型的简单<literal>many-to-one</literal>定义例子:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1633
+#: basic_mapping.xml:1636
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -2950,16 +3006,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1635
-#, no-c-format
+#: basic_mapping.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
 "mapping legacy data where a foreign key refers to a unique key of the "
-"associated table other than the primary key. This is an ugly relational "
-"model. For example, suppose the <literal>Product</literal> class had a "
-"unique serial number, that is not the primary key. (The <literal>unique</"
-"literal> attribute controls Hibernate's DDL generation with the SchemaExport "
-"tool.)"
+"associated table other than the primary key. This is a complicated and "
+"confusing relational model. For example, if the <literal>Product</literal> "
+"class had a unique serial number that is not the primary key. The "
+"<literal>unique</literal> attribute controls Hibernate's DDL generation with "
+"the SchemaExport tool."
 msgstr ""
 "<literal>property-ref</literal>属性只应该用来对付遗留下来的数据库系统, 可能"
 "有外键指向对方关联表的是个非主键字段(但是应该是一个惟一关键字)的情况下。 这"
@@ -2968,7 +3024,7 @@
 "SchemaExport工具进行的DDL生成。)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1644
+#: basic_mapping.xml:1647
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -2976,13 +3032,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1646
+#: basic_mapping.xml:1649
 #, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr "那么关于<literal>OrderItem</literal> 的映射可能是:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1650
+#: basic_mapping.xml:1653
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -2990,13 +3046,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1652
-#, no-c-format
-msgid "This is certainly not encouraged, however."
+#: basic_mapping.xml:1655
+#, fuzzy, no-c-format
+msgid "This is not encouraged, however."
 msgstr "当然,我们决不鼓励这种用法。"
 
 #. Tag: para
-#: basic_mapping.xml:1656
+#: basic_mapping.xml:1659
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3007,15 +3063,15 @@
 "properties&gt;</literal>的元素 里面映射所有关联的属性。"
 
 #. Tag: para
-#: basic_mapping.xml:1661
-#, no-c-format
+#: basic_mapping.xml:1664
+#, fuzzy, no-c-format
 msgid ""
-"If the referenced unique key is the property of a component, you may specify "
+"If the referenced unique key is the property of a component, you can specify "
 "a property path:"
 msgstr "假若被引用的唯一主键是组件的属性,你可以指定属性路径:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1665
+#: basic_mapping.xml:1668
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3023,13 +3079,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1670
-#, no-c-format
-msgid "one-to-one"
+#: basic_mapping.xml:1673
+#, fuzzy, no-c-format
+msgid "One-to-one"
 msgstr "一对一"
 
 #. Tag: para
-#: basic_mapping.xml:1672
+#: basic_mapping.xml:1675
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3038,7 +3094,7 @@
 "持久化对象之间一对一的关联关系是通过<literal>one-to-one</literal>元素定义的。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1690
+#: basic_mapping.xml:1693
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3059,36 +3115,26 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1704
-#, no-c-format
+#: basic_mapping.xml:1713
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional) specifies which operations should be "
-"cascaded from the parent object to the associated object."
+"<literal>constrained</literal> (optional): specifies that a foreign key "
+"constraint on the primary key of the mapped table and references the table "
+"of the associated class. This option affects the order in which <literal>save"
+"()</literal> and <literal>delete()</literal> are cascaded, and determines "
+"whether the association can be proxied. It is also used by the schema export "
+"tool."
 msgstr ""
-"<literal>cascade(级联)</literal> (可选) 表明操作是否从父对象级联到被关联的对"
-"象。"
-
-#. Tag: para
-#: basic_mapping.xml:1710
-#, no-c-format
-msgid ""
-"<literal>constrained</literal> (optional) specifies that a foreign key "
-"constraint on the primary key of the mapped table references the table of "
-"the associated class. This option affects the order in which <literal>save()"
-"</literal> and <literal>delete()</literal> are cascaded, and determines "
-"whether the association may be proxied (it is also used by the schema export "
-"tool)."
-msgstr ""
 "<literal>constrained(约束)</literal> (可选) 表明该类对应的表对应的数据库表,"
 "和被关联的对象所对应的数据库表之间,通过一个外键引用对主键进行约束。 这个选项"
 "影响<literal>save()</literal>和<literal>delete()</literal>在级联执行时的先后"
 "顺序以及 决定该关联能否被委托(也在schema export tool中被使用)."
 
 #. Tag: para
-#: basic_mapping.xml:1725
-#, no-c-format
+#: basic_mapping.xml:1728
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal>: (optional) The name of a property of the "
+"<literal>property-ref</literal> (optional): the name of a property of the "
 "associated class that is joined to the primary key of this class. If not "
 "specified, the primary key of the associated class is used."
 msgstr ""
@@ -3096,14 +3142,14 @@
 "类的主键相对应。如果没有指定,会使用对方关联类的主键。"
 
 #. Tag: para
-#: basic_mapping.xml:1738
-#, no-c-format
+#: basic_mapping.xml:1741
+#, fuzzy, no-c-format
 msgid ""
-"<literal>formula</literal> (optional): Almost all one to one associations "
-"map to the primary key of the owning entity. In the rare case that this is "
-"not the case, you may specify a some other column, columns or expression to "
-"join on using an SQL formula. (See <literal>org.hibernate.test."
-"onetooneformula</literal> for an example.)"
+"<literal>formula</literal> (optional): almost all one-to-one associations "
+"map to the primary key of the owning entity. If this is not the case, you "
+"can specify another column, columns or expression to join on using an SQL "
+"formula. See <literal>org.hibernate.test.onetooneformula</literal> for an "
+"example."
 msgstr ""
 "<literal>formula </literal> (可选):绝大多数一对一的关联都指向其实体的主键。在"
 "一些少见的情况中, 你可能会指向其他的一个或多个字段,或者是一个表达式,这些情"
@@ -3111,17 +3157,17 @@
 "找到例子)"
 
 #. Tag: para
-#: basic_mapping.xml:1746
-#, no-c-format
+#: basic_mapping.xml:1749
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
-"By default, single point associations are proxied. <literal>lazy=\"no-proxy"
+"by default, single point associations are proxied. <literal>lazy=\"no-proxy"
 "\"</literal> specifies that the property should be fetched lazily when the "
-"instance variable is first accessed (requires build-time bytecode "
-"instrumentation). <literal>lazy=\"false\"</literal> specifies that the "
+"instance variable is first accessed. It requires build-time bytecode "
+"instrumentation. <literal>lazy=\"false\"</literal> specifies that the "
 "association will always be eagerly fetched. <emphasis>Note that if "
 "<literal>constrained=\"false\"</literal>, proxying is impossible and "
-"Hibernate will eager fetch the association!</emphasis>"
+"Hibernate will eagerly fetch the association</emphasis>."
 msgstr ""
 "<literal>lazy</literal> (可选 - 默认为 <literal>proxy</literal>): 默认情况"
 "下,单点关联是经过代理的。<literal>lazy=\"no-proxy\"</literal>指定此属性应该"
@@ -3131,55 +3177,54 @@
 "会采取预先抓取!</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1764
-#, no-c-format
-msgid "There are two varieties of one-to-one association:"
+#: basic_mapping.xml:1767
+#, fuzzy, no-c-format
+msgid "There are two varieties of one-to-one associations:"
 msgstr "有两种不同的一对一关联:"
 
 #. Tag: para
-#: basic_mapping.xml:1768
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "primary key associations"
 msgstr "主键关联"
 
 #. Tag: para
-#: basic_mapping.xml:1771
+#: basic_mapping.xml:1774
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr "惟一外键关联"
 
 #. Tag: para
-#: basic_mapping.xml:1776
-#, no-c-format
+#: basic_mapping.xml:1779
+#, fuzzy, no-c-format
 msgid ""
-"Primary key associations don't need an extra table column; if two rows are "
-"related by the association then the two table rows share the same primary "
-"key value. So if you want two objects to be related by a primary key "
-"association, you must make sure that they are assigned the same identifier "
-"value!"
+"Primary key associations do not need an extra table column. If two rows are "
+"related by the association, then the two table rows share the same primary "
+"key value. To relate two objects by a primary key association, ensure that "
+"they are assigned the same identifier value."
 msgstr ""
 "主键关联不需要额外的表字段;如果两行是通过这种一对一关系相关联的,那么这两行"
 "就共享同样的主关键字值。所以如果你希望两个对象通过主键一对一关联,你必须确认"
 "它们被赋予同样的标识值!"
 
 #. Tag: para
-#: basic_mapping.xml:1783
-#, no-c-format
+#: basic_mapping.xml:1786
+#, fuzzy, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
-"<literal>Employee</literal> and <literal>Person</literal>, respectively."
+"<literal>Employee</literal> and <literal>Person</literal> respectively:"
 msgstr ""
 "比如说,对下面的<literal>Employee</literal>和<literal>Person</literal>进行主"
 "键一对一关联:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1788
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1789
+#: basic_mapping.xml:1792
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3187,18 +3232,18 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1791
-#, no-c-format
+#: basic_mapping.xml:1794
+#, fuzzy, no-c-format
 msgid ""
-"Now we must ensure that the primary keys of related rows in the PERSON and "
-"EMPLOYEE tables are equal. We use a special Hibernate identifier generation "
-"strategy called <literal>foreign</literal>:"
+"Ensure that the primary keys of the related rows in the PERSON and EMPLOYEE "
+"tables are equal. You use a special Hibernate identifier generation strategy "
+"called <literal>foreign</literal>:"
 msgstr ""
 "现在我们必须确保PERSON和EMPLOYEE中相关的字段是相等的。我们使用一个被成为"
 "<literal>foreign</literal>的特殊的hibernate标识符生成策略:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1797
+#: basic_mapping.xml:1800
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3215,31 +3260,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1799
-#, no-c-format
+#: basic_mapping.xml:1802
+#, fuzzy, no-c-format
 msgid ""
-"A newly saved instance of <literal>Person</literal> is then assigned the "
-"same primary key value as the <literal>Employee</literal> instance refered "
-"with the <literal>employee</literal> property of that <literal>Person</"
-"literal>."
+"A newly saved instance of <literal>Person</literal> is assigned the same "
+"primary key value as the <literal>Employee</literal> instance referred with "
+"the <literal>employee</literal> property of that <literal>Person</literal>."
 msgstr ""
 "一个刚刚保存的<literal>Person</literal>实例被赋予和该<literal>Person</"
 "literal>的<literal>employee</literal>属性所指向的<literal>Employee</literal>"
 "实例同样的关键字值。"
 
 #. Tag: para
-#: basic_mapping.xml:1805
-#, no-c-format
+#: basic_mapping.xml:1808
+#, fuzzy, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
-"<literal>Employee</literal> to <literal>Person</literal>, may be expressed "
+"<literal>Employee</literal> to <literal>Person</literal>, can be expressed "
 "as:"
 msgstr ""
 "另一种方式是一个外键和一个惟一关键字对应,上面的<literal>Employee</literal>和"
 "<literal>Person</literal>的例子,如果使用这种关联方式,可以表达成:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1810
+#: basic_mapping.xml:1813
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3247,16 +3291,16 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1812
-#, no-c-format
+#: basic_mapping.xml:1815
+#, fuzzy, no-c-format
 msgid ""
-"And this association may be made bidirectional by adding the following to "
-"the <literal>Person</literal> mapping:"
+"This association can be made bidirectional by adding the following to the "
+"<literal>Person</literal> mapping:"
 msgstr ""
 "如果在<literal>Person</literal>的映射加入下面几句,这种关联就是双向的:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1817
+#: basic_mapping.xml:1820
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3264,13 +3308,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1822
-#, no-c-format
-msgid "natural-id"
+#: basic_mapping.xml:1825
+#, fuzzy, no-c-format
+msgid "Natural-id"
 msgstr "自然ID(natural-id)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1824
+#: basic_mapping.xml:1827
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3281,15 +3325,15 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1826
-#, no-c-format
+#: basic_mapping.xml:1829
+#, fuzzy, no-c-format
 msgid ""
-"Even though we recommend the use of surrogate keys as primary keys, you "
-"should still try to identify natural keys for all entities. A natural key is "
-"a property or combination of properties that is unique and non-null. If it "
-"is also immutable, even better. Map the properties of the natural key inside "
-"the <literal>&lt;natural-id&gt;</literal> element. Hibernate will generate "
-"the necessary unique key and nullability constraints, and your mapping will "
+"Although we recommend the use of surrogate keys as primary keys, you should "
+"try to identify natural keys for all entities. A natural key is a property "
+"or combination of properties that is unique and non-null. It is also "
+"immutable. Map the properties of the natural key inside the <literal>&lt;"
+"natural-id&gt;</literal> element. Hibernate will generate the necessary "
+"unique key and nullability constraints and, as a result, your mapping will "
 "be more self-documenting."
 msgstr ""
 "我们建议使用代用键(键值不具备实际意义)作为主键,我们仍然应该尝试为所有的实"
@@ -3300,10 +3344,10 @@
 "解)。"
 
 #. Tag: para
-#: basic_mapping.xml:1835
-#, no-c-format
+#: basic_mapping.xml:1838
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you implement <literal>equals()</literal> and "
+"It is recommended that you implement <literal>equals()</literal> and "
 "<literal>hashCode()</literal> to compare the natural key properties of the "
 "entity."
 msgstr ""
@@ -3311,44 +3355,45 @@
 "方法,来比较实体的自然键属性。"
 
 #. Tag: para
-#: basic_mapping.xml:1840
-#, no-c-format
+#: basic_mapping.xml:1843
+#, fuzzy, no-c-format
 msgid ""
-"This mapping is not intended for use with entities with natural primary keys."
+"This mapping is not intended for use with entities that have natural primary "
+"keys."
 msgstr "这一映射不是为了把自然键作为主键而准备的。"
 
 #. Tag: para
-#: basic_mapping.xml:1846
-#, no-c-format
+#: basic_mapping.xml:1849
+#, fuzzy, no-c-format
 msgid ""
-"<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
-"By default, natural identifier properties as assumed to be immutable "
-"(constant)."
+"<literal>mutable</literal> (optional - defaults to <literal>false</"
+"literal>): by default, natural identifier properties are assumed to be "
+"immutable (constant)."
 msgstr ""
 "<literal>mutable</literal> (可选, 默认为<literal>false</literal>): 默认情况"
 "下,自然标识属性被假定为不可变的(常量)。"
 
 #. Tag: title
-#: basic_mapping.xml:1856
-#, no-c-format
-msgid "component, dynamic-component"
+#: basic_mapping.xml:1859
+#, fuzzy, no-c-format
+msgid "Component and dynamic-component"
 msgstr "组件(component), 动态组件(dynamic-component)"
 
 #. Tag: para
-#: basic_mapping.xml:1858
-#, no-c-format
+#: basic_mapping.xml:1861
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
-"object to columns of the table of a parent class. Components may, in turn, "
-"declare their own properties, components or collections. See \"Components\" "
-"below."
+"object to columns of the table of a parent class. Components can, in turn, "
+"declare their own properties, components or collections. See the \"Component"
+"\" examples below:"
 msgstr ""
 "<literal>&lt;component&gt;</literal>元素把子对象的一些元素与父类对应的表的一"
 "些字段映射起来。 然后组件可以定义它们自己的属性、组件或者集合。参见后面"
 "的“Components”一章。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1876
+#: basic_mapping.xml:1879
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3370,21 +3415,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1884
-#, no-c-format
+#: basic_mapping.xml:1887
+#, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
-"determined by reflection): The name of the component (child) class."
+"determined by reflection): the name of the component (child) class."
 msgstr ""
 "<literal>class</literal> (可选 - 默认为通过反射得到的属性类型):组件(子)类的名"
 "字。"
 
 #. Tag: para
-#: basic_mapping.xml:1890 basic_mapping.xml:1979
+#: basic_mapping.xml:1893 basic_mapping.xml:1982
 #, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal>: Do the mapped columns appear in SQL "
-"<literal>INSERT</literal>s?"
+"<literal>insert</literal>: do the mapped columns appear in SQL "
+"<literal>INSERTs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>insert</literal>: 被映射的字段是否出现在SQL的<literal>INSERT</"
@@ -3394,11 +3439,11 @@
 "literal>语句中?"
 
 #. Tag: para
-#: basic_mapping.xml:1896 basic_mapping.xml:1985
+#: basic_mapping.xml:1899 basic_mapping.xml:1988
 #, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal>: Do the mapped columns appear in SQL "
-"<literal>UPDATE</literal>s?"
+"<literal>update</literal>: do the mapped columns appear in SQL "
+"<literal>UPDATEs</literal>?"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>update</literal>: 被映射的字段是否出现在SQL的<literal>UPDATE</"
@@ -3408,23 +3453,23 @@
 "literal>语句中?"
 
 #. Tag: para
-#: basic_mapping.xml:1908
-#, no-c-format
+#: basic_mapping.xml:1911
+#, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that this component should be fetched lazily when the instance "
-"variable is first accessed (requires build-time bytecode instrumentation)."
+"specifies that this component should be fetched lazily when the instance "
+"variable is first accessed. It requires build-time bytecode instrumentation."
 msgstr ""
 "<literal>lazy</literal> (可选 - 默认是 <literal>false</literal>): 表明此组件"
 "应在实例变量第一次被访问的时候延迟加载(需要编译时字节码装置器)"
 
 #. Tag: para
-#: basic_mapping.xml:1915
-#, no-c-format
+#: basic_mapping.xml:1918
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this component do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to this component either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (可选 - 默认是 <literal>true</literal>):表"
@@ -3432,18 +3477,18 @@
 "(Version)"
 
 #. Tag: para
-#: basic_mapping.xml:1923 basic_mapping.xml:1999
-#, no-c-format
+#: basic_mapping.xml:1926 basic_mapping.xml:2002
+#, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
-"Specifies that a unique constraint exists upon all mapped columns of the "
+"specifies that a unique constraint exists upon all mapped columns of the "
 "component."
 msgstr ""
 "<literal>unique</literal> (可选 - 默认是 <literal>false</literal>):表明组件映"
 "射的所有字段上都有唯一性约束"
 
 #. Tag: para
-#: basic_mapping.xml:1932
+#: basic_mapping.xml:1935
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3453,7 +3498,7 @@
 "射。"
 
 #. Tag: para
-#: basic_mapping.xml:1937
+#: basic_mapping.xml:1940
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3464,32 +3509,33 @@
 "literal>子元素,在组件类内部就可以有一个指向其容器的实体的反向引用。"
 
 #. Tag: para
-#: basic_mapping.xml:1943
-#, no-c-format
+#: basic_mapping.xml:1946
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
 "<literal>Map</literal> to be mapped as a component, where the property names "
-"refer to keys of the map, see <xref linkend=\"components-dynamic\"/>."
+"refer to keys of the map. See <xref linkend=\"components-dynamic\"/> for "
+"more information."
 msgstr ""
 "<literal>&lt;dynamic-component&gt;</literal>元素允许把一个<literal>Map</"
 "literal>映射为组件,其属性名对应map的键值。 参见<xref linkend=\"components-"
 "dynamic\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:1952
-#, no-c-format
-msgid "properties"
+#: basic_mapping.xml:1955
+#, fuzzy, no-c-format
+msgid "Properties"
 msgstr "properties"
 
 #. Tag: para
-#: basic_mapping.xml:1954
-#, no-c-format
+#: basic_mapping.xml:1957
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
-"named, logical grouping of properties of a class. The most important use of "
-"the construct is that it allows a combination of properties to be the target "
-"of a <literal>property-ref</literal>. It is also a convenient way to define "
-"a multi-column unique constraint."
+"named, logical grouping of the properties of a class. The most important use "
+"of the construct is that it allows a combination of properties to be the "
+"target of a <literal>property-ref</literal>. It is also a convenient way to "
+"define a multi-column unique constraint. For example:"
 msgstr ""
 "<literal>&lt;properties&gt;</literal> 元素允许定义一个命名的逻辑分组"
 "(grouping)包含一个类中的多个属性。 这个元素最重要的用处是允许多个属性的组合作"
@@ -3497,7 +3543,7 @@
 "一种方便途径。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1970
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3515,22 +3561,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1973
-#, no-c-format
+#: basic_mapping.xml:1976
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
-"emphasis> an actual property name."
+"<literal>name</literal>: the logical name of the grouping. It is "
+"<emphasis>not</emphasis> an actual property name."
 msgstr ""
 "<literal>name</literal>: 分组的逻辑名称 - <emphasis>不是</emphasis> 实际属性"
 "的名称."
 
 #. Tag: para
-#: basic_mapping.xml:1991
-#, no-c-format
+#: basic_mapping.xml:1994
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to these properties do or do not require "
-"acquisition of the optimistic lock. In other words, determines if a version "
+"literal>): specifies that updates to these properties either do or do not "
+"require acquisition of the optimistic lock. It determines if a version "
 "increment should occur when these properties are dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (可选 - 默认是 <literal>true</literal>):表"
@@ -3538,7 +3584,7 @@
 "(Version)"
 
 #. Tag: para
-#: basic_mapping.xml:2008
+#: basic_mapping.xml:2011
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3546,11 +3592,12 @@
 msgstr "例如,如果我们有如下的<literal>&lt;properties&gt;</literal>映射:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2012
+#: basic_mapping.xml:2015
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"personNumber\"/>\n"
+"\n"
 "    ...\n"
 "    <properties name=\"name\"\n"
 "            unique=\"true\" update=\"false\">\n"
@@ -3562,17 +3609,17 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2014
-#, no-c-format
+#: basic_mapping.xml:2017
+#, fuzzy, no-c-format
 msgid ""
-"Then we might have some legacy data association which refers to this unique "
-"key of the <literal>Person</literal> table, instead of to the primary key:"
+"You might have some legacy data association that refers to this unique key "
+"of the <literal>Person</literal> table, instead of to the primary key:"
 msgstr ""
 "然后,我们可能有一些遗留的数据关联,引用 <literal>Person</literal>表的这个唯"
 "一键,而不是主键。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2019
+#: basic_mapping.xml:2022
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3584,32 +3631,32 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2021
-#, no-c-format
+#: basic_mapping.xml:2024
+#, fuzzy, no-c-format
 msgid ""
-"We don't recommend the use of this kind of thing outside the context of "
-"mapping legacy data."
+"The use of this outside the context of mapping legacy data is not "
+"recommended."
 msgstr "我们并不推荐这样使用,除非在映射遗留数据的情况下。"
 
 #. Tag: title
-#: basic_mapping.xml:2029
-#, no-c-format
-msgid "subclass"
+#: basic_mapping.xml:2032
+#, fuzzy, no-c-format
+msgid "Subclass"
 msgstr "子类(subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2031
-#, no-c-format
+#: basic_mapping.xml:2034
+#, fuzzy, no-c-format
 msgid ""
-"Finally, polymorphic persistence requires the declaration of each subclass "
-"of the root persistent class. For the table-per-class-hierarchy mapping "
-"strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
+"Polymorphic persistence requires the declaration of each subclass of the "
+"root persistent class. For the table-per-class-hierarchy mapping strategy, "
+"the <literal>&lt;subclass&gt;</literal> declaration is used. For example:"
 msgstr ""
 "最后,多态持久化需要为父类的每个子类都进行定义。对于“每一棵类继承树对应一个"
 "表”的策略来说,就需要使用<literal>&lt;subclass&gt;</literal>定义。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2044
+#: basic_mapping.xml:2047
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3629,28 +3676,28 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
-#, no-c-format
+#: basic_mapping.xml:2050 basic_mapping.xml:2108 basic_mapping.xml:2171
+#, fuzzy, no-c-format
 msgid ""
-"<literal>name</literal>: The fully qualified class name of the subclass."
+"<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr "<literal>name</literal>: 子类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2052
-#, no-c-format
+#: basic_mapping.xml:2055
+#, fuzzy, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
-"name): A value that distiguishes individual subclasses."
+"name): a value that distinguishes individual subclasses."
 msgstr ""
 "<literal>discriminator-value(辨别标志)</literal> (可选 - 默认为类名):一个用于"
 "区分每个独立的子类的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
+#: basic_mapping.xml:2061
 #, fuzzy, no-c-format
 msgid ""
-"<literal>proxy</literal> (optional): Specifies a class or interface to use "
-"for lazy initializing proxies."
+"<literal>proxy</literal> (optional): specifies a class or interface used for "
+"lazy initializing proxies."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>proxy(代理)</literal> (可选): 指定一个类或者接口,在延迟装载时作为代"
@@ -3663,11 +3710,11 @@
 "用。"
 
 #. Tag: para
-#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
+#: basic_mapping.xml:2067
 #, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
-"Setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>lazy</literal> (可选, 默认是<literal>true</literal>): 设置为 "
@@ -3680,14 +3727,14 @@
 "<literal>lazy=\"false\"</literal> 禁止使用延迟装载。"
 
 #. Tag: para
-#: basic_mapping.xml:2072
-#, no-c-format
+#: basic_mapping.xml:2075
+#, fuzzy, no-c-format
 msgid ""
-"Each subclass should declare its own persistent properties and subclasses. "
+"Each subclass declares its own persistent properties and subclasses. "
 "<literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal> "
 "properties are assumed to be inherited from the root class. Each subclass in "
-"a heirarchy must define a unique <literal>discriminator-value</literal>. If "
-"none is specified, the fully qualified Java class name is used."
+"a hierarchy must define a unique <literal>discriminator-value</literal>. If "
+"this is not specified, the fully qualified Java class name is used."
 msgstr ""
 "每个子类都应该定义它自己的持久化属性和子类。 <literal>&lt;version&gt;</"
 "literal> 和<literal>&lt;id&gt;</literal> 属性可以从根父类继承下来。在一棵继承"
@@ -3695,11 +3742,11 @@
 "果没有指定,就会使用Java类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
+#: basic_mapping.xml:2083 basic_mapping.xml:2141 basic_mapping.xml:2199
 #, fuzzy, no-c-format
 msgid ""
-"For information about inheritance mappings, see <xref linkend=\"inheritance"
-"\"/>."
+"For information about inheritance mappings see <xref linkend=\"inheritance\"/"
+">."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "更多关于继承映射的信息, 参考 <xref linkend=\"inheritance\"/>章节.\n"
@@ -3709,26 +3756,26 @@
 "更多关于继承映射的信息,参考<xref linkend=\"inheritance\"/>。"
 
 #. Tag: title
-#: basic_mapping.xml:2087
-#, no-c-format
-msgid "joined-subclass"
+#: basic_mapping.xml:2090
+#, fuzzy, no-c-format
+msgid "Joined-subclass"
 msgstr "连接的子类(joined-subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2089
-#, no-c-format
+#: basic_mapping.xml:2092
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, each subclass may be mapped to its own table (table-per-"
-"subclass mapping strategy). Inherited state is retrieved by joining with the "
-"table of the superclass. We use the <literal>&lt;joined-subclass&gt;</"
-"literal> element."
+"Each subclass can also be mapped to its own table. This is called the table-"
+"per-subclass mapping strategy. An inherited state is retrieved by joining "
+"with the table of the superclass. To do this you use the <literal>&lt;joined-"
+"subclass&gt;</literal> element. For example:"
 msgstr ""
 "此外,每个子类可能被映射到他自己的表中(每个子类一个表的策略)。被继承的状态通"
 "过和超类的表关联得到。我们使用<literal>&lt;joined-subclass&gt;</literal>元"
 "素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2102
+#: basic_mapping.xml:2105
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -3754,9 +3801,9 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2110 basic_mapping.xml:2173
+#: basic_mapping.xml:2113 basic_mapping.xml:2176
 #, fuzzy, no-c-format
-msgid "<literal>table</literal>: The name of the subclass table."
+msgid "<literal>table</literal>: the name of the subclass table."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<literal>table</literal>: 子类的表名.\n"
@@ -3764,20 +3811,54 @@
 "<literal>table</literal>: 子类的表名"
 
 #. Tag: para
-#: basic_mapping.xml:2129
-#, no-c-format
+#: basic_mapping.xml:2118 basic_mapping.xml:2181
+#, fuzzy, no-c-format
 msgid ""
-"No discriminator column is required for this mapping strategy. Each subclass "
-"must, however, declare a table column holding the object identifier using "
-"the <literal>&lt;key&gt;</literal> element. The mapping at the start of the "
-"chapter would be re-written as:"
+"<literal>proxy</literal> (optional): specifies a class or interface to use "
+"for lazy initializing proxies."
 msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy(代理)</literal> (可选): 指定一个类或者接口,在延迟装载时作为代"
+"理使用。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (可选): 指定一个类或者接口,在延迟装载时作为代理使"
+"用。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>proxy</literal> (可选): 指定一个类或者接口,在延迟装载时作为代理使"
+"用。"
+
+#. Tag: para
+#: basic_mapping.xml:2124 basic_mapping.xml:2187
+#, fuzzy, no-c-format
+msgid ""
+"<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
+"setting <literal>lazy=\"false\"</literal> disables the use of lazy fetching."
+msgstr ""
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (可选, 默认是<literal>true</literal>): 设置为 "
+"<literal>lazy=\"false\"</literal> 禁止使用延迟抓取\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (可选, 默认是 <literal>true</literal>): 设置为 "
+"<literal>lazy=\"false\"</literal> 禁止使用延迟装载。\n"
+"#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
+"<literal>lazy</literal> (可选, 默认是 <literal>true</literal>): 设置为 "
+"<literal>lazy=\"false\"</literal> 禁止使用延迟装载。"
+
+#. Tag: para
+#: basic_mapping.xml:2132
+#, fuzzy, no-c-format
+msgid ""
+"A discriminator column is not required for this mapping strategy. Each "
+"subclass must, however, declare a table column holding the object identifier "
+"using the <literal>&lt;key&gt;</literal> element. The mapping at the start "
+"of the chapter would then be re-written as:"
+msgstr ""
 "这种映射策略不需要指定辨别标志(discriminator)字段。但是,每一个子类都必须使用"
 "<literal>&lt;key&gt;</literal>元素指定一个表字段来持有对象的标识符。本章开始"
 "的映射可以被用如下方式重写:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2136
+#: basic_mapping.xml:2139
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3815,24 +3896,24 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2145
-#, no-c-format
-msgid "union-subclass"
+#: basic_mapping.xml:2148
+#, fuzzy, no-c-format
+msgid "Union-subclass"
 msgstr "联合子类(union-subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2147
-#, no-c-format
+#: basic_mapping.xml:2150
+#, fuzzy, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
-"hierarchy to tables, (the table-per-concrete-class strategy) where each "
-"table defines all persistent state of the class, including inherited state. "
-"In Hibernate, it is not absolutely necessary to explicitly map such "
-"inheritance hierarchies. You can simply map each class with a separate "
-"<literal>&lt;class&gt;</literal> declaration. However, if you wish use "
-"polymorphic associations (e.g. an association to the superclass of your "
-"hierarchy), you need to use the <literal>&lt;union-subclass&gt;</literal> "
-"mapping."
+"hierarchy to tables. This is called the table-per-concrete-class strategy. "
+"Each table defines all persistent states of the class, including the "
+"inherited state. In Hibernate, it is not necessary to explicitly map such "
+"inheritance hierarchies. You can map each class with a separate <literal>&lt;"
+"class&gt;</literal> declaration. However, if you wish use polymorphic "
+"associations (e.g. an association to the superclass of your hierarchy), you "
+"need to use the <literal>&lt;union-subclass&gt;</literal> mapping. For "
+"example:"
 msgstr ""
 "第三种选择是仅仅映射类继承树中具体类部分到表中(每个具体类一张表的策略)。其"
 "中,每张表定义了类的所有持久化状态,包括继承的状态。在 Hibernate 中,并不需要"
@@ -3841,7 +3922,7 @@
 "的关联),你需要使用<literal>&lt;union-subclass&gt;</literal>映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2165
+#: basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -3866,31 +3947,31 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2192
+#: basic_mapping.xml:2195
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
 msgstr "这种映射策略不需要指定辨别标志(discriminator)字段。"
 
 #. Tag: title
-#: basic_mapping.xml:2203
-#, no-c-format
-msgid "join"
+#: basic_mapping.xml:2206
+#, fuzzy, no-c-format
+msgid "Join"
 msgstr "连接(join)"
 
 #. Tag: para
-#: basic_mapping.xml:2205
-#, no-c-format
+#: basic_mapping.xml:2208
+#, fuzzy, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
-"properties of one class to several tables, when there's a 1-to-1 "
-"relationship between the tables."
+"properties of one class to several tables that have a one-to-one "
+"relationship. For example:"
 msgstr ""
 "使用 <literal>&lt;join&gt;</literal> 元素,假若在表之间存在一对一关联,可以将"
 "一个类的属性映射到多张表中。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2219
+#: basic_mapping.xml:2222
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -3909,22 +3990,22 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2223
-#, no-c-format
-msgid "<literal>table</literal>: The name of the joined table."
+#: basic_mapping.xml:2226
+#, fuzzy, no-c-format
+msgid "<literal>table</literal>: the name of the joined table."
 msgstr "<literal>table</literal>: 被连接表的名称。"
 
 #. Tag: para
-#: basic_mapping.xml:2240
-#, no-c-format
+#: basic_mapping.xml:2243
+#, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
-"If set to <literal>join</literal>, the default, Hibernate will use an inner "
+"if set to <literal>join</literal>, the default, Hibernate will use an inner "
 "join to retrieve a <literal>&lt;join&gt;</literal> defined by a class or its "
-"superclasses and an outer join for a <literal>&lt;join&gt;</literal> defined "
-"by a subclass. If set to <literal>select</literal> then Hibernate will use a "
-"sequential select for a <literal>&lt;join&gt;</literal> defined on a "
-"subclass, which will be issued only if a row turns out to represent an "
+"superclasses. It will use an outer join for a <literal>&lt;join&gt;</"
+"literal> defined by a subclass. If set to <literal>select</literal> then "
+"Hibernate will use a sequential select for a <literal>&lt;join&gt;</literal> "
+"defined on a subclass. This will be issued only if a row represents an "
 "instance of the subclass. Inner joins will still be used to retrieve a "
 "<literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
@@ -3937,23 +4018,23 @@
 "join&gt;</literal>,依然会使用内连接得到。"
 
 #. Tag: para
-#: basic_mapping.xml:2253
-#, no-c-format
+#: basic_mapping.xml:2256
+#, fuzzy, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will not try to insert or update the "
-"properties defined by this join."
+"literal>): if enabled, Hibernate will not insert or update the properties "
+"defined by this join."
 msgstr ""
 "<literal>inverse</literal> (可选 - 默认是 <literal>false</literal>): 如果打"
 "开,Hibernate 不会插入或者更新此连接定义的属性。"
 
 #. Tag: para
-#: basic_mapping.xml:2260
-#, no-c-format
+#: basic_mapping.xml:2263
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
-"literal>): If enabled, Hibernate will insert a row only if the properties "
-"defined by this join are non-null and will always use an outer join to "
+"literal>): if enabled, Hibernate will insert a row only if the properties "
+"defined by this join are non-null. It will always use an outer join to "
 "retrieve the properties."
 msgstr ""
 "<literal>optional</literal> (可选 - 默认是 <literal>false</literal>): 如果打"
@@ -3961,17 +4042,17 @@
 "接来得到这些属性。"
 
 #. Tag: para
-#: basic_mapping.xml:2269
-#, no-c-format
+#: basic_mapping.xml:2272
+#, fuzzy, no-c-format
 msgid ""
-"For example, the address information for a person can be mapped to a "
-"separate table (while preserving value type semantics for all properties):"
+"For example, address information for a person can be mapped to a separate "
+"table while preserving value type semantics for all properties:"
 msgstr ""
 "例如,一个人(person)的地址(address)信息可以被映射到单独的表中(并保留所有属性"
 "的值类型语义):"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2274
+#: basic_mapping.xml:2277
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -3989,10 +4070,10 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2276
-#, no-c-format
+#: basic_mapping.xml:2279
+#, fuzzy, no-c-format
 msgid ""
-"This feature is often only useful for legacy data models, we recommend fewer "
+"This feature is often only useful for legacy data models. We recommend fewer "
 "tables than classes and a fine-grained domain model. However, it is useful "
 "for switching between inheritance mapping strategies in a single hierarchy, "
 "as explained later."
@@ -4001,26 +4082,26 @@
 "型。然而,在单独的继承树上切换继承映射策略是有用的,后面会解释这点。"
 
 #. Tag: title
-#: basic_mapping.xml:2286
+#: basic_mapping.xml:2289
 #, no-c-format
-msgid "<title>key</title>"
+msgid "<title>Key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2288
-#, no-c-format
+#: basic_mapping.xml:2291
+#, fuzzy, no-c-format
 msgid ""
-"We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
-"now. It appears anywhere the parent mapping element defines a join to a new "
-"table, and defines the foreign key in the joined table, that references the "
-"primary key of the original table."
+"The <literal>&lt;key&gt;</literal> element has featured a few times within "
+"this guide. It appears anywhere the parent mapping element defines a join to "
+"a new table that references the primary key of the original table. It also "
+"defines the foreign key in the joined table:"
 msgstr ""
 "我们目前已经见到过<literal>&lt;key&gt;</literal>元素多次了。 这个元素在父映射"
 "元素定义了对新表的连接,并且在被连接表中定义了一个外键引用原表的主键的情况下"
 "经常使用。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2304
+#: basic_mapping.xml:2307
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4034,70 +4115,70 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2315
-#, no-c-format
+#: basic_mapping.xml:2318
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
-"literal>): Specifies whether the foreign key constraint has database-level "
+"<literal>on-delete</literal> (optional - defaults to <literal>noaction</"
+"literal>): specifies whether the foreign key constraint has database-level "
 "cascade delete enabled."
 msgstr ""
 "<literal>on-delete</literal> (可选, 默认是 <literal>noaction</literal>): 表明"
 "外键关联是否打开数据库级别的级联删除。"
 
 #. Tag: para
-#: basic_mapping.xml:2322
-#, no-c-format
+#: basic_mapping.xml:2325
+#, fuzzy, no-c-format
 msgid ""
-"<literal>property-ref</literal> (optional): Specifies that the foreign key "
-"refers to columns that are not the primary key of the orginal table. "
-"(Provided for legacy data.)"
+"<literal>property-ref</literal> (optional): specifies that the foreign key "
+"refers to columns that are not the primary key of the original table. It is "
+"provided for legacy data."
 msgstr ""
 "<literal>property-ref</literal> (可选): 表明外键引用的字段不是原表的主键(提供"
 "给遗留数据)。"
 
 #. Tag: para
-#: basic_mapping.xml:2329
-#, no-c-format
+#: basic_mapping.xml:2332
+#, fuzzy, no-c-format
 msgid ""
-"<literal>not-null</literal> (optional): Specifies that the foreign key "
-"columns are not nullable (this is implied whenever the foreign key is also "
-"part of the primary key)."
+"<literal>not-null</literal> (optional): specifies that the foreign key "
+"columns are not nullable. This is implied whenever the foreign key is also "
+"part of the primary key."
 msgstr ""
 "<literal>not-null</literal> (可选): 表明外键的字段不可为空(这意味着无论何时外"
 "键都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2336
-#, no-c-format
+#: basic_mapping.xml:2339
+#, fuzzy, no-c-format
 msgid ""
-"<literal>update</literal> (optional): Specifies that the foreign key should "
-"never be updated (this is implied whenever the foreign key is also part of "
-"the primary key)."
+"<literal>update</literal> (optional): specifies that the foreign key should "
+"never be updated. This is implied whenever the foreign key is also part of "
+"the primary key."
 msgstr ""
 "<literal>update</literal> (可选): 表明外键决不应该被更新(这意味着无论何时外键"
 "都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2343
-#, no-c-format
+#: basic_mapping.xml:2346
+#, fuzzy, no-c-format
 msgid ""
-"<literal>unique</literal> (optional): Specifies that the foreign key should "
-"have a unique constraint (this is implied whenever the foreign key is also "
-"the primary key)."
+"<literal>unique</literal> (optional): specifies that the foreign key should "
+"have a unique constraint. This is implied whenever the foreign key is also "
+"the primary key."
 msgstr ""
 "<literal>unique</literal> (可选): 表明外键应有唯一性约束 (这意味着无论何时外"
 "键都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2351
-#, no-c-format
+#: basic_mapping.xml:2354
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that for systems where delete performance is important, all "
-"keys should be defined <literal>on-delete=\"cascade\"</literal>, and "
-"Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> "
-"constraint, instead of many individual <literal>DELETE</literal> statements. "
-"Be aware that this feature bypasses Hibernate's usual optimistic locking "
-"strategy for versioned data."
+"For systems where delete performance is important, we recommend that all "
+"keys should be defined <literal>on-delete=\"cascade\"</literal>. Hibernate "
+"uses a database-level <literal>ON CASCADE DELETE</literal> constraint, "
+"instead of many individual <literal>DELETE</literal> statements. Be aware "
+"that this feature bypasses Hibernate's usual optimistic locking strategy for "
+"versioned data."
 msgstr ""
 "对那些看重删除性能的系统,我们推荐所有的键都应该定义为<literal>on-delete="
 "\"cascade\"</literal>,这样 Hibernate 将使用数据库级的<literal>ON CASCADE "
@@ -4105,12 +4186,12 @@
 "性会绕过 Hibernate 通常对版本数据(versioned data)采用的乐观锁策略。"
 
 #. Tag: para
-#: basic_mapping.xml:2359
-#, no-c-format
+#: basic_mapping.xml:2362
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
-"useful when mapping a unidirectional one to many association. If you map a "
-"unidirectional one to many to a non-nullable foreign key, you "
+"useful when mapping a unidirectional one-to-many association. If you map a "
+"unidirectional one-to-many association to a non-nullable foreign key, you "
 "<emphasis>must</emphasis> declare the key column using <literal>&lt;key not-"
 "null=\"true\"&gt;</literal>."
 msgstr ""
@@ -4120,26 +4201,26 @@
 "定义此键字段。"
 
 #. Tag: title
-#: basic_mapping.xml:2369
-#, no-c-format
-msgid "column and formula elements"
+#: basic_mapping.xml:2372
+#, fuzzy, no-c-format
+msgid "Column and formula elements"
 msgstr "字段和规则元素(column and formula elements)"
 
 #. Tag: para
-#: basic_mapping.xml:2370
-#, no-c-format
+#: basic_mapping.xml:2373
+#, fuzzy, no-c-format
 msgid ""
-"Any mapping element which accepts a <literal>column</literal> attribute will "
+"Mapping elements which accept a <literal>column</literal> attribute will "
 "alternatively accept a <literal>&lt;column&gt;</literal> subelement. "
 "Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the "
-"<literal>formula</literal> attribute."
+"<literal>formula</literal> attribute. For example:"
 msgstr ""
 "任何接受<literal>column</literal>属性的映射元素都可以选择接受<literal>&lt;"
 "column&gt;</literal> 子元素。同样的,<literal>formula</literal>子元素也可以替"
 "换<literal>&lt;formula&gt;</literal>属性。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2379
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4157,16 +4238,16 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2378
+#: basic_mapping.xml:2381
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2380
-#, no-c-format
+#: basic_mapping.xml:2383
+#, fuzzy, no-c-format
 msgid ""
-"<literal>column</literal> and <literal>formula</literal> attributes may even "
+"<literal>column</literal> and <literal>formula</literal> attributes can even "
 "be combined within the same property or association mapping to express, for "
 "example, exotic join conditions."
 msgstr ""
@@ -4174,7 +4255,7 @@
 "属性或关联映射中被合并来表达,例如,一些奇异的连接条件。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2386
+#: basic_mapping.xml:2389
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4185,33 +4266,33 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2391
-#, no-c-format
-msgid "import"
+#: basic_mapping.xml:2394
+#, fuzzy, no-c-format
+msgid "Import"
 msgstr "引用(import)"
 
 #. Tag: para
-#: basic_mapping.xml:2393
-#, no-c-format
+#: basic_mapping.xml:2396
+#, fuzzy, no-c-format
 msgid ""
-"Suppose your application has two persistent classes with the same name, and "
-"you don't want to specify the fully qualified (package) name in Hibernate "
-"queries. Classes may be \"imported\" explicitly, rather than relying upon "
-"<literal>auto-import=\"true\"</literal>. You may even import classes and "
-"interfaces that are not explicitly mapped."
+"If your application has two persistent classes with the same name, and you "
+"do not want to specify the fully qualified package name in Hibernate "
+"queries, classes can be \"imported\" explicitly, rather than relying upon "
+"<literal>auto-import=\"true\"</literal>. You can also import classes and "
+"interfaces that are not explicitly mapped:"
 msgstr ""
 "假设你的应用程序有两个同样名字的持久化类,但是你不想在Hibernate查询中使用他们"
 "的全限定名。除了依赖<literal>auto-import=\"true\"</literal>以外,类也可以被显"
 "式地“import(引用)”。你甚至可以引用没有被明确映射的类和接口。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2400
+#: basic_mapping.xml:2403
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2407
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4221,41 +4302,40 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2410
-#, no-c-format
+#: basic_mapping.xml:2413
+#, fuzzy, no-c-format
 msgid ""
-"<literal>class</literal>: The fully qualified class name of of any Java "
-"class."
+"<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr "<literal>class</literal>: 任何Java类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2415
-#, no-c-format
+#: basic_mapping.xml:2418
+#, fuzzy, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
-"name): A name that may be used in the query language."
+"name): a name that can be used in the query language."
 msgstr ""
 "<literal>rename</literal> (可选 - 默认为类的全限定名): 在查询语句中可以使用的"
 "名字。"
 
 #. Tag: title
-#: basic_mapping.xml:2426
+#: basic_mapping.xml:2429
 #, no-c-format
-msgid "<title>any</title>"
+msgid "<title>Any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2428
-#, no-c-format
+#: basic_mapping.xml:2431
+#, fuzzy, no-c-format
 msgid ""
-"There is one further type of property mapping. The <literal>&lt;any&gt;</"
+"There is one more type of property mapping. The <literal>&lt;any&gt;</"
 "literal> mapping element defines a polymorphic association to classes from "
-"multiple tables. This type of mapping always requires more than one column. "
-"The first column holds the type of the associated entity. The remaining "
-"columns hold the identifier. It is impossible to specify a foreign key "
-"constraint for this kind of association, so this is most certainly not meant "
-"as the usual way of mapping (polymorphic) associations. You should use this "
-"only in very special cases (eg. audit logs, user session data, etc)."
+"multiple tables. This type of mapping requires more than one column. The "
+"first column contains the type of the associated entity. The remaining "
+"columns contain the identifier. It is impossible to specify a foreign key "
+"constraint for this kind of association. This is not the usual way of "
+"mapping polymorphic associations and you should use this only in special "
+"cases. For example, for audit logs, user session data, etc."
 msgstr ""
 "这是属性映射的又一种类型。<literal>&lt;any&gt;</literal> 映射元素定义了一种从"
 "多个表到类的多态关联。这种类型的映射常常需要多于一个字段。第一个字段持有被关"
@@ -4264,11 +4344,11 @@
 "用它(比如,审计log,用户会话数据等等)。"
 
 #. Tag: para
-#: basic_mapping.xml:2438
-#, no-c-format
+#: basic_mapping.xml:2441
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>meta-type</literal> attribute lets the application specify a "
-"custom type that maps database column values to persistent classes which "
+"The <literal>meta-type</literal> attribute allows the application to specify "
+"a custom type that maps database column values to persistent classes that "
 "have identifier properties of the type specified by <literal>id-type</"
 "literal>. You must specify the mapping from values of the meta-type to class "
 "names."
@@ -4278,7 +4358,7 @@
 "识符属性。 你必须指定从meta-type的值到类名的映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2445
+#: basic_mapping.xml:2448
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4291,7 +4371,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2456
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4312,29 +4392,29 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2459
+#: basic_mapping.xml:2462
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>: 属性名"
 
 #. Tag: para
-#: basic_mapping.xml:2464
+#: basic_mapping.xml:2467
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>: 标识符类型"
 
 #. Tag: para
-#: basic_mapping.xml:2469
-#, no-c-format
+#: basic_mapping.xml:2472
+#, fuzzy, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
-"literal>): Any type that is allowed for a discriminator mapping."
+"literal>): any type that is allowed for a discriminator mapping."
 msgstr ""
 "<literal>meta-type</literal> (可选 -默认是 <literal>string</literal>): 允许辨"
 "别标志(discriminator)映射的任何类型"
 
 #. Tag: para
-#: basic_mapping.xml:2475
+#: basic_mapping.xml:2478
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4343,12 +4423,12 @@
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: para
-#: basic_mapping.xml:2487
-#, no-c-format
+#: basic_mapping.xml:2490
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Specifies that updates to this property do or do not require "
-"acquisition of the optimistic lock. In other words, define if a version "
+"literal>): specifies that updates to this property either do or do not "
+"require acquisition of the optimistic lock. It defines whether a version "
 "increment should occur if this property is dirty."
 msgstr ""
 "<literal>optimistic-lock</literal> (可选 -默认是 <literal>true</literal>): 表"
@@ -4356,38 +4436,37 @@
 "(Version)"
 
 #. Tag: title
-#: basic_mapping.xml:2502
-#, no-c-format
-msgid "Hibernate Types"
+#: basic_mapping.xml:2505
+#, fuzzy, no-c-format
+msgid "Hibernate types"
 msgstr "Hibernate 的类型"
 
 #. Tag: title
-#: basic_mapping.xml:2505
+#: basic_mapping.xml:2508
 #, no-c-format
 msgid "Entities and values"
 msgstr "实体(Entities)和值(values)"
 
 #. Tag: para
-#: basic_mapping.xml:2507
+#: basic_mapping.xml:2510
 #, no-c-format
 msgid ""
-"To understand the behaviour of various Java language-level objects with "
-"respect to the persistence service, we need to classify them into two groups:"
+"In relation to the persistence service, Java language-level objects are "
+"classified into two groups:"
 msgstr ""
-"为了理解很多与持久化服务相关的Java语言级对象的行为,我们需要把它们分为两类:"
 
 #. Tag: para
-#: basic_mapping.xml:2512
-#, no-c-format
+#: basic_mapping.xml:2515
+#, fuzzy, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
-"holding references to the entity. Contrast this with the usual Java model "
+"holding references to the entity. Contrast this with the usual Java model, "
 "where an unreferenced object is garbage collected. Entities must be "
-"explicitly saved and deleted (except that saves and deletions may be "
-"<emphasis>cascaded</emphasis> from a parent entity to its children). This is "
-"different from the ODMG model of object persistence by reachablity - and "
+"explicitly saved and deleted. Saves and deletions, however, can be "
+"<emphasis>cascaded</emphasis> from a parent entity to its children. This is "
+"different from the ODMG model of object persistence by reachability and "
 "corresponds more closely to how application objects are usually used in "
-"large systems. Entities support circular and shared references. They may "
+"large systems. Entities support circular and shared references. They can "
 "also be versioned."
 msgstr ""
 "<emphasis>实体entity</emphasis> 独立于任何持有实体引用的对象。与通常的Java模"
@@ -4397,16 +4476,16 @@
 "大系统中的使用方法。实体支持循环引用和交叉引用,它们也可以加上版本信息。"
 
 #. Tag: para
-#: basic_mapping.xml:2523
-#, no-c-format
+#: basic_mapping.xml:2526
+#, fuzzy, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
-"instances of <emphasis>value</emphasis> types. Values are primitives, "
-"collections (not what's inside a collection), components and certain "
-"immutable objects. Unlike entities, values (in particular collections and "
-"components) <emphasis>are</emphasis> persisted and deleted by reachability. "
-"Since value objects (and primitives) are persisted and deleted along with "
-"their containing entity they may not be independently versioned. Values have "
+"instances of <emphasis>value</emphasis> types. Values are primitives: "
+"collections (not what is inside a collection), components and certain "
+"immutable objects. Unlike entities, values in particular collections and "
+"components, <emphasis>are</emphasis> persisted and deleted by reachability. "
+"Since value objects and primitives are persisted and deleted along with "
+"their containing entity, they cannot be independently versioned. Values have "
 "no independent identity, so they cannot be shared by two entities or "
 "collections."
 msgstr ""
@@ -4417,20 +4496,20 @@
 "息。值没有独立的标识,所以他们不能被两个实体或者集合共享。"
 
 #. Tag: para
-#: basic_mapping.xml:2534
-#, no-c-format
+#: basic_mapping.xml:2537
+#, fuzzy, no-c-format
 msgid ""
-"Up until now, we've been using the term \"persistent class\" to refer to "
-"entities. We will continue to do that. Strictly speaking, however, not all "
-"user-defined classes with persistent state are entities. A "
-"<emphasis>component</emphasis> is a user defined class with value semantics. "
-"A Java property of type <literal>java.lang.String</literal> also has value "
-"semantics. Given this definition, we can say that all types (classes) "
-"provided by the JDK have value type semantics in Java, while user-defined "
-"types may be mapped with entity or value type semantics. This decision is up "
-"to the application developer. A good hint for an entity class in a domain "
-"model are shared references to a single instance of that class, while "
-"composition or aggregation usually translates to a value type."
+"Until now, we have been using the term \"persistent class\" to refer to "
+"entities. We will continue to do that. Not all user-defined classes with a "
+"persistent state, however, are entities. A <emphasis>component</emphasis> is "
+"a user-defined class with value semantics. A Java property of type "
+"<literal>java.lang.String</literal> also has value semantics. Given this "
+"definition, all types (classes) provided by the JDK have value type "
+"semantics in Java, while user-defined types can be mapped with entity or "
+"value type semantics. This decision is up to the application developer. An "
+"entity class in a domain model will normally have shared references to a "
+"single instance of that class, while composition or aggregation usually "
+"translates to a value type."
 msgstr ""
 "直到现在,我们都一直使用术语“持久类”(persistent class)来代表实体。我们仍然会"
 "这么做。 然而严格说来,不是所有的用户自定义的,带有持久化状态的类都是实体。"
@@ -4441,26 +4520,25 @@
 "索是共享引用指向这个类的单一实例,而组合或聚合通常被转化为值类型。"
 
 #. Tag: para
-#: basic_mapping.xml:2548
-#, no-c-format
-msgid "We'll revisit both concepts throughout the documentation."
+#: basic_mapping.xml:2551
+#, fuzzy, no-c-format
+msgid "We will revisit both concepts throughout this reference guide."
 msgstr "我们会在本文档中重复碰到这两个概念。"
 
 #. Tag: para
-#: basic_mapping.xml:2552
-#, no-c-format
+#: basic_mapping.xml:2555
+#, fuzzy, no-c-format
 msgid ""
-"The challenge is to map the Java type system (and the developers' definition "
-"of entities and value types) to the SQL/database type system. The bridge "
-"between both systems is provided by Hibernate: for entities we use "
-"<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so "
-"on. For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
-"component&gt;</literal>, etc, usually with a <literal>type</literal> "
+"The challenge is to map the Java type system, and the developers' definition "
+"of entities and value types, to the SQL/database type system. The bridge "
+"between both systems is provided by Hibernate. For entities, <literal>&lt;"
+"class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and so on are used. "
+"For value types we use <literal>&lt;property&gt;</literal>, <literal>&lt;"
+"component&gt;</literal>etc., that usually have a <literal>type</literal> "
 "attribute. The value of this attribute is the name of a Hibernate "
-"<emphasis>mapping type</emphasis>. Hibernate provides many mappings (for "
-"standard JDK value types) out of the box. You can write your own mapping "
-"types and implement your custom conversion strategies as well, as you'll see "
-"later."
+"<emphasis>mapping type</emphasis>. Hibernate provides a range of mappings "
+"for standard JDK value types out of the box. You can write your own mapping "
+"types and implement your own custom conversion strategies."
 msgstr ""
 "挑战在于将java类型系统(和开发者定义的实体和值类型)映射到 SQL/数据库类型系统。"
 "Hibernate提供了连接两个系统之间的桥梁:对于实体类型,我们使用<literal>&lt;"
@@ -4472,27 +4550,29 @@
 "们会看到这点。"
 
 #. Tag: para
-#: basic_mapping.xml:2565
-#, no-c-format
-msgid "All built-in Hibernate types except collections support null semantics."
+#: basic_mapping.xml:2568
+#, fuzzy, no-c-format
+msgid ""
+"With the exception of collections, all built-in Hibernate types support null "
+"semantics."
 msgstr "所有的Hibernate内建类型,除了collections以外,都支持空(null)语义。"
 
 #. Tag: title
-#: basic_mapping.xml:2572
+#: basic_mapping.xml:2575
 #, no-c-format
 msgid "Basic value types"
 msgstr "基本值类型"
 
 #. Tag: para
-#: basic_mapping.xml:2574
+#: basic_mapping.xml:2577
 #, fuzzy, no-c-format
 msgid ""
-"The built-in <emphasis>basic mapping types</emphasis> may be roughly "
-"categorized into"
+"The built-in <emphasis>basic mapping types</emphasis> can be roughly "
+"categorized into the following:"
 msgstr "内建的 <emphasis>基本映射类型</emphasis>可以大致分为 <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2579
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4502,7 +4582,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2582
+#: basic_mapping.xml:2585
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4516,13 +4596,13 @@
 "法。"
 
 #. Tag: literal
-#: basic_mapping.xml:2591
+#: basic_mapping.xml:2594
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2593
+#: basic_mapping.xml:2596
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4532,13 +4612,13 @@
 "Oracle的 <literal>VARCHAR2</literal>)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2600
+#: basic_mapping.xml:2603
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2602
+#: basic_mapping.xml:2605
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4549,13 +4629,13 @@
 "<literal>TIME</literal> 和<literal>TIMESTAMP</literal> (或等价类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2610
+#: basic_mapping.xml:2613
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2612
+#: basic_mapping.xml:2615
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4565,13 +4645,13 @@
 "literal>和 <literal>DATE</literal>(或等价类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2620
+#: basic_mapping.xml:2623
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2625
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4583,13 +4663,13 @@
 "类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2633
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2635
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4606,13 +4686,13 @@
 "literal>的实例被影射为它的<literal>ID</literal>。"
 
 #. Tag: literal
-#: basic_mapping.xml:2644
-#, fuzzy, no-c-format
-msgid "<literal>class</literal>"
-msgstr "<literal>all(全部)</literal> 检查全部字段"
+#: basic_mapping.xml:2647
+#, no-c-format
+msgid "class"
+msgstr "class"
 
 #. Tag: para
-#: basic_mapping.xml:2646
+#: basic_mapping.xml:2649
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4624,25 +4704,25 @@
 "射为它的全限定名。"
 
 #. Tag: literal
-#: basic_mapping.xml:2654
+#: basic_mapping.xml:2657
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2656
+#: basic_mapping.xml:2659
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "把字节数组(byte arrays)映射为对应的 SQL二进制类型。"
 
 #. Tag: literal
-#: basic_mapping.xml:2662
+#: basic_mapping.xml:2665
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2664
+#: basic_mapping.xml:2667
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4652,16 +4732,16 @@
 "型。"
 
 #. Tag: literal
-#: basic_mapping.xml:2671
+#: basic_mapping.xml:2674
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2673
-#, no-c-format
+#: basic_mapping.xml:2676
+#, fuzzy, no-c-format
 msgid ""
-"Maps serializable Java types to an appropriate SQL binary type. You may also "
+"Maps serializable Java types to an appropriate SQL binary type. You can also "
 "indicate the Hibernate type <literal>serializable</literal> with the name of "
 "a serializable Java class or interface that does not default to a basic type."
 msgstr ""
@@ -4669,26 +4749,26 @@
 "型的可序列化Java类或者接口指定Hibernate类型<literal>serializable</literal>。"
 
 #. Tag: literal
-#: basic_mapping.xml:2682
+#: basic_mapping.xml:2685
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2684
-#, no-c-format
+#: basic_mapping.xml:2687
+#, fuzzy, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
-"<literal>java.sql.Blob</literal>. These types may be inconvenient for some "
-"applications, since the blob or clob object may not be reused outside of a "
-"transaction. (Furthermore, driver support is patchy and inconsistent.)"
+"<literal>java.sql.Blob</literal>. These types can be inconvenient for some "
+"applications, since the blob or clob object cannot be reused outside of a "
+"transaction. Driver support is patchy and inconsistent."
 msgstr ""
 "JDBC 类 <literal>java.sql.Clob</literal> 和 <literal>java.sql.Blob</literal>"
 "的映射。某些程序可能不适合使用这个类型,因为blob和clob对象可能在一个事务之外"
 "是无法重用的。(而且, 驱动程序对这种类型的支持充满着补丁和前后矛盾。)"
 
 #. Tag: literal
-#: basic_mapping.xml:2694
+#: basic_mapping.xml:2697
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -4698,16 +4778,16 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2698
-#, no-c-format
+#: basic_mapping.xml:2701
+#, fuzzy, no-c-format
 msgid ""
-"Type mappings for what are usually considered mutable Java types, where "
+"Type mappings for what are considered mutable Java types. This is where "
 "Hibernate makes certain optimizations appropriate only for immutable Java "
 "types, and the application treats the object as immutable. For example, you "
 "should not call <literal>Date.setTime()</literal> for an instance mapped as "
 "<literal>imm_timestamp</literal>. To change the value of the property, and "
-"have that change made persistent, the application must assign a new "
-"(nonidentical) object to the property."
+"have that change made persistent, the application must assign a new, "
+"nonidentical, object to the property."
 msgstr ""
 "一般来说,映射类型被假定为是可变的Java类型,只有对不可变Java类型,Hibernate会"
 "采取特定的优化措施,应用程序会把这些对象作为不可变对象处理。比如,你不应该对"
@@ -4716,19 +4796,20 @@
 "个新的(不一样的)对象。"
 
 #. Tag: para
-#: basic_mapping.xml:2713
-#, no-c-format
+#: basic_mapping.xml:2716
+#, fuzzy, no-c-format
 msgid ""
-"Unique identifiers of entities and collections may be of any basic type "
+"Unique identifiers of entities and collections can be of any basic type "
 "except <literal>binary</literal>, <literal>blob</literal> and <literal>clob</"
-"literal>. (Composite identifiers are also allowed, see below.)"
+"literal>. Composite identifiers are also allowed. See below for more "
+"information."
 msgstr ""
 "实体及其集合的唯一标识可以是除了<literal>binary</literal>、 <literal>blob</"
 "literal> 和 <literal>clob</literal>之外的任何基础类型。(联合标识也是允许的,"
 "后面会说到。)"
 
 #. Tag: para
-#: basic_mapping.xml:2719
+#: basic_mapping.xml:2722
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -4741,20 +4822,20 @@
 "<literal>string</literal> 类型。"
 
 #. Tag: title
-#: basic_mapping.xml:2728
+#: basic_mapping.xml:2731
 #, no-c-format
 msgid "Custom value types"
 msgstr "自定义值类型"
 
 #. Tag: para
-#: basic_mapping.xml:2730
-#, no-c-format
+#: basic_mapping.xml:2733
+#, fuzzy, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
 "example, you might want to persist properties of type <literal>java.lang."
 "BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate does "
-"not provide a built-in type for this. But custom types are not limited to "
-"mapping a property (or collection element) to a single table column. So, for "
+"not provide a built-in type for this. Custom types are not limited to "
+"mapping a property, or collection element, to a single table column. So, for "
 "example, you might have a Java property <literal>getName()</literal>/"
 "<literal>setName()</literal> of type <literal>java.lang.String</literal> "
 "that is persisted to the columns <literal>FIRST_NAME</literal>, "
@@ -4770,14 +4851,14 @@
 "literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:2741
-#, no-c-format
+#: basic_mapping.xml:2744
+#, fuzzy, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
 "UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> and "
-"declare properties using the fully qualified classname of the type. Check "
-"out <literal>org.hibernate.test.DoubleStringType</literal> to see the kind "
-"of things that are possible."
+"declare properties using the fully qualified classname of the type. View "
+"<literal>org.hibernate.test.DoubleStringType</literal> to see the kind of "
+"things that are possible."
 msgstr ""
 "要实现一个自定义类型,可以实现<literal>org.hibernate.UserType</literal>或"
 "<literal>org.hibernate.CompositeUserType</literal>中的任一个,并且使用类型的"
@@ -4785,7 +4866,7 @@
 "DoubleStringType</literal>这个例子,看看它是怎么做的。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2749
+#: basic_mapping.xml:2752
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -4796,7 +4877,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2751
+#: basic_mapping.xml:2754
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -4806,7 +4887,7 @@
 "法。"
 
 #. Tag: para
-#: basic_mapping.xml:2756
+#: basic_mapping.xml:2759
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -4819,10 +4900,10 @@
 "接口为更特殊的使用方式提供支持。"
 
 #. Tag: para
-#: basic_mapping.xml:2762
-#, no-c-format
+#: basic_mapping.xml:2765
+#, fuzzy, no-c-format
 msgid ""
-"You may even supply parameters to a <literal>UserType</literal> in the "
+"You can even supply parameters to a <literal>UserType</literal> in the "
 "mapping file. To do this, your <literal>UserType</literal> must implement "
 "the <literal>org.hibernate.usertype.ParameterizedType</literal> interface. "
 "To supply parameters to your custom type, you can use the <literal>&lt;"
@@ -4834,7 +4915,7 @@
 "使用<literal>&lt;type&gt;</literal>元素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2770
+#: basic_mapping.xml:2773
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -4845,7 +4926,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2772
+#: basic_mapping.xml:2775
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -4856,21 +4937,21 @@
 "象中得到<literal>default</literal> 参数的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2777
-#, no-c-format
+#: basic_mapping.xml:2780
+#, fuzzy, no-c-format
 msgid ""
-"If you use a certain <literal>UserType</literal> very often, it may be "
-"useful to define a shorter name for it. You can do this using the "
-"<literal>&lt;typedef&gt;</literal> element. Typedefs assign a name to a "
-"custom type, and may also contain a list of default parameter values if the "
-"type is parameterized."
+"If you regularly use a certain <literal>UserType</literal>, it is useful to "
+"define a shorter name for it. You can do this using the <literal>&lt;"
+"typedef&gt;</literal> element. Typedefs assign a name to a custom type, and "
+"can also contain a list of default parameter values if the type is "
+"parameterized."
 msgstr ""
 "如果你非常频繁地使用某一<literal>UserType</literal>,可以为他定义一个简称。这"
 "可以通过使用 <literal>&lt;typedef&gt;</literal>元素来实现。Typedefs为一自定义"
 "类型赋予一个名称,并且如果此类型是参数化的,还可以包含一系列默认的参数值。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2784
+#: basic_mapping.xml:2787
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -4880,13 +4961,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2786
+#: basic_mapping.xml:2789
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2788
+#: basic_mapping.xml:2791
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -4894,18 +4975,17 @@
 msgstr "也可以根据具体案例通过属性映射中的类型参数覆盖在typedef中提供的参数。"
 
 #. Tag: para
-#: basic_mapping.xml:2793
-#, no-c-format
+#: basic_mapping.xml:2796
+#, fuzzy, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
-"components means you will very rarely <emphasis>need</emphasis> to use a "
-"custom type, it is nevertheless considered good form to use custom types for "
-"(non-entity) classes that occur frequently in your application. For example, "
-"a <literal>MonetaryAmount</literal> class is a good candidate for a "
-"<literal>CompositeUserType</literal>, even though it could easily be mapped "
-"as a component. One motivation for this is abstraction. With a custom type, "
-"your mapping documents would be future-proofed against possible changes in "
-"your way of representing monetary values."
+"components means you will rarely need to use a custom type, it is considered "
+"good practice to use custom types for non-entity classes that occur "
+"frequently in your application. For example, a <literal>MonetaryAmount</"
+"literal> class is a good candidate for a <literal>CompositeUserType</"
+"literal>, even though it could be mapped as a component. One reason for this "
+"is abstraction. With a custom type, your mapping documents would be "
+"protected against changes to the way monetary values are represented."
 msgstr ""
 "尽管 Hibernate 内建的丰富的类型和对组件的支持意味着你可能很少 <emphasis>需要"
 "</emphasis>使用自定义类型。不过,为那些在你的应用中经常出现的(非实体)类使用自"
@@ -4915,19 +4995,19 @@
 "方法时,它可以保证映射文件不需要修改。"
 
 #. Tag: title
-#: basic_mapping.xml:2809
+#: basic_mapping.xml:2812
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "多次映射同一个类"
 
 #. Tag: para
-#: basic_mapping.xml:2810
-#, no-c-format
+#: basic_mapping.xml:2813
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
-"class. In this case you must specify an <emphasis>entity name</emphasis> do "
-"disambiguate between instances of the two mapped entities. (By default, the "
-"entity name is the same as the class name.) Hibernate lets you specify the "
+"class. In this case, you must specify an <emphasis>entity name</emphasis> to "
+"disambiguate between instances of the two mapped entities. By default, the "
+"entity name is the same as the class name. Hibernate lets you specify the "
 "entity name when working with persistent objects, when writing queries, or "
 "when mapping associations to the named entity."
 msgstr ""
@@ -4937,7 +5017,7 @@
 "时,允许你指定这个entity name(实体名字)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2821
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -4960,30 +5040,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2820
-#, no-c-format
+#: basic_mapping.xml:2823
+#, fuzzy, no-c-format
 msgid ""
-"Notice how associations are now specified using <literal>entity-name</"
-"literal> instead of <literal>class</literal>."
+"Associations are now specified using <literal>entity-name</literal> instead "
+"of <literal>class</literal>."
 msgstr ""
 "注意这里关联是如何用<literal>entity-name</literal>来代替<literal>class</"
 "literal>的。"
 
 #. Tag: title
-#: basic_mapping.xml:2828
+#: basic_mapping.xml:2831
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL中引号包围的标识符"
 
 #. Tag: para
-#: basic_mapping.xml:2829
-#, no-c-format
+#: basic_mapping.xml:2832
+#, fuzzy, no-c-format
 msgid ""
-"You may force Hibernate to quote an identifier in the generated SQL by "
+"You can force Hibernate to quote an identifier in the generated SQL by "
 "enclosing the table or column name in backticks in the mapping document. "
 "Hibernate will use the correct quotation style for the SQL <literal>Dialect</"
-"literal> (usually double quotes, but brackets for SQL Server and backticks "
-"for MySQL)."
+"literal>. This is usually double quotes, but the SQL Server uses brackets "
+"and MySQL uses backticks."
 msgstr ""
 "你可通过在映射文档中使用反向引号(`)把表名或者字段名包围起来,以强制Hibernate"
 "在生成的SQL中把标识符用引号包围起来。Hibernate会使用相应的"
@@ -4991,7 +5071,7 @@
 "SQL Server中是括号,MySQL中是反向引号)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2836
+#: basic_mapping.xml:2839
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5003,36 +5083,36 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2842
+#: basic_mapping.xml:2845
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "其他元数据(Metadata)"
 
 #. Tag: para
-#: basic_mapping.xml:2844
-#, no-c-format
+#: basic_mapping.xml:2847
+#, fuzzy, no-c-format
 msgid ""
-"XML isn't for everyone, and so there are some alternative ways to define O/R "
+"XML does not suit all users so there are some alternative ways to define O/R "
 "mapping metadata in Hibernate."
 msgstr ""
 "XML 并不适用于所有人, 因此有其他定义Hibernate O/R 映射元数据(metadata)的方"
 "法。"
 
 #. Tag: title
-#: basic_mapping.xml:2849
+#: basic_mapping.xml:2852
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "使用 XDoclet 标记"
 
 #. Tag: para
-#: basic_mapping.xml:2851
-#, no-c-format
+#: basic_mapping.xml:2854
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
-"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not "
-"cover this approach in this document, since strictly it is considered part "
-"of XDoclet. However, we include the following example of the <literal>Cat</"
-"literal> class with XDoclet mappings."
+"sourcecode using XDoclet <literal>@hibernate.tags</literal>. We do not cover "
+"this approach in this reference guide since it is considered part of "
+"XDoclet. However, we include the following example of the <literal>Cat</"
+"literal> class with XDoclet mappings:"
 msgstr ""
 "很多Hibernate使用者更喜欢使用XDoclet<literal>@hibernate.tags</literal>将映射"
 "信息直接嵌入到源代码中。我们不会在本文档中涉及这个方法,因为严格说来,这属于"
@@ -5040,7 +5120,7 @@
 "类的例子。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2858
+#: basic_mapping.xml:2861
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5150,30 +5230,30 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2860
-#, no-c-format
-msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
+#: basic_mapping.xml:2863
+#, fuzzy, no-c-format
+msgid "See the Hibernate website for more examples of XDoclet and Hibernate."
 msgstr "参考Hibernate网站更多的Xdoclet和Hibernate的例子"
 
 #. Tag: title
-#: basic_mapping.xml:2867
+#: basic_mapping.xml:2870
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "使用 JDK 5.0 的注解(Annotation)"
 
 #. Tag: para
-#: basic_mapping.xml:2869
-#, no-c-format
+#: basic_mapping.xml:2872
+#, fuzzy, no-c-format
 msgid ""
-"JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
-"safe and checked at compile time. This mechnism is more powerful than "
+"JDK 5.0 introduced XDoclet-style annotations at the language level that are "
+"type-safe and checked at compile time. This mechanism is more powerful than "
 "XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA, "
 "for example, supports auto-completion and syntax highlighting of JDK 5.0 "
 "annotations. The new revision of the EJB specification (JSR-220) uses JDK "
 "5.0 annotations as the primary metadata mechanism for entity beans. "
 "Hibernate3 implements the <literal>EntityManager</literal> of JSR-220 (the "
-"persistence API), support for mapping metadata is available via the "
-"<emphasis>Hibernate Annotations</emphasis> package, as a separate download. "
+"persistence API). Support for mapping metadata is available via the "
+"<emphasis>Hibernate Annotations</emphasis> package as a separate download. "
 "Both EJB3 (JSR-220) and Hibernate3 metadata is supported."
 msgstr ""
 "JDK 5.0 在语言级别引入了 XDoclet 风格的标注,并且是类型安全的,在编译期进行检"
@@ -5185,13 +5265,13 @@
 "部分下载,支持EJB3 (JSR-220)和Hibernate3的元数据。"
 
 #. Tag: para
-#: basic_mapping.xml:2880
+#: basic_mapping.xml:2883
 #, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr "这是一个被注解为EJB entity bean 的POJO类的例子"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2884
+#: basic_mapping.xml:2887
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5219,34 +5299,33 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2886
-#, no-c-format
+#: basic_mapping.xml:2891
+#, fuzzy, no-c-format
 msgid ""
-"Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
-"progress and not completed. Please refer to the Hibernate Annotations module "
-"for more details."
+"Support for JDK 5.0 Annotations (and JSR-220) is currently under "
+"development. Please refer to the Hibernate Annotations module for more "
+"details."
 msgstr ""
 "注意:对 JDK 5.0 注解 (和 JSR-220)支持的工作仍然在进行中,并未完成。更多细节请"
 "参阅Hibernate Annotations 模块。"
 
 #. Tag: title
-#: basic_mapping.xml:2895
-#, no-c-format
-msgid "Generated Properties"
+#: basic_mapping.xml:2901
+#, fuzzy, no-c-format
+msgid "Generated properties"
 msgstr "数据库生成属性(Generated Properties)"
 
 #. Tag: para
-#: basic_mapping.xml:2896
-#, no-c-format
+#: basic_mapping.xml:2902
+#, fuzzy, no-c-format
 msgid ""
-"Generated properties are properties which have their values generated by the "
+"Generated properties are properties that have their values generated by the "
 "database. Typically, Hibernate applications needed to <literal>refresh</"
-"literal> objects which contain any properties for which the database was "
+"literal> objects that contain any properties for which the database was "
 "generating values. Marking properties as generated, however, lets the "
-"application delegate this responsibility to Hibernate. Essentially, whenever "
-"Hibernate issues an SQL INSERT or UPDATE for an entity which has defined "
-"generated properties, it immediately issues a select afterwards to retrieve "
-"the generated values."
+"application delegate this responsibility to Hibernate. When Hibernate issues "
+"an SQL INSERT or UPDATE for an entity that has defined generated properties, "
+"it immediately issues a select afterwards to retrieve the generated values."
 msgstr ""
 "Generated properties指的是其值由数据库生成的属性。一般来说,如果对象有任何属"
 "性由数据库生成值,Hibernate应用程序需要进行<literal>刷新(refresh)</literal>。"
@@ -5255,13 +5334,13 @@
 "句,会立刻执行一条select来获得生成的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2905
+#: basic_mapping.xml:2911
 #, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
 "updateable. Only <link linkend=\"mapping-declaration-version\">versions</"
 "link>, <link linkend=\"mapping-declaration-timestamp\">timestamps</link>, "
-"and <link linkend=\"mapping-declaration-property\">simple properties</link> "
+"and <link linkend=\"mapping-declaration-property\">simple properties</link>, "
 "can be marked as generated."
 msgstr ""
 "被标明为generated的属性还必须是 non-insertable和 non-updateable的。只有<xref "
@@ -5271,23 +5350,23 @@
 "generated。"
 
 #. Tag: para
-#: basic_mapping.xml:2912
-#, no-c-format
+#: basic_mapping.xml:2918
+#, fuzzy, no-c-format
 msgid ""
-"<literal>never</literal> (the default) - means that the given property value "
-"is not generated within the database."
+"<literal>never</literal> (the default): the given property value is not "
+"generated within the database."
 msgstr "<literal>never</literal> (默认) 标明此属性值不是从数据库中生成。"
 
 #. Tag: para
-#: basic_mapping.xml:2916
+#: basic_mapping.xml:2922
 #, fuzzy, no-c-format
 msgid ""
-"<literal>insert</literal> - states that the given property value is "
-"generated on insert, but is not regenerated on subsequent updates. Things "
-"like created-date would fall into this category. Note that even thought "
-"<link linkend=\"mapping-declaration-version\">version</link> and <link "
-"linkend=\"mapping-declaration-timestamp\">timestamp</link> properties can be "
-"marked as generated, this option is not available there..."
+"<literal>insert</literal>: the given property value is generated on insert, "
+"but is not regenerated on subsequent updates. Properties like created-date "
+"fall into this category. Even though <link linkend=\"mapping-declaration-"
+"version\">version</link> and <link linkend=\"mapping-declaration-timestamp"
+"\">timestamp</link> properties can be marked as generated, this option is "
+"not available."
 msgstr ""
 "<literal>insert</literal> - 标明此属性值在insert的时候生成,但是不会在随后的"
 "update时重新生成。比如说创建日期就归属于这类。注意虽然<xref linkend="
@@ -5296,30 +5375,31 @@
 "这个选项..."
 
 #. Tag: para
-#: basic_mapping.xml:2924
-#, no-c-format
+#: basic_mapping.xml:2930
+#, fuzzy, no-c-format
 msgid ""
-"<literal>always</literal> - states that the property value is generated both "
-"on insert and on update."
+"<literal>always</literal>: the property value is generated both on insert "
+"and on update."
 msgstr "<literal>always</literal> - 标明此属性值在insert和update时都会被生成。"
 
 #. Tag: title
-#: basic_mapping.xml:2931
-#, no-c-format
-msgid "Auxiliary Database Objects"
+#: basic_mapping.xml:2937
+#, fuzzy, no-c-format
+msgid "Auxiliary database objects"
 msgstr "辅助数据库对象(Auxiliary Database Objects)"
 
 #. Tag: para
-#: basic_mapping.xml:2932
-#, no-c-format
+#: basic_mapping.xml:2938
+#, fuzzy, no-c-format
 msgid ""
-"Allows CREATE and DROP of arbitrary database objects, in conjunction with "
-"Hibernate's schema evolution tools, to provide the ability to fully define a "
-"user schema within the Hibernate mapping files. Although designed "
-"specifically for creating and dropping things like triggers or stored "
-"procedures, really any SQL command that can be run via a <literal>java.sql."
-"Statement.execute()</literal> method is valid here (ALTERs, INSERTS, etc). "
-"There are essentially two modes for defining auxiliary database objects..."
+"Auxiliary database objects allow for the CREATE and DROP of arbitrary "
+"database objects. In conjunction with Hibernate's schema evolution tools, "
+"they have the ability to fully define a user schema within the Hibernate "
+"mapping files. Although designed specifically for creating and dropping "
+"things like triggers or stored procedures, any SQL command that can be run "
+"via a <literal>java.sql.Statement.execute()</literal> method is valid (for "
+"example, ALTERs, INSERTS, etc.). There are essentially two modes for "
+"defining auxiliary database objects:"
 msgstr ""
 "Allows CREATE and DROP of arbitrary database objects, in conjunction with "
 "Hibernate's schema evolution tools, to provide the ability to fully define a "
@@ -5335,15 +5415,15 @@
 "ALTER, INSERT,等等)。本质上有两种模式来定义辅助数据库对象..."
 
 #. Tag: para
-#: basic_mapping.xml:2941
-#, no-c-format
+#: basic_mapping.xml:2947
+#, fuzzy, no-c-format
 msgid ""
-"The first mode is to explicitly list the CREATE and DROP commands out in the "
+"The first mode is to explicitly list the CREATE and DROP commands in the "
 "mapping file:"
 msgstr "第一种模式是在映射文件中显式声明CREATE和DROP命令:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2945
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5356,18 +5436,18 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2946
-#, no-c-format
+#: basic_mapping.xml:2952
+#, fuzzy, no-c-format
 msgid ""
-"The second mode is to supply a custom class which knows how to construct the "
-"CREATE and DROP commands. This custom class must implement the <literal>org."
-"hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
+"The second mode is to supply a custom class that constructs the CREATE and "
+"DROP commands. This custom class must implement the <literal>org.hibernate."
+"mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 "第二种模式是提供一个类,这个类知道如何组织CREATE和DROP命令。这个特别类必须实"
 "现<literal>org.hibernate.mapping.AuxiliaryDatabaseObject</literal>接口。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2951
+#: basic_mapping.xml:2957
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5379,30 +5459,61 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2952
-#, no-c-format
+#: basic_mapping.xml:2958
+#, fuzzy, no-c-format
 msgid ""
-"Additionally, these database objects can be optionally scoped such that they "
+"Additionally, these database objects can be optionally scoped so that they "
 "only apply when certain dialects are used."
 msgstr "还有,这些数据库对象可以特别指定为仅在特定的方言中才使用。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2956
+#: basic_mapping.xml:2962
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
 "    ...\n"
 "    <database-object>\n"
 "        <definition class=\"MyTriggerDefinition\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.Oracle9Dialect\"/>\n"
-"        <dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle9iDialect\"/>\n"
+"        <dialect-scope name=\"org.hibernate.dialect.Oracle10gDialect\"/>\n"
 "    </database-object>\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
-#~ msgid "class"
-#~ msgstr "class"
+#~ msgid ""
+#~ "<literal>type</literal> (optional): A name that indicates the Hibernate "
+#~ "type."
+#~ msgstr "<literal>type</literal> (可选): 标识Hibernate类型的名字。"
 
+#~ msgid ""
+#~ "<literal>cascade</literal> (optional): Specifies which operations should "
+#~ "be cascaded from the parent object to the associated object."
+#~ msgstr ""
+#~ "<literal>cascade(级联)</literal> (可选): 指明哪些操作会从父对象级联到关"
+#~ "联的对象。"
+
+#~ msgid ""
+#~ "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
+#~ "literal>): Specifies that updates to this property do or do not require "
+#~ "acquisition of the optimistic lock. In other words, dertermines if a "
+#~ "version increment should occur when this property is dirty."
+#~ msgstr ""
+#~ "<literal>optimistic-lock</literal> (可选 - 默认为 <literal>true</"
+#~ "literal>): 指定这个属性在做更新时是否需要获得乐观锁定(optimistic "
+#~ "lock)。 换句话说,它决定这个属性发生脏数据时版本(version)的值是否增长。"
+
+#~ msgid ""
+#~ "To understand the behaviour of various Java language-level objects with "
+#~ "respect to the persistence service, we need to classify them into two "
+#~ "groups:"
+#~ msgstr ""
+#~ "为了理解很多与持久化服务相关的Java语言级对象的行为,我们需要把它们分为两"
+#~ "类:"
+
+#, fuzzy
+#~ msgid "<literal>class</literal>"
+#~ msgstr "<literal>all(全部)</literal> 检查全部字段"
+
 #~ msgid "id"
 #~ msgstr "id"
 

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/batch.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/batch.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/batch.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,9 +18,9 @@
 
 #. Tag: para
 #: batch.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A naive approach to inserting 100 000 rows in the database using Hibernate "
+"A naive approach to inserting 100,000 rows in the database using Hibernate "
 "might look like this:"
 msgstr ""
 "使用Hibernate将 100 000 条记录插入到数据库的一个很自然的做法可能是这样的"
@@ -41,12 +41,12 @@
 
 #. Tag: para
 #: batch.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
-"somewhere around the 50 000th row. That's because Hibernate caches all the "
+"somewhere around the 50,000th row. That is because Hibernate caches all the "
 "newly inserted <literal>Customer</literal> instances in the session-level "
-"cache."
+"cache. In this chapter we will show you how to avoid this problem."
 msgstr ""
 "这段程序大概运行到 50 000 条记录左右会失败并抛出 <literal>内存溢出异常"
 "(OutOfMemoryException)</literal> 。 这是因为 Hibernate 把所有新插入的 "
@@ -54,50 +54,50 @@
 "故。"
 
 #. Tag: para
-#: batch.xml:44
-#, no-c-format
+#: batch.xml:45
+#, fuzzy, no-c-format
 msgid ""
-"In this chapter we'll show you how to avoid this problem. First, however, if "
-"you are doing batch processing, it is absolutely critical that you enable "
-"the use of JDBC batching, if you intend to achieve reasonable performance. "
-"Set the JDBC batch size to a reasonable number (say, 10-50):"
+"If you are undertaking batch processing you will need to enable the use of "
+"JDBC batching. This is absolutely essential if you want to achieve optimal "
+"performance. Set the JDBC batch size to a reasonable number (10-50, for "
+"example):"
 msgstr ""
 "我们会在本章告诉你如何避免此类问题。首先,如果你要执行批量处理并且想要达到一"
 "个理想的性能, 那么使用JDBC的批量(batching)功能是至关重要。将JDBC的批量抓取"
 "数量(batch size)参数设置到一个合适值 (比如,10-50之间):"
 
 #. Tag: programlisting
-#: batch.xml:51
+#: batch.xml:52
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:53
-#, no-c-format
+#: batch.xml:54
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate disables insert batching at the JDBC level transparently "
-"if you use an <literal>identiy</literal> identifier generator."
+"Hibernate disables insert batching at the JDBC level transparently if you "
+"use an <literal>identity</literal> identifier generator."
 msgstr ""
 "注意,假若你使用了<literal>identiy</literal>标识符生成器,Hibernate在JDBC级别透"
 "明的关闭插入语句的批量执行。"
 
 #. Tag: para
-#: batch.xml:58
-#, no-c-format
+#: batch.xml:59
+#, fuzzy, no-c-format
 msgid ""
-"You also might like to do this kind of work in a process where interaction "
-"with the second-level cache is completely disabled:"
+"You can also do this kind of work in a process where interaction with the "
+"second-level cache is completely disabled:"
 msgstr "你也可能想在执行批量处理时关闭二级缓存:"
 
 #. Tag: programlisting
-#: batch.xml:63
+#: batch.xml:64
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:65
+#: batch.xml:66
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -108,24 +108,24 @@
 "闭与二级缓存的交互。"
 
 #. Tag: title
-#: batch.xml:71
+#: batch.xml:72
 #, no-c-format
 msgid "Batch inserts"
 msgstr "批量插入(Batch inserts)"
 
 #. Tag: para
-#: batch.xml:73
-#, no-c-format
+#: batch.xml:74
+#, fuzzy, no-c-format
 msgid ""
-"When making new objects persistent, you must <literal>flush()</literal> and "
-"then <literal>clear()</literal> the session regularly, to control the size "
-"of the first-level cache."
+"When making new objects persistent <literal>flush()</literal> and then "
+"<literal>clear()</literal> the session regularly in order to control the "
+"size of the first-level cache."
 msgstr ""
 "如果要将很多对象持久化,你必须通过经常的调用 <literal>flush()</literal> 以及"
 "稍后调用 <literal>clear()</literal> 来控制第一级缓存的大小。"
 
 #. Tag: programlisting
-#: batch.xml:79
+#: batch.xml:80
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -146,24 +146,24 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:84
+#: batch.xml:85
 #, no-c-format
 msgid "Batch updates"
 msgstr "批量更新(Batch updates)"
 
 #. Tag: para
-#: batch.xml:86
-#, no-c-format
+#: batch.xml:87
+#, fuzzy, no-c-format
 msgid ""
-"For retrieving and updating data the same ideas apply. In addition, you need "
-"to use <literal>scroll()</literal> to take advantage of server-side cursors "
-"for queries that return many rows of data."
+"For retrieving and updating data, the same ideas apply. In addition, you "
+"need to use <literal>scroll()</literal> to take advantage of server-side "
+"cursors for queries that return many rows of data."
 msgstr ""
 "此方法同样适用于检索和更新数据。此外,在进行会返回很多行数据的查询时, 你需要"
 "使用 <literal>scroll()</literal> 方法以便充分利用服务器端游标所带来的好处。"
 
 #. Tag: programlisting
-#: batch.xml:92
+#: batch.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -188,28 +188,28 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:97
+#: batch.xml:98
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr "StatelessSession (无状态session)接口"
 
 #. Tag: para
-#: batch.xml:98
-#, no-c-format
+#: batch.xml:99
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, Hibernate provides a command-oriented API that may be used "
+"Alternatively, Hibernate provides a command-oriented API that can be used "
 "for streaming data to and from the database in the form of detached objects. "
 "A <literal>StatelessSession</literal> has no persistence context associated "
 "with it and does not provide many of the higher-level life cycle semantics. "
 "In particular, a stateless session does not implement a first-level cache "
 "nor interact with any second-level or query cache. It does not implement "
 "transactional write-behind or automatic dirty checking. Operations performed "
-"using a stateless session do not ever cascade to associated instances. "
-"Collections are ignored by a stateless session. Operations performed via a "
-"stateless session bypass Hibernate's event model and interceptors. Stateless "
-"sessions are vulnerable to data aliasing effects, due to the lack of a first-"
-"level cache. A stateless session is a lower-level abstraction, much closer "
-"to the underlying JDBC."
+"using a stateless session never cascade to associated instances. Collections "
+"are ignored by a stateless session. Operations performed via a stateless "
+"session bypass Hibernate's event model and interceptors. Due to the lack of "
+"a first-level cache, Stateless sessions are vulnerable to data aliasing "
+"effects. A stateless session is a lower-level abstraction that is much "
+"closer to the underlying JDBC."
 msgstr ""
 "作为选择,Hibernate提供了基于命令的API,可以用detached object的形式把数据以流"
 "的方法加入到数据库,或从数据库输出。<literal>StatelessSession</literal>没有持"
@@ -221,7 +221,7 @@
 "session是低层的抽象,和低层JDBC相当接近。"
 
 #. Tag: programlisting
-#: batch.xml:113
+#: batch.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -240,28 +240,27 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:115
-#, no-c-format
+#: batch.xml:116
+#, fuzzy, no-c-format
 msgid ""
-"Note that in this code example, the <literal>Customer</literal> instances "
-"returned by the query are immediately detached. They are never associated "
-"with any persistence context."
+"In this code example, the <literal>Customer</literal> instances returned by "
+"the query are immediately detached. They are never associated with any "
+"persistence context."
 msgstr ""
 "注意在上面的例子中,查询返回的<literal>Customer</literal>实例立即被脱管"
 "(detach)。它们与任何持久化上下文都没有关系。"
 
 #. Tag: para
-#: batch.xml:121
-#, no-c-format
+#: batch.xml:122
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
 "operations defined by the <literal>StatelessSession</literal> interface are "
-"considered to be direct database row-level operations, which result in "
+"considered to be direct database row-level operations. They result in the "
 "immediate execution of a SQL <literal>INSERT, UPDATE</literal> or "
-"<literal>DELETE</literal> respectively. Thus, they have very different "
-"semantics to the <literal>save(), saveOrUpdate()</literal> and "
-"<literal>delete()</literal> operations defined by the <literal>Session</"
-"literal> interface."
+"<literal>DELETE</literal> respectively. They have different semantics to the "
+"<literal>save(), saveOrUpdate()</literal> and <literal>delete()</literal> "
+"operations defined by the <literal>Session</literal> interface."
 msgstr ""
 "<literal>StatelessSession</literal> 接口定义的<literal>insert(), update()</"
 "literal> 和 <literal>delete()</literal>操作是直接的数据库行级别操作,其结果是"
@@ -270,24 +269,24 @@
 "saveOrUpdate()</literal> 和<literal>delete()</literal> 操作有很大的不同。"
 
 #. Tag: title
-#: batch.xml:134
+#: batch.xml:135
 #, no-c-format
 msgid "DML-style operations"
 msgstr "DML(数据操作语言)风格的操作(DML-style operations)"
 
 #. Tag: para
-#: batch.xml:136
+#: batch.xml:137
 #, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
-"concerned with the management of object state. This implies that the object "
-"state is available in memory, hence manipulating (using the SQL "
-"<literal>Data Manipulation Language</literal> (DML) statements: "
-"<literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</"
-"literal>) data directly in the database will not affect in-memory state. "
-"However, Hibernate provides methods for bulk SQL-style DML statement "
-"execution which are performed through the Hibernate Query Language (<link "
-"linkend=\"queryhql\">HQL</link>)."
+"concerned with the management of the object state. The object state is "
+"available in memory. This means that manipulating data directly in the "
+"database (using the SQL <literal>Data Manipulation Language</literal> (DML) "
+"the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, "
+"<literal>DELETE</literal>) will not affect in-memory state. However, "
+"Hibernate provides methods for bulk SQL-style DML statement execution that "
+"is performed through the Hibernate Query Language (<link linkend=\"queryhql"
+"\">HQL</link>)."
 msgstr ""
 "hence manipulating (using the SQL <literal>Data Manipulation Language</"
 "literal> (DML) statements: <literal>INSERT</literal>, <literal>UPDATE</"
@@ -305,68 +304,74 @@
 
 #. Tag: para
 #: batch.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
 "literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WHERE "
-"where_conditions)?</literal>. Some points to note:"
+"where_conditions)?</literal>."
 msgstr ""
 "<literal>UPDATE</literal> 和 <literal>DELETE</literal>语句的语法为: "
 "<literal>( UPDATE | DELETE ) FROM? EntityName (WHERE where_conditions)?</"
 "literal> 有几点说明:"
 
 #. Tag: para
-#: batch.xml:154
+#: batch.xml:151
 #, no-c-format
+msgid "Some points to note:"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:157
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "在FROM子句(from-clause)中,FROM关键字是可选的"
 
 #. Tag: para
-#: batch.xml:159
-#, no-c-format
+#: batch.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"There can only be a single entity named in the from-clause; it can "
-"optionally be aliased. If the entity name is aliased, then any property "
-"references must be qualified using that alias; if the entity name is not "
-"aliased, then it is illegal for any property references to be qualified."
+"There can only be a single entity named in the from-clause. It can, however, "
+"be aliased. If the entity name is aliased, then any property references must "
+"be qualified using that alias. If the entity name is not aliased, then it is "
+"illegal for any property references to be qualified."
 msgstr ""
 "在FROM子句(from-clause)中只能有一个实体名,它可以是别名。如果实体名是别名,"
 "那么任何被引用的属性都必须加上此别名的前缀;如果不是别名,那么任何有前缀的属"
 "性引用都是非法的。"
 
 #. Tag: para
-#: batch.xml:167
+#: batch.xml:170
 #, fuzzy, no-c-format
 msgid ""
-"No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
-"explicit) can be specified in a bulk HQL query. Sub-queries may be used in "
-"the where-clause; the subqueries, themselves, may contain joins."
+"No <link linkend=\"queryhql-joins-forms\">joins</link>, either implicit or "
+"explicit, can be specified in a bulk HQL query. Sub-queries can be used in "
+"the where-clause, where the subqueries themselves may contain joins."
 msgstr ""
 "不能在大批量HQL语句中使用<xref linkend=\"queryhql-joins-forms\">连接(join)</"
 "xref>(显式或者隐式的都不行)。不过在WHERE子句中可以使用子查询。可以在where子"
 "句中使用子查询,子查询本身可以包含join。"
 
 #. Tag: para
-#: batch.xml:174
+#: batch.xml:177
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr "整个WHERE子句是可选的。"
 
 #. Tag: para
-#: batch.xml:180
-#, no-c-format
+#: batch.xml:183
+#, fuzzy, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
-"<literal>Query.executeUpdate()</literal> method (the method is named for "
+"<literal>Query.executeUpdate()</literal> method. The method is named for "
 "those familiar with JDBC's <literal>PreparedStatement.executeUpdate()</"
-"literal>):"
+"literal>:"
 msgstr ""
 "举个例子,使用<literal>Query.executeUpdate()</literal>方法执行一个HQL "
 "<literal>UPDATE</literal>语句(: (方法命名是来源于JDBC's "
 "<literal>PreparedStatement.executeUpdate()</literal>):"
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -385,16 +390,16 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
+#: batch.xml:191
 #, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
-"linkend=\"mapping-declaration-version\">version</link> or the <link linkend="
-"\"mapping-declaration-timestamp\">timestamp</link> property values for the "
-"affected entities; this is in keeping with the EJB3 specification. However, "
-"you can force Hibernate to properly reset the <literal>version</literal> or "
-"<literal>timestamp</literal> property values through the use of a "
-"<literal>versioned update</literal>. This is achieved by adding the "
+"In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> "
+"statements, by default, do not effect the <link linkend=\"mapping-"
+"declaration-version\">version</link> or the <link linkend=\"mapping-"
+"declaration-timestamp\">timestamp</link> property values for the affected "
+"entities. However, you can force Hibernate to reset the <literal>version</"
+"literal> or <literal>timestamp</literal> property values through the use of "
+"a <literal>versioned update</literal>. This is achieved by adding the "
 "<literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> "
 "keyword."
 msgstr ""
@@ -407,7 +412,7 @@
 "现的。"
 
 #. Tag: programlisting
-#: batch.xml:198
+#: batch.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -423,18 +428,18 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:200
-#, no-c-format
+#: batch.xml:203
+#, fuzzy, no-c-format
 msgid ""
-"Note that custom version types (<literal>org.hibernate.usertype."
-"UserVersionType</literal>) are not allowed in conjunction with a "
-"<literal>update versioned</literal> statement."
+"Custom version types, <literal>org.hibernate.usertype.UserVersionType</"
+"literal>, are not allowed in conjunction with a <literal>update versioned</"
+"literal> statement."
 msgstr ""
 "注意,自定义的版本类型(<literal>org.hibernate.usertype.UserVersionType</"
 "literal>)不允许和<literal>update versioned</literal>语句联用。"
 
 #. Tag: para
-#: batch.xml:205
+#: batch.xml:208
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -444,7 +449,7 @@
 "()</literal> 方法:"
 
 #. Tag: programlisting
-#: batch.xml:210
+#: batch.xml:213
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -460,19 +465,19 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:212
-#, no-c-format
+#: batch.xml:215
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
-"()</literal> method indicate the number of entities effected by the "
-"operation. Consider this may or may not correlate to the number of rows "
-"effected in the database. An HQL bulk operation might result in multiple "
-"actual SQL statements being executed, for joined-subclass, for example. The "
-"returned number indicates the number of actual entities affected by the "
-"statement. Going back to the example of joined-subclass, a delete against "
-"one of the subclasses may actually result in deletes against not just the "
-"table to which that subclass is mapped, but also the \"root\" table and "
-"potentially joined-subclass tables further down the inheritence hierarchy."
+"()</literal> method indicates the number of entities effected by the "
+"operation. This may or may not correlate to the number of rows effected in "
+"the database. An HQL bulk operation might result in multiple actual SQL "
+"statements being executed (for joined-subclass, for example). The returned "
+"number indicates the number of actual entities affected by the statement. "
+"Going back to the example of joined-subclass, a delete against one of the "
+"subclasses may actually result in deletes against not just the table to "
+"which that subclass is mapped, but also the \"root\" table and potentially "
+"joined-subclass tables further down the inheritance hierarchy."
 msgstr ""
 "由<literal>Query.executeUpdate()</literal>方法返回的<literal>整型</literal>值"
 "表明了受此操作影响的记录数量。 注意这个数值可能与数据库中被(最后一条SQL语"
@@ -483,7 +488,7 @@
 "有继承关系的joined-subclass映射方式的子类的表。"
 
 #. Tag: para
-#: batch.xml:223
+#: batch.xml:226
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -494,7 +499,7 @@
 "properties_list select_statement</literal>. 要注意的是:"
 
 #. Tag: para
-#: batch.xml:231
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -503,14 +508,14 @@
 "只支持INSERT INTO ... SELECT ...形式,不支持INSERT INTO ... VALUES ...形式."
 
 #. Tag: para
-#: batch.xml:234
-#, no-c-format
+#: batch.xml:237
+#, fuzzy, no-c-format
 msgid ""
-"The properties_list is analogous to the <literal>column speficiation</"
+"The properties_list is analogous to the <literal>column specification</"
 "literal> in the SQL <literal>INSERT</literal> statement. For entities "
-"involved in mapped inheritence, only properties directly defined on that "
+"involved in mapped inheritance, only properties directly defined on that "
 "given class-level can be used in the properties_list. Superclass properties "
-"are not allowed; and subclass properties do not make sense. In other words, "
+"are not allowed and subclass properties do not make sense. In other words, "
 "<literal>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 "properties_list和SQL <literal>INSERT</literal>语句中的<literal>字段定义"
@@ -519,15 +524,15 @@
 "的属性无意义。换句话说,<literal>INSERT</literal>天生不支持多态。"
 
 #. Tag: para
-#: batch.xml:244
-#, no-c-format
+#: batch.xml:247
+#, fuzzy, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
 "return types must match the types expected by the insert. Currently, this is "
 "checked during query compilation rather than allowing the check to relegate "
-"to the database. Note however that this might cause problems between "
-"Hibernate <literal>Type</literal>s which are <emphasis>equivalent</emphasis> "
-"as opposed to <emphasis>equal</emphasis>. This might cause issues with "
+"to the database. This might, however, cause problems between Hibernate "
+"<literal>Type</literal>s which are <emphasis>equivalent</emphasis> as "
+"opposed to <emphasis>equal</emphasis>. This might cause issues with "
 "mismatches between a property defined as a <literal>org.hibernate.type."
 "DateType</literal> and a property defined as a <literal>org.hibernate.type."
 "TimestampType</literal>, even though the database might not make a "
@@ -542,22 +547,22 @@
 "可能不加区分或者可以处理这种转换。"
 
 #. Tag: para
-#: batch.xml:256
-#, no-c-format
+#: batch.xml:259
+#, fuzzy, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
-"either explicitly specify the id property in the properties_list (in which "
-"case its value is taken from the corresponding select expression) or omit it "
-"from the properties_list (in which case a generated value is used). This "
-"later option is only available when using id generators that operate in the "
+"either explicitly specify the id property in the properties_list, in which "
+"case its value is taken from the corresponding select expression, or omit it "
+"from the properties_list, in which case a generated value is used. This "
+"latter option is only available when using id generators that operate in the "
 "database; attempting to use this option with any \"in memory\" type "
-"generators will cause an exception during parsing. Note that for the "
-"purposes of this discussion, in-database generators are considered to be "
-"<literal>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) "
-"and any implementors of <literal>org.hibernate.id."
-"PostInsertIdentifierGenerator</literal>. The most notable exception here is "
-"<literal>org.hibernate.id.TableHiLoGenerator</literal>, which cannot be used "
-"because it does not expose a selectable way to get its values."
+"generators will cause an exception during parsing. For the purposes of this "
+"discussion, in-database generators are considered to be <literal>org."
+"hibernate.id.SequenceGenerator</literal> (and its subclasses) and any "
+"implementers of <literal>org.hibernate.id.PostInsertIdentifierGenerator</"
+"literal>. The most notable exception here is <literal>org.hibernate.id."
+"TableHiLoGenerator</literal>, which cannot be used because it does not "
+"expose a selectable way to get its values."
 msgstr ""
 "对id属性来说,insert语句给你两个选择。你可以明确地在properties_list表中指定id"
 "属性(这样它的值是从对应的select表达式中获得),或者在properties_list中省略它"
@@ -570,15 +575,15 @@
 "它没有得到其值的途径。"
 
 #. Tag: para
-#: batch.xml:271
-#, no-c-format
+#: batch.xml:274
+#, fuzzy, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
 "<literal>timestamp</literal>, the insert statement gives you two options. "
-"You can either specify the property in the properties_list (in which case "
-"its value is taken from the corresponding select expressions) or omit it "
-"from the properties_list (in which case the <literal>seed value</literal> "
-"defined by the <literal>org.hibernate.type.VersionType</literal> is used)."
+"You can either specify the property in the properties_list, in which case "
+"its value is taken from the corresponding select expressions, or omit it "
+"from the properties_list, in which case the <literal>seed value</literal> "
+"defined by the <literal>org.hibernate.type.VersionType</literal> is used."
 msgstr ""
 "对映射为<literal>version</literal> 或 <literal>timestamp</literal>的属性来"
 "说,insert语句也给你两个选择,你可以在properties_list表中指定(此时其值从对应"
@@ -587,13 +592,15 @@
 "(种子值)</literal>)。"
 
 #. Tag: para
-#: batch.xml:281
-#, no-c-format
-msgid "An example HQL <literal>INSERT</literal> statement execution:"
+#: batch.xml:284
+#, fuzzy, no-c-format
+msgid ""
+"The following is an example of an HQL <literal>INSERT</literal> statement "
+"execution:"
 msgstr "执行HQL <literal>INSERT</literal>语句的例子如下:"
 
 #. Tag: programlisting
-#: batch.xml:285
+#: batch.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/best_practices.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/best_practices.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/best_practices.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: term
 #: best_practices.xml:33
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
-"literal>."
+"literal>:"
 msgstr ""
 "设计细颗粒度的持久类并且使用<literal>&lt;component&gt;</literal>来实现映射。"
 
@@ -40,25 +40,25 @@
 
 #. Tag: term
 #: best_practices.xml:43
-#, no-c-format
-msgid "Declare identifier properties on persistent classes."
+#, fuzzy, no-c-format
+msgid "Declare identifier properties on persistent classes:"
 msgstr "对持久类声明标识符属性( identifier properties)。"
 
 #. Tag: para
 #: best_practices.xml:45
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate makes identifier properties optional. There are all sorts of "
-"reasons why you should use them. We recommend that identifiers be "
-"'synthetic' (generated, with no business meaning)."
+"Hibernate makes identifier properties optional. There are a range of reasons "
+"why you should use them. We recommend that identifiers be 'synthetic', that "
+"is, generated with no business meaning."
 msgstr ""
 "Hibernate中标识符属性是可选的,不过有很多原因来说明你应该使用标识符属性。我们"
 "建议标识符应该是“人造”的(自动生成,不涉及业务含义)。"
 
 #. Tag: term
 #: best_practices.xml:53
-#, no-c-format
-msgid "Identify natural keys."
+#, fuzzy, no-c-format
+msgid "Identify natural keys:"
 msgstr "使用自然键(natural keys)标识"
 
 #. Tag: para
@@ -76,17 +76,17 @@
 
 #. Tag: term
 #: best_practices.xml:63
-#, no-c-format
-msgid "Place each class mapping in its own file."
+#, fuzzy, no-c-format
+msgid "Place each class mapping in its own file:"
 msgstr "为每个持久类写一个映射文件"
 
 #. Tag: para
 #: best_practices.xml:65
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
+"Do not use a single monolithic mapping document. Map <literal>com.eg.Foo</"
 "literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This makes "
-"particularly good sense in a team environment."
+"sense, particularly in a team environment."
 msgstr ""
 "不要把所有的持久类映射都写到一个大文件中。把 <literal>com.eg.Foo</literal> 映"
 "射到<literal>com/eg/Foo.hbm.xml</literal>中, 在团队开发环境中,这一点显得特"
@@ -94,8 +94,8 @@
 
 #. Tag: term
 #: best_practices.xml:73
-#, no-c-format
-msgid "Load mappings as resources."
+#, fuzzy, no-c-format
+msgid "Load mappings as resources:"
 msgstr "把映射文件作为资源加载"
 
 #. Tag: para
@@ -106,17 +106,17 @@
 
 #. Tag: term
 #: best_practices.xml:81
-#, no-c-format
-msgid "Consider externalising query strings."
+#, fuzzy, no-c-format
+msgid "Consider externalizing query strings:"
 msgstr "考虑把查询字符串放在程序外面"
 
 #. Tag: para
 #: best_practices.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This is a good practice if your queries call non-ANSI-standard SQL "
-"functions. Externalising the query strings to mapping files will make the "
-"application more portable."
+"This is recommended if your queries call non-ANSI-standard SQL functions. "
+"Externalizing the query strings to mapping files will make the application "
+"more portable."
 msgstr ""
 "如果你的查询中调用了非ANSI标准的SQL函数,那么这条实践经验对你适用。把查询字符"
 "串放在映射文件中可以让程序具有更好的可移植性。"
@@ -129,29 +129,29 @@
 
 #. Tag: para
 #: best_practices.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"As in JDBC, always replace non-constant values by \"?\". Never use string "
-"manipulation to bind a non-constant value in a query! Even better, consider "
-"using named parameters in queries."
+"As in JDBC, always replace non-constant values by \"?\". Do not use string "
+"manipulation to bind a non-constant value in a query. You should also "
+"consider using named parameters in queries."
 msgstr ""
 "就像在JDBC编程中一样,应该总是用占位符\"?\"来替换非常量值,不要在查询中用字符"
 "串值来构造非常量值!更好的办法是在查询中使用命名参数。"
 
 #. Tag: term
 #: best_practices.xml:101
-#, no-c-format
-msgid "Don't manage your own JDBC connections."
+#, fuzzy, no-c-format
+msgid "Do not manage your own JDBC connections:"
 msgstr "不要自己来管理JDBC connections"
 
 #. Tag: para
 #: best_practices.xml:103
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets the application manage JDBC connections. This approach should "
-"be considered a last-resort. If you can't use the built-in connections "
-"providers, consider providing your own implementation of <literal>org."
-"hibernate.connection.ConnectionProvider</literal>."
+"Hibernate allows the application to manage JDBC connections, but his "
+"approach should be considered a last-resort. If you cannot use the built-in "
+"connection providers, consider providing your own implementation of "
+"<literal>org.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 "Hibernate允许应用程序自己来管理JDBC connections,但是应该作为最后没有办法的办"
 "法。如果你不能使用Hibernate内建的connections providers,那么考虑实现自己来实"
@@ -159,19 +159,19 @@
 
 #. Tag: term
 #: best_practices.xml:111
-#, no-c-format
-msgid "Consider using a custom type."
+#, fuzzy, no-c-format
+msgid "Consider using a custom type:"
 msgstr "考虑使用用户自定义类型(custom type)"
 
 #. Tag: para
 #: best_practices.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Suppose you have a Java type, say from some library, that needs to be "
-"persisted but doesn't provide the accessors needed to map it as a component. "
-"You should consider implementing <literal>org.hibernate.UserType</literal>. "
-"This approach frees the application code from implementing transformations "
-"to / from a Hibernate type."
+"Suppose you have a Java type from a library that needs to be persisted but "
+"does not provide the accessors needed to map it as a component. You should "
+"consider implementing <literal>org.hibernate.UserType</literal>. This "
+"approach frees the application code from implementing transformations to/"
+"from a Hibernate type."
 msgstr ""
 "假设你有一个Java类型,来自某些类库,需要被持久化,但是该类没有提供映射操作需"
 "要的存取方法。那么你应该考虑实现<literal>org.hibernate.UserType</literal>接"
@@ -180,21 +180,21 @@
 
 #. Tag: term
 #: best_practices.xml:122
-#, no-c-format
-msgid "Use hand-coded JDBC in bottlenecks."
+#, fuzzy, no-c-format
+msgid "Use hand-coded JDBC in bottlenecks:"
 msgstr "在性能瓶颈的地方使用硬编码的JDBC"
 
 #. Tag: para
 #: best_practices.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
-"benefit from direct JDBC. But please, wait until you <emphasis>know</"
-"emphasis> something is a bottleneck. And don't assume that direct JDBC is "
-"necessarily faster. If you need to use direct JDBC, it might be worth "
-"opening a Hibernate <literal>Session</literal> and using that JDBC "
-"connection. That way you can still use the same transaction strategy and "
-"underlying connection provider."
+"benefit from direct JDBC. Do not assume, however, that JDBC is necessarily "
+"faster. Please wait until you <emphasis>know</emphasis> something is a "
+"bottleneck. If you need to use direct JDBC, you can open a Hibernate "
+"<literal>Session</literal> and usingfile:///usr/share/doc/HTML/en-US/index."
+"html that JDBC connection. This way you can still use the same transaction "
+"strategy and underlying connection provider."
 msgstr ""
 "In performance-critical areas of the system, some kinds of operations might "
 "benefit from direct JDBC. But please, wait until you <emphasis>know</"
@@ -211,18 +211,18 @@
 
 #. Tag: term
 #: best_practices.xml:134
-#, no-c-format
-msgid "Understand <literal>Session</literal> flushing."
+#, fuzzy, no-c-format
+msgid "Understand <literal>Session</literal> flushing:"
 msgstr "理解<literal>Session</literal>清洗( flushing)"
 
 #. Tag: para
 #: best_practices.xml:136
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the Session synchronizes its persistent state with the "
-"database. Performance will be affected if this process occurs too often. You "
-"may sometimes minimize unnecessary flushing by disabling automatic flushing "
-"or even by changing the order of queries and other operations within a "
+"Sometimes the Session synchronizes its persistent state with the database. "
+"Performance will be affected if this process occurs too often. You can "
+"sometimes minimize unnecessary flushing by disabling automatic flushing, or "
+"even by changing the order of queries and other operations within a "
 "particular transaction."
 msgstr ""
 "Session会不时的向数据库同步持久化状态,如果这种操作进行的过于频繁,性能会受到"
@@ -231,19 +231,19 @@
 
 #. Tag: term
 #: best_practices.xml:145
-#, no-c-format
-msgid "In a three tiered architecture, consider using detached objects."
+#, fuzzy, no-c-format
+msgid "In a three tiered architecture, consider using detached objects:"
 msgstr "在三层结构中,考虑使用托管对象(detached object)"
 
 #. Tag: para
 #: best_practices.xml:147
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"When using a servlet / session bean architecture, you could pass persistent "
-"objects loaded in the session bean to and from the servlet / JSP layer. Use "
-"a new session to service each request. Use <literal>Session.merge()</"
-"literal> or <literal>Session.saveOrUpdate()</literal> to synchronize objects "
-"with the database."
+"When using a servlet/session bean architecture, you can pass persistent "
+"objects loaded in the session bean to and from the servlet/JSP layer. Use a "
+"new session to service each request. Use <literal>Session.merge()</literal> "
+"or <literal>Session.saveOrUpdate()</literal> to synchronize objects with the "
+"database."
 msgstr ""
 "当使用一个servlet / session bean 类型的架构的时候, 你可以把已加载的持久对象在"
 "session bean层和servlet / JSP 层之间来回传递。使用新的session来为每个请求服"
@@ -252,25 +252,25 @@
 
 #. Tag: term
 #: best_practices.xml:156
-#, no-c-format
-msgid "In a two tiered architecture, consider using long persistence contexts."
+#, fuzzy, no-c-format
+msgid "In a two tiered architecture, consider using long persistence contexts:"
 msgstr "在两层结构中,考虑使用长持久上下文(long persistence contexts)."
 
 #. Tag: para
 #: best_practices.xml:158
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
-"However, it is often neccessary to implement long running "
+"However, it is often necessary to implement long running "
 "<emphasis>application transactions</emphasis>, a single unit-of-work from "
 "the point of view of a user. An application transaction might span several "
 "client request/response cycles. It is common to use detached objects to "
-"implement application transactions. An alternative, extremely appropriate in "
-"two tiered architecture, is to maintain a single open persistence contact "
-"(session) for the whole life cycle of the application transaction and simply "
+"implement application transactions. An appropriate alternative in a two "
+"tiered architecture, is to maintain a single open persistence contact "
+"session for the whole life cycle of the application transaction. Then simply "
 "disconnect from the JDBC connection at the end of each request and reconnect "
 "at the beginning of the subsequent request. Never share a single session "
-"across more than one application transaction, or you will be working with "
+"across more than one application transaction or you will be working with "
 "stale data."
 msgstr ""
 "为了得到最佳的可伸缩性,数据库事务(Database Transaction)应该尽可能的短。但"
@@ -283,19 +283,19 @@
 
 #. Tag: term
 #: best_practices.xml:172
-#, no-c-format
-msgid "Don't treat exceptions as recoverable."
+#, fuzzy, no-c-format
+msgid "Do not treat exceptions as recoverable:"
 msgstr "不要把异常看成可恢复的"
 
 #. Tag: para
 #: best_practices.xml:174
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
 "exception occurs, roll back the <literal>Transaction</literal> and close the "
-"<literal>Session</literal>. If you don't, Hibernate can't guarantee that in-"
-"memory state accurately represents persistent state. As a special case of "
-"this, do not use <literal>Session.load()</literal> to determine if an "
+"<literal>Session</literal>. If you do not do this, Hibernate cannot "
+"guarantee that in-memory state accurately represents the persistent state. "
+"For example, do not use <literal>Session.load()</literal> to determine if an "
 "instance with the given identifier exists on the database; use "
 "<literal>Session.get()</literal> or a query instead."
 msgstr ""
@@ -307,21 +307,21 @@
 
 #. Tag: term
 #: best_practices.xml:184
-#, no-c-format
-msgid "Prefer lazy fetching for associations."
+#, fuzzy, no-c-format
+msgid "Prefer lazy fetching for associations:"
 msgstr "对于关联优先考虑lazy fetching"
 
 #. Tag: para
 #: best_practices.xml:186
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
 "associations to classes that are not likely to be completely held in the "
 "second-level cache. For associations to cached classes, where there is an a "
 "extremely high probability of a cache hit, explicitly disable eager fetching "
-"using <literal>lazy=\"false\"</literal>. When an join fetching is "
-"appropriate to a particular use case, use a query with a <literal>left join "
-"fetch</literal>."
+"using <literal>lazy=\"false\"</literal>. When join fetching is appropriate "
+"to a particular use case, use a query with a <literal>left join fetch</"
+"literal>."
 msgstr ""
 "谨慎的使用主动抓取(eager fetching)。对于关联来说,若其目标是无法在第二级缓存"
 "中完全缓存所有实例的类,应该使用代理(proxies)与/或具有延迟加载属性的集合"
@@ -332,17 +332,17 @@
 
 #. Tag: term
 #: best_practices.xml:196
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
-"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data."
+"<emphasis>assembly phase</emphasis> to avoid problems with unfetched data:"
 msgstr ""
 "使用<emphasis>open session in view</emphasis>模式,或者执行严格的<emphasis>装"
 "配期(assembly phase)</emphasis>策略来避免再次抓取数据带来的问题"
 
 #. Tag: para
 #: best_practices.xml:201
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
 "Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs serve dual "
@@ -350,12 +350,12 @@
 "serializable; second, they implicitly define an assembly phase where all "
 "data to be used by the view is fetched and marshalled into the DTOs before "
 "returning control to the presentation tier. Hibernate eliminates the first "
-"purpose. However, you will still need an assembly phase (think of your "
-"business methods as having a strict contract with the presentation tier "
-"about what data is available in the detached objects) unless you are "
-"prepared to hold the persistence context (the session) open across the view "
-"rendering process. This is not a limitation of Hibernate! It is a "
-"fundamental requirement of safe transactional data access."
+"purpose. Unless you are prepared to hold the persistence context (the "
+"session) open across the view rendering process, you will still need an "
+"assembly phase. Think of your business methods as having a strict contract "
+"with the presentation tier about what data is available in the detached "
+"objects. This is not a limitation of Hibernate. It is a fundamental "
+"requirement of safe transactional data access."
 msgstr ""
 "Hibernate让开发者们摆脱了繁琐的<emphasis>Data Transfer Objects</emphasis> "
 "(DTO)。在传统的EJB结构中,DTO有双重作用:首先,他们解决了entity bean无法序列"
@@ -368,20 +368,20 @@
 
 #. Tag: term
 #: best_practices.xml:215
-#, no-c-format
-msgid "Consider abstracting your business logic from Hibernate."
+#, fuzzy, no-c-format
+msgid "Consider abstracting your business logic from Hibernate:"
 msgstr "考虑把Hibernate代码从业务逻辑代码中抽象出来"
 
 #. Tag: para
 #: best_practices.xml:217
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hide (Hibernate) data-access code behind an interface. Combine the "
+"Hide Hibernate data-access code behind an interface. Combine the "
 "<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> "
-"patterns. You can even have some classes persisted by handcoded JDBC, "
-"associated to Hibernate via a <literal>UserType</literal>. (This advice is "
-"intended for \"sufficiently large\" applications; it is not appropriate for "
-"an application with five tables!)"
+"patterns. You can even have some classes persisted by handcoded JDBC "
+"associated to Hibernate via a <literal>UserType</literal>. This advice is, "
+"however, intended for \"sufficiently large\" applications. It is not "
+"appropriate for an application with five tables."
 msgstr ""
 "把Hibernate的数据存取代码隐藏到接口(interface)的后面,组合使用<emphasis>DAO</"
 "emphasis>和<emphasis>Thread Local Session</emphasis>模式。通过Hibernate的"
@@ -391,20 +391,20 @@
 
 #. Tag: term
 #: best_practices.xml:227
-#, no-c-format
-msgid "Don't use exotic association mappings."
+#, fuzzy, no-c-format
+msgid "Do not use exotic association mappings:"
 msgstr "不要用怪异的连接映射"
 
 #. Tag: para
 #: best_practices.xml:229
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Good usecases for a real many-to-many associations are rare. Most of the "
-"time you need additional information stored in the \"link table\". In this "
-"case, it is much better to use two one-to-many associations to an "
-"intermediate link class. In fact, we think that most associations are one-to-"
-"many and many-to-one, you should be careful when using any other association "
-"style and ask yourself if it is really neccessary."
+"Practical test cases for real many-to-many associations are rare. Most of "
+"the time you need additional information stored in the \"link table\". In "
+"this case, it is much better to use two one-to-many associations to an "
+"intermediate link class. In fact, most associations are one-to-many and many-"
+"to-one. For this reason, you should proceed cautiously when using any other "
+"association style."
 msgstr ""
 "多对多连接用得好的例子实际上相当少见。大多数时候你在“连接表”中需要保存额外的"
 "信息。这种情况下,用两个指向中介类的一对多的连接比较好。实际上,我们认为绝大"
@@ -413,8 +413,8 @@
 
 #. Tag: term
 #: best_practices.xml:239
-#, no-c-format
-msgid "Prefer bidirectional associations."
+#, fuzzy, no-c-format
+msgid "Prefer bidirectional associations:"
 msgstr "偏爱双向关联"
 
 #. Tag: para

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,9 +12,9 @@
 
 #. Tag: title
 #: collection_mapping.xml:29
-#, no-c-format
-msgid "Collection Mapping"
-msgstr "集合类(Collections)映射"
+#, fuzzy, no-c-format
+msgid "Collection mapping"
+msgstr "集合映射( Collection mappings )"
 
 #. Tag: title
 #: collection_mapping.xml:32
@@ -24,10 +24,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
-"an interface type, for example:"
+"an interface type. For example:"
 msgstr ""
 "Hibernate要求持久化集合值字段必须声明为接口,比如:(译者注:在阅读本章的时"
 "候,以后整个手册的阅读过程中,我们都会面临一个名词方面的问题,那就是“集合”。"
@@ -58,14 +58,14 @@
 
 #. Tag: para
 #: collection_mapping.xml:41
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
 "<literal>java.util.Collection</literal>, <literal>java.util.List</literal>, "
 "<literal>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, "
-"<literal>java.util.SortedMap</literal> or ... anything you like! (Where "
-"\"anything you like\" means you will have to write an implementation of "
-"<literal>org.hibernate.usertype.UserCollectionType</literal>.)"
+"<literal>java.util.SortedMap</literal> or anything you like (\"anything you "
+"like\" means you will have to write an implementation of <literal>org."
+"hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 "实际的接口可能是<literal>java.util.Set</literal>, <literal>java.util."
 "Collection</literal>, <literal>java.util.List</literal>, <literal>java.util."
@@ -75,15 +75,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:50
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Notice how we initialized the instance variable with an instance of "
+"Notice how the instance variable was initialized with an instance of "
 "<literal>HashSet</literal>. This is the best way to initialize collection "
 "valued properties of newly instantiated (non-persistent) instances. When you "
-"make the instance persistent - by calling <literal>persist()</literal>, for "
-"example - Hibernate will actually replace the <literal>HashSet</literal> "
-"with an instance of Hibernate's own implementation of <literal>Set</"
-"literal>. Watch out for errors like this:"
+"make the instance persistent, by calling <literal>persist()</literal> for "
+"example, Hibernate will actually replace the <literal>HashSet</literal> with "
+"an instance of Hibernate's own implementation of <literal>Set</literal>. Be "
+"aware of the following errors:"
 msgstr ""
 "注意我们是如何用一个<literal>HashSet</literal>实例来初始化实例变量的.这是用于"
 "初始化新创建(尚未持久化)的类实例中集合值属性的最佳方法。当你持久化这个实例时"
@@ -108,12 +108,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
 "<literal>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</"
 "literal>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, "
-"depending upon the interface type."
+"depending on the interface type."
 msgstr ""
 "根据不同的接口类型,被Hibernate注射的持久化集合类的表现类似<literal>HashMap</"
 "literal>, <literal>HashSet</literal>, <literal>TreeMap</literal>, "
@@ -121,15 +121,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
-"automatically persisted when referenced by a persistent object and "
+"automatically persisted when referenced by a persistent object and are "
 "automatically deleted when unreferenced. If a collection is passed from one "
 "persistent object to another, its elements might be moved from one table to "
-"another. Two entities may not share a reference to the same collection "
+"another. Two entities cannot share a reference to the same collection "
 "instance. Due to the underlying relational model, collection-valued "
-"properties do not support null value semantics; Hibernate does not "
+"properties do not support null value semantics. Hibernate does not "
 "distinguish between a null collection reference and an empty collection."
 msgstr ""
 "集合类实例具有值类型的通常行为。当被持久化对象引用后,他们会自动被持久化,当"
@@ -140,11 +140,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:80
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You shouldn't have to worry much about any of this. Use persistent "
-"collections the same way you use ordinary Java collections. Just make sure "
-"you understand the semantics of bidirectional associations (discussed later)."
+"Use persistent collections the same way you use ordinary Java collections. "
+"However, please ensure you understand the semantics of bidirectional "
+"associations (these are discussed later)."
 msgstr ""
 "你不需要过多的为此担心。就如同你平时使用普通的Java集合类一样来使用持久化集合"
 "类。只是要确认你理解了双向关联的语义(后文讨论)。"
@@ -157,12 +157,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:92
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of mappings that can be generated for collections, "
-"covering many common relational models. We suggest you experiment with the "
-"schema generation tool to get a feeling for how various mapping declarations "
-"translate to database tables."
+"There are quite a range of mappings that can be generated for collections "
+"that cover many common relational models. We suggest you experiment with the "
+"schema generation tool so that you understand how various mapping "
+"declarations translate to database tables."
 msgstr ""
 "任何值集合或者多对多关联需要专用的具有一个或多个外键字段的"
 "<emphasis>collection table</emphasis>、一个或多个<emphasis>collection "
@@ -170,11 +170,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:99
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate mapping element used for mapping a collection depends upon the "
-"type of the interface. For example, a <literal>&lt;set&gt;</literal> element "
-"is used for mapping properties of type <literal>Set</literal>."
+"type of interface. For example, a <literal>&lt;set&gt;</literal> element is "
+"used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 "用于映射集合类的Hibernate映射元素取决于接口的类型。比如, <literal>&lt;"
 "set&gt;</literal> 元素用来映射<literal>Set</literal>类型的属性。"
@@ -238,25 +238,25 @@
 
 #. Tag: para
 #: collection_mapping.xml:135
-#, no-c-format
-msgid "<literal>name</literal> the collection property name"
+#, fuzzy, no-c-format
+msgid "<literal>name</literal>: the collection property name"
 msgstr "<literal>name</literal> 集合属性的名称"
 
 #. Tag: para
 #: collection_mapping.xml:140
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>table</literal> (optional - defaults to property name) the name of "
-"the collection table (not used for one-to-many associations)"
+"<literal>table</literal> (optional - defaults to property name): the name of "
+"the collection table. It is not used for one-to-many associations."
 msgstr ""
 "<literal>table</literal> (可选——默认为属性的名称)这个集合表的名称(不能在一"
 "对多的关联关系中使用)"
 
 #. Tag: para
 #: collection_mapping.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>schema</literal> (optional) the name of a table schema to override "
+"<literal>schema</literal> (optional): the name of a table schema to override "
 "the schema declared on the root element"
 msgstr ""
 "<literal>schema</literal> (可选) 表的schema的名称, 他将覆盖在根元素中定义的"
@@ -264,12 +264,13 @@
 
 #. Tag: para
 #: collection_mapping.xml:152
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
-"be used to disable lazy fetching and specify that the association is always "
-"eagerly fetched, or to enable \"extra-lazy\" fetching where most operations "
-"do not initialize the collection (suitable for very large collections)"
+"<literal>lazy</literal> (optional - defaults to <literal>true</literal>): "
+"disables lazy fetching and specifies that the association is always eagerly "
+"fetched. It can also be used to enable \"extra-lazy\" fetching where most "
+"operations do not initialize the collection. This is suitable for large "
+"collections."
 msgstr ""
 "<literal>lazy</literal> (可选--默认为true) 可以用来关闭延迟加载(false),指定"
 "一直使用预先抓取,或者打开\"extra-lazy\" 抓取,此时大多数操作不会初始化集合类"
@@ -277,53 +278,55 @@
 
 #. Tag: para
 #: collection_mapping.xml:161
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
-"mark this collection as the \"inverse\" end of a bidirectional association"
+"<literal>inverse</literal> (optional - defaults to <literal>false</"
+"literal>): marks this collection as the \"inverse\" end of a bidirectional "
+"association."
 msgstr ""
 "<literal>inverse</literal> (可选——默认为<literal>false</literal>) 标记这个集"
 "合作为双向关联关系中的方向一端。"
 
 #. Tag: para
 #: collection_mapping.xml:167
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
-"enable operations to cascade to child entities"
+"<literal>cascade</literal> (optional - defaults to <literal>none</literal>): "
+"enables operations to cascade to child entities."
 msgstr ""
 "<literal>cascade</literal> (可选——默认为<literal>none</literal>) 让操作级联到"
 "子实体"
 
 #. Tag: para
 #: collection_mapping.xml:173
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>sort</literal> (optional) specify a sorted collection with "
-"<literal>natural</literal> sort order, or a given comparator class"
+"<literal>sort</literal> (optional): specifies a sorted collection with "
+"<literal>natural</literal> sort order or a given comparator class."
 msgstr ""
 "<literal>sort</literal>(可选)指定集合的排序顺序, 其可以为自然的"
 "(<literal>natural</literal>)或者给定一个用来比较的类。"
 
 #. Tag: para
 #: collection_mapping.xml:179
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
-"(or columns) that define the iteration order of the <literal>Map</literal>, "
-"<literal>Set</literal> or bag, together with an optional <literal>asc</"
-"literal> or <literal>desc</literal>"
+"<literal>order-by</literal> (optional, JDK1.4 only): specifies a table "
+"column or columns that define the iteration order of the <literal>Map</"
+"literal>, <literal>Set</literal> or bag, together with an optional "
+"<literal>asc</literal> or <literal>desc</literal>."
 msgstr ""
 "<literal>order-by</literal> (可选, 仅用于jdk1.4) 指定表的字段(一个或几个)再加"
 "上asc或者desc(可选), 定义Map,Set和Bag的迭代顺序"
 
 #. Tag: para
 #: collection_mapping.xml:186
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
-"literal> condition to be used when retrieving or removing the collection "
-"(useful if the collection should contain only a subset of the available data)"
+"<literal>where</literal> (optional): specifies an arbitrary SQL "
+"<literal>WHERE</literal> condition that is used when retrieving or removing "
+"the collection. This is useful if the collection needs to contain only a "
+"subset of the available data."
 msgstr ""
 "<literal>where</literal> (可选) 指定任意的SQL where条件, 该条件将在重新载入或"
 "者删除这个集合时使用(当集合中的数据仅仅是所有可用数据的一个子集时这个条件非常"
@@ -331,10 +334,10 @@
 
 #. Tag: para
 #: collection_mapping.xml:193
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
-"Choose between outer-join fetching, fetching by sequential select, and "
+"<literal>fetch</literal> (optional, defaults to <literal>select</literal>): "
+"chooses between outer-join fetching, fetching by sequential select, and "
 "fetching by sequential subselect."
 msgstr ""
 "<literal>fetch</literal> (可选, 默认为<literal>select</literal>) 用于在外连接"
@@ -342,33 +345,33 @@
 
 #. Tag: para
 #: collection_mapping.xml:200
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
-"specify a \"batch size\" for lazily fetching instances of this collection."
+"<literal>batch-size</literal> (optional, defaults to <literal>1</literal>): "
+"specifies a \"batch size\" for lazily fetching instances of this collection."
 msgstr ""
 "<literal>batch-size</literal> (可选, 默认为<literal>1</literal>) 指定通过延迟"
 "加载取得集合实例的批处理块大小(\"batch size\")。"
 
 #. Tag: para
 #: collection_mapping.xml:206
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
-"literal>): The strategy Hibernate should use for accessing the collection "
-"property value."
+"literal>): the strategy Hibernate uses for accessing the collection property "
+"value."
 msgstr ""
 "<literal>access</literal>(可选-默认为属性property):Hibernate取得集合属性值时"
 "使用的策略"
 
 #. Tag: para
 #: collection_mapping.xml:212
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
-"literal>): Species that changes to the state of the collection results in "
-"increment of the owning entity's version. (For one to many associations, it "
-"is often reasonable to disable this setting.)"
+"literal>): specifies that changes to the state of the collection results in "
+"increments of the owning entity's version. For one-to-many associations you "
+"may want to disable this setting."
 msgstr ""
 "<literal>乐观锁</literal> (可选 - 默认为 <literal>true</literal>): 对集合的状"
 "态的改变会是否导致其所属的实体的版本增长。 (对一对多关联来说,关闭这个属性常"
@@ -376,11 +379,12 @@
 
 #. Tag: para
 #: collection_mapping.xml:220
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
-"A value of <literal>false</literal> specifies that the elements of the "
-"collection never change (a minor performance optimization in some cases)."
+"a value of <literal>false</literal> specifies that the elements of the "
+"collection never change. This allows for minor performance optimization in "
+"some cases."
 msgstr ""
 "<literal>mutable(可变)</literal> (可选 - 默认为<literal>true</literal>): 若"
 "值为<literal>false</literal>,表明集合中的元素不会改变(在某些情况下可以进行一"
@@ -394,11 +398,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
 "the entity that owns the collection. This foreign key is referred to as the "
-"<emphasis>collection key column</emphasis> (or columns) of the collection "
+"<emphasis>collection key column</emphasis>, or columns, of the collection "
 "table. The collection key column is mapped by the <literal>&lt;key&gt;</"
 "literal> element."
 msgstr ""
@@ -408,11 +412,11 @@
 
 #. Tag: para
 #: collection_mapping.xml:240
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There may be a nullability constraint on the foreign key column. For most "
-"collections, this is implied. For unidirectional one to many associations, "
-"the foreign key column is nullable by default, so you might need to specify "
+"There can be a nullability constraint on the foreign key column. For most "
+"collections, this is implied. For unidirectional one-to-many associations, "
+"the foreign key column is nullable by default, so you may need to specify "
 "<literal>not-null=\"true\"</literal>."
 msgstr ""
 "在外键字段上可能具有非空约束。对于大多数集合来说,这是隐含的。对单向一对多关"
@@ -427,9 +431,9 @@
 
 #. Tag: para
 #: collection_mapping.xml:249
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
+"The foreign key constraint can use <literal>ON DELETE CASCADE</literal>."
 msgstr "外键约束可以使用<literal>ON DELETE CASCADE</literal>。"
 
 #. Tag: programlisting
@@ -454,15 +458,15 @@
 
 #. Tag: para
 #: collection_mapping.xml:265
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Collections may contain almost any other Hibernate type, including all basic "
-"types, custom types, components, and of course, references to other "
-"entities. This is an important distinction: an object in a collection might "
-"be handled with \"value\" semantics (its life cycle fully depends on the "
-"collection owner) or it might be a reference to another entity, with its own "
-"life cycle. In the latter case, only the \"link\" between the two objects is "
-"considered to be state held by the collection."
+"Collections can contain almost any other Hibernate type, including: basic "
+"types, custom types, components and references to other entities. This is an "
+"important distinction. An object in a collection might be handled with "
+"\"value\" semantics (its life cycle fully depends on the collection owner), "
+"or it might be a reference to another entity with its own life cycle. In the "
+"latter case, only the \"link\" between the two objects is considered to be a "
+"state held by the collection."
 msgstr ""
 "集合几乎可以包含任何其他的Hibernate类型,包括所有的基本类型、自定义类型、组"
 "件,当然还有对其他实体的引用。存在一个重要的区别:位于集合中的对象可能是根"
@@ -495,19 +499,19 @@
 
 #. Tag: para
 #: collection_mapping.xml:288
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
-"<emphasis>index column</emphasis> in the collection table - a column that "
-"maps to an array index, or <literal>List</literal> index, or <literal>Map</"
-"literal> key. The index of a <literal>Map</literal> may be of any basic "
-"type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entity "
-"reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or it "
-"may be a composite type, mapped with <literal>&lt;composite-map-key&gt;</"
-"literal>. The index of an array or list is always of type <literal>integer</"
-"literal> and is mapped using the <literal>&lt;list-index&gt;</literal> "
-"element. The mapped column contains sequential integers (numbered from zero, "
-"by default)."
+"<emphasis>index column</emphasis> in the collection table. An index column "
+"is a column that maps to an array index, or <literal>List</literal> index, "
+"or <literal>Map</literal> key. The index of a <literal>Map</literal> may be "
+"of any basic type, mapped with <literal>&lt;map-key&gt;</literal>. It can be "
+"an entity reference mapped with <literal>&lt;map-key-many-to-many&gt;</"
+"literal>, or it can be a composite type mapped with <literal>&lt;composite-"
+"map-key&gt;</literal>. The index of an array or list is always of type "
+"<literal>integer</literal> and is mapped using the <literal>&lt;list-"
+"index&gt;</literal> element. The mapped column contains sequential integers "
+"that are numbered from zero by default."
 msgstr ""
 "所有的集合映射,除了set和bag语义的以外,都需要指定一个集合表的<emphasis>索引"
 "字段(index column)</emphasis>——用于对应到数组索引,或者<literal>List</"
@@ -528,10 +532,10 @@
 "index \n"
 "        column=\"column_name\"\n"
 "        base=\"0|1|...\"/>]]></programlisting> <calloutlist> <callout "
-"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): The "
+"arearefs=\"index1\"> <para> <literal>column_name</literal> (required): the "
 "name of the column holding the collection index values. </para> </callout> "
-"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional, "
-"defaults to <literal>0</literal>): The value of the index column that "
+"<callout arearefs=\"index1\"> <para> <literal>base</literal> (optional - "
+"defaults to <literal>0</literal>): the value of the index column that "
 "corresponds to the first element of the list or array. </para> </callout> </"
 "calloutlist> </programlistingco> <programlistingco> <areaspec> <area id="
 "\"mapkey1\" coords=\"2 45\"/> <area id=\"mapkey2\" coords=\"3 45\"/> <area "
@@ -542,11 +546,11 @@
 "        type=\"type_name\"\n"
 "        node=\"@attribute-name\"\n"
 "        length=\"N\"/>]]></programlisting> <calloutlist> <callout arearefs="
-"\"mapkey1\"> <para> <literal>column</literal> (optional): The name of the "
+"\"mapkey1\"> <para> <literal>column</literal> (optional): the name of the "
 "column holding the collection index values. </para> </callout> <callout "
-"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): A SQL "
+"arearefs=\"mapkey2\"> <para> <literal>formula</literal> (optional): a SQL "
 "formula used to evaluate the key of the map. </para> </callout> <callout "
-"arearefs=\"mapkey3\"> <para> <literal>type</literal> (reguired): The type of "
+"arearefs=\"mapkey3\"> <para> <literal>type</literal> (required): the type of "
 "the map keys. </para> </callout> </calloutlist> </programlistingco> "
 "<programlistingco> <areaspec> <area id=\"indexmanytomany1\" coords=\"2 45\"/"
 "> <area id=\"indexmanytomany2\" coords=\"3 45\"/> <area id=\"indexmanytomany3"
@@ -556,24 +560,24 @@
 "        formula=\"any SQL expression\"\n"
 "        class=\"ClassName\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"indexmanytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the foreign key "
+"<para> <literal>column</literal> (optional): the name of the foreign key "
 "column for the collection index values. </para> </callout> <callout arearefs="
-"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): A SQL "
+"\"indexmanytomany2\"> <para> <literal>formula</literal> (optional): a SQ "
 "formula used to evaluate the foreign key of the map key. </para> </callout> "
 "<callout arearefs=\"indexmanytomany3\"> <para> <literal>class</literal> "
-"(required): The entity class used as the map key. </para> </callout> </"
+"(required): the entity class used as the map key. </para> </callout> </"
 "calloutlist> </programlistingco>"
 msgstr ""
 
 #. Tag: para
 #: collection_mapping.xml:380
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If your table doesn't have an index column, and you still wish to use "
-"<literal>List</literal> as the property type, you should map the property as "
-"a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its "
-"order when it is retrieved from the database, but it may be optionally "
-"sorted or ordered."
+"If your table does not have an index column, and you still wish to use "
+"<literal>List</literal> as the property type, you can map the property as a "
+"Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain its order "
+"when it is retrieved from the database, but it can be optionally sorted or "
+"ordered."
 msgstr ""
 "值集合于多对多关联(Collections of values and many-to-many associations)"
 
@@ -585,20 +589,20 @@
 
 #. Tag: para
 #: collection_mapping.xml:392
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Any collection of values or many-to-many association requires a dedicated "
+"Any collection of values or many-to-many associations requires a dedicated "
 "<emphasis>collection table</emphasis> with a foreign key column or columns, "
-"<emphasis>collection element column</emphasis> or columns and possibly an "
+"<emphasis>collection element column</emphasis> or columns, and possibly an "
 "index column or columns."
 msgstr "<literal>column</literal>(可选):保存集合元素值的字段名。"
 
 #. Tag: para
 #: collection_mapping.xml:399
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For a collection of values, we use the <literal>&lt;element&gt;</literal> "
-"tag."
+"For a collection of values use the <literal>&lt;element&gt;</literal> tag. "
+"For example:"
 msgstr "<literal>formula</literal> (可选): 用于计算元素的SQL公式"
 
 #. Tag: sect2
@@ -618,11 +622,11 @@
 "        unique=\"true|false\"\n"
 "        node=\"element-name\"\n"
 "/>]]></programlisting> <calloutlist> <callout arearefs=\"element1b\"> <para> "
-"<literal>column</literal> (optional): The name of the column holding the "
+"<literal>column</literal> (optional): the name of the column holding the "
 "collection element values. </para> </callout> <callout arearefs=\"element2b"
-"\"> <para> <literal>formula</literal> (optional): An SQL formula used to "
+"\"> <para> <literal>formula</literal> (optional): an SQL formula used to "
 "evaluate the element. </para> </callout> <callout arearefs=\"element3b\"> "
-"<para> <literal>type</literal> (required): The type of the collection "
+"<para> <literal>type</literal> (required): the type of the collection "
 "element. </para> </callout> </calloutlist> </programlistingco> <para> A "
 "<emphasis>many-to-many association</emphasis> is specified using the "
 "<literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> "
@@ -643,30 +647,30 @@
 "        node=\"element-name\"\n"
 "        embed-xml=\"true|false\"\n"
 "    />]]></programlisting> <calloutlist> <callout arearefs=\"manytomany1\"> "
-"<para> <literal>column</literal> (optional): The name of the element foreign "
+"<para> <literal>column</literal> (optional): the name of the element foreign "
 "key column. </para> </callout> <callout arearefs=\"manytomany2\"> <para> "
-"<literal>formula</literal> (optional): An SQL formula used to evaluate the "
+"<literal>formula</literal> (optional): an SQL formula used to evaluate the "
 "element foreign key value. </para> </callout> <callout arearefs=\"manytomany3"
-"\"> <para> <literal>class</literal> (required): The name of the associated "
+"\"> <para> <literal>class</literal> (required): the name of the associated "
 "class. </para> </callout> <callout arearefs=\"manytomany4\"> <para> "
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
 "enables outer-join or sequential select fetching for this association. This "
-"is a special case; for full eager fetching (in a single <literal>SELECT</"
-"literal>) of an entity and its many-to-many relationships to other entities, "
-"you would enable <literal>join</literal> fetching not only of the collection "
+"is a special case; for full eager fetching in a single <literal>SELECT</"
+"literal> of an entity and its many-to-many relationships to other entities, "
+"you would enable <literal>join</literal> fetching,not only of the collection "
 "itself, but also with this attribute on the <literal>&lt;many-to-many&gt;</"
 "literal> nested element. </para> </callout> <callout arearefs=\"manytomany5"
-"\"> <para> <literal>unique</literal> (optional): Enable the DDL generation "
+"\"> <para> <literal>unique</literal> (optional): enables the DDL generation "
 "of a unique constraint for the foreign-key column. This makes the "
-"association multiplicity effectively one to many. </para> </callout> "
+"association multiplicity effectively one-to-many. </para> </callout> "
 "<callout arearefs=\"manytomany6\"> <para> <literal>not-found</literal> "
-"(optional - defaults to <literal>exception</literal>): Specifies how foreign "
+"(optional - defaults to <literal>exception</literal>): specifies how foreign "
 "keys that reference missing rows will be handled: <literal>ignore</literal> "
 "will treat a missing row as a null association. </para> </callout> <callout "
 "arearefs=\"manytomany7\"> <para> <literal>entity-name</literal> (optional): "
-"The entity name of the associated class, as an alternative to "
+"the entity name of the associated class, as an alternative to "
 "<literal>class</literal>. </para> </callout> <callout arearefs=\"manytomany8"
-"\"> <para> <literal>property-ref</literal>: (optional) The name of a "
+"\"> <para> <literal>property-ref</literal> (optional): the name of a "
 "property of the associated class that is joined to this foreign key. If not "
 "specified, the primary key of the associated class is used. </para> </"
 "callout> </calloutlist> </programlistingco>"
@@ -675,12 +679,17 @@
 #. Tag: para
 #: collection_mapping.xml:506
 #, no-c-format
-msgid "Some examples, first, a set of strings:"
+msgid "Here are some examples."
 msgstr ""
-"包含一组整数的bag(还设置了<literal>order-by</literal>参数指定了迭代的顺序):"
 
+#. Tag: para
+#: collection_mapping.xml:509
+#, no-c-format
+msgid "A set of strings:"
+msgstr ""
+
 #. Tag: programlisting
-#: collection_mapping.xml:510
+#: collection_mapping.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -690,17 +699,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:512
-#, no-c-format
+#: collection_mapping.xml:515
+#, fuzzy, no-c-format
 msgid ""
-"A bag containing integers (with an iteration order determined by the "
-"<literal>order-by</literal> attribute):"
+"A bag containing integers with an iteration order determined by the "
+"<literal>order-by</literal> attribute:"
 msgstr ""
 "一个实体数组,在这个案例中是一个多对多的关联(注意这里的实体是自动管理生命周期"
 "的对象(life cycle objects),<literal>cascade=\"all\"</literal>):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:517
+#: collection_mapping.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -712,13 +721,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:519
-#, no-c-format
-msgid "An array of entities - in this case, a many to many association:"
+#: collection_mapping.xml:522
+#, fuzzy, no-c-format
+msgid "An array of entities, in this case, a many-to-many association:"
 msgstr "一个map,通过字符串的索引来指明日期:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:523
+#: collection_mapping.xml:526
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -731,13 +740,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:525
+#: collection_mapping.xml:528
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "一个组件的列表:(下一章讨论)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:529
+#: collection_mapping.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -751,13 +760,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:531
-#, no-c-format
-msgid "A list of components (discussed in the next chapter):"
+#: collection_mapping.xml:534
+#, fuzzy, no-c-format
+msgid "A list of components (this is discussed in the next chapter):"
 msgstr "一对多关联(One-to-many Associations)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:535
+#: collection_mapping.xml:538
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -773,7 +782,7 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:540
+#: collection_mapping.xml:543
 #, no-c-format
 msgid "One-to-many associations"
 msgstr ""
@@ -781,45 +790,45 @@
 "表,而没有中间集合表。 这个关系模型失去了一些Java集合的语义:"
 
 #. Tag: para
-#: collection_mapping.xml:542
-#, no-c-format
+#: collection_mapping.xml:545
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>one to many association</emphasis> links the tables of two "
-"classes via a foreign key, with no intervening collection table. This "
-"mapping loses certain semantics of normal Java collections:"
+"A <emphasis>one-to-many association</emphasis> links the tables of two "
+"classes via a foreign key with no intervening collection table. This mapping "
+"loses certain semantics of normal Java collections:"
 msgstr "一个被包含的实体的实例只能被包含在一个集合的实例中"
 
 #. Tag: para
-#: collection_mapping.xml:550
-#, no-c-format
+#: collection_mapping.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not belong to more than one "
-"instance of the collection"
+"An instance of the contained entity class cannot belong to more than one "
+"instance of the collection."
 msgstr "一个被包含的实体的实例只能对应于集合索引的一个值中"
 
 #. Tag: para
-#: collection_mapping.xml:556
-#, no-c-format
+#: collection_mapping.xml:559
+#, fuzzy, no-c-format
 msgid ""
-"An instance of the contained entity class may not appear at more than one "
-"value of the collection index"
+"An instance of the contained entity class cannot appear at more than one "
+"value of the collection index."
 msgstr ""
 "一个从<literal>Product</literal>到<literal>Part</literal>的关联需要关键字字"
 "段,可能还有一个索引字段指向<literal>Part</literal>所对应的表。 <literal>&lt;"
 "one-to-many&gt;</literal>标记指明了一个一对多的关联。"
 
 #. Tag: para
-#: collection_mapping.xml:563
-#, no-c-format
+#: collection_mapping.xml:566
+#, fuzzy, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
-"requires existence of a foreign key column and possibly an index column to "
-"the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</literal> "
-"tag indicates that this is a one to many association."
+"requires the existence of a foreign key column and possibly an index column "
+"to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</"
+"literal> tag indicates that this is a one-to-many association."
 msgstr "<literal>class</literal>(必须):被关联类的名称。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:576
+#: collection_mapping.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -832,9 +841,9 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:579
+#: collection_mapping.xml:582
 #, fuzzy, no-c-format
-msgid "<literal>class</literal> (required): The name of the associated class."
+msgid "<literal>class</literal> (required): the name of the associated class."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "为此关联打开外连接抓取或者后续select抓取。这是特殊情况;对于一个实体及其指向"
@@ -847,22 +856,22 @@
 "行作为一个空关联处理。"
 
 #. Tag: para
-#: collection_mapping.xml:584
-#, no-c-format
+#: collection_mapping.xml:587
+#, fuzzy, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
-"literal>): Specifies how cached identifiers that reference missing rows will "
-"be handled: <literal>ignore</literal> will treat a missing row as a null "
+"literal>): specifies how cached identifiers that reference missing rows will "
+"be handled. <literal>ignore</literal> will treat a missing row as a null "
 "association."
 msgstr ""
 "<literal>entity-name</literal> (可选): 被关联的类的实体名,作为"
 "<literal>class</literal>的替代。"
 
 #. Tag: para
-#: collection_mapping.xml:591
+#: collection_mapping.xml:594
 #, fuzzy, no-c-format
 msgid ""
-"<literal>entity-name</literal> (optional): The entity name of the associated "
+"<literal>entity-name</literal> (optional): the entity name of the associated "
 "class, as an alternative to <literal>class</literal>."
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -872,27 +881,26 @@
 "例子"
 
 #. Tag: para
-#: collection_mapping.xml:599
-#, no-c-format
+#: collection_mapping.xml:602
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
-"to declare any columns. Nor is it necessary to specify the <literal>table</"
-"literal> name anywhere."
+"The <literal>&lt;one-to-many&gt;</literal> element does not need to declare "
+"any columns. Nor is it necessary to specify the <literal>table</literal> "
+"name anywhere."
 msgstr ""
 "注意:<literal>&lt;one-to-many&gt;</literal>元素不需要定义任何字段。 也不需要"
 "指定表名。"
 
 #. Tag: para
-#: collection_mapping.xml:605
-#, no-c-format
+#: collection_mapping.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Very important note:</emphasis> If the foreign key column of a "
-"<literal>&lt;one-to-many&gt;</literal> association is declared <literal>NOT "
-"NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> mapping "
-"<literal>not-null=\"true\"</literal> or <emphasis>use a bidirectional "
-"association</emphasis> with the collection mapping marked <literal>inverse="
-"\"true\"</literal>. See the discussion of bidirectional associations later "
-"in this chapter."
+"If the foreign key column of a <literal>&lt;one-to-many&gt;</literal> "
+"association is declared <literal>NOT NULL</literal>, you must declare the "
+"<literal>&lt;key&gt;</literal> mapping <literal>not-null=\"true\"</literal> "
+"or <emphasis>use a bidirectional association</emphasis> with the collection "
+"mapping marked <literal>inverse=\"true\"</literal>. See the discussion of "
+"bidirectional associations later in this chapter for more information."
 msgstr ""
 "<emphasis>重要提示</emphasis>:如果<literal>一对多</literal>关联中的外键字段定"
 "义成<literal>NOT NULL</literal>,你必须把<literal>&lt;key&gt;</literal>映射声"
@@ -901,19 +909,19 @@
 "关联的讨论。"
 
 #. Tag: para
-#: collection_mapping.xml:614
-#, no-c-format
+#: collection_mapping.xml:619
+#, fuzzy, no-c-format
 msgid ""
-"This example shows a map of <literal>Part</literal> entities by name (where "
-"<literal>partName</literal> is a persistent property of <literal>Part</"
-"literal>). Notice the use of a formula-based index."
+"The following example shows a map of <literal>Part</literal> entities by "
+"name, where <literal>partName</literal> is a persistent property of "
+"<literal>Part</literal>. Notice the use of a formula-based index:"
 msgstr ""
 "下面的例子展示一个<literal>Part</literal>实体的map,把name作为关键字。"
 "( <literal>partName</literal> 是<literal>Part</literal>的持久化属性)。注意其"
 "中的基于公式的索引的用法。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:620
+#: collection_mapping.xml:625
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -925,19 +933,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:626
+#: collection_mapping.xml:631
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "高级集合映射(Advanced collection mappings)"
 
 #. Tag: title
-#: collection_mapping.xml:629
+#: collection_mapping.xml:634
 #, no-c-format
 msgid "Sorted collections"
 msgstr "有序集合(Sorted collections)"
 
 #. Tag: para
-#: collection_mapping.xml:631
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -948,7 +956,7 @@
 "SortedSet</literal>的集合。 你必须在映射文件中指定一个比较器:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:636
+#: collection_mapping.xml:641
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -966,7 +974,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:638
+#: collection_mapping.xml:643
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -978,7 +986,7 @@
 "的类的名称。"
 
 #. Tag: para
-#: collection_mapping.xml:644
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -988,15 +996,15 @@
 "util.TreeMap</literal>。"
 
 #. Tag: para
-#: collection_mapping.xml:649
-#, no-c-format
+#: collection_mapping.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"If you want the database itself to order the collection elements use the "
+"If you want the database itself to order the collection elements, use the "
 "<literal>order-by</literal> attribute of <literal>set</literal>, "
 "<literal>bag</literal> or <literal>map</literal> mappings. This solution is "
-"only available under JDK 1.4 or higher (it is implemented using "
-"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>). This "
-"performs the ordering in the SQL query, not in memory."
+"only available under JDK 1.4 or higher and is implemented using "
+"<literal>LinkedHashSet</literal> or <literal>LinkedHashMap</literal>. This "
+"performs the ordering in the SQL query and not in the memory."
 msgstr ""
 "如果你希望数据库自己对集合元素排序,可以利用<literal>set</literal>,"
 "<literal>bag</literal>或者<literal>map</literal>映射中的<literal>order-by</"
@@ -1005,7 +1013,7 @@
 "中。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:658
+#: collection_mapping.xml:663
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1021,26 +1029,32 @@
 "</map>]]>"
 msgstr ""
 
+#. Tag: title
+#: collection_mapping.xml:666
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: collection_mapping.xml:660
-#, no-c-format
+#: collection_mapping.xml:667
+#, fuzzy, no-c-format
 msgid ""
-"Note that the value of the <literal>order-by</literal> attribute is an SQL "
-"ordering, not a HQL ordering!"
+"The value of the <literal>order-by</literal> attribute is an SQL ordering, "
+"not an HQL ordering."
 msgstr ""
 "注意: 这个<literal>order-by</literal>属性的值是一个SQL排序子句而不是HQL的!"
 
 #. Tag: para
-#: collection_mapping.xml:665
-#, no-c-format
+#: collection_mapping.xml:673
+#, fuzzy, no-c-format
 msgid ""
-"Associations may even be sorted by some arbitrary criteria at runtime using "
-"a collection <literal>filter()</literal>."
+"Associations can even be sorted by arbitrary criteria at runtime using a "
+"collection <literal>filter()</literal>:"
 msgstr ""
 "关联还可以在运行时使用集合<literal>filter()</literal>根据任意的条件来排序。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:670
+#: collection_mapping.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1048,13 +1062,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:675
+#: collection_mapping.xml:683
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "双向关联(Bidirectional associations)"
 
 #. Tag: para
-#: collection_mapping.xml:677
+#: collection_mapping.xml:685
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1065,54 +1079,54 @@
 "中, 支持两种类型的双向关联: <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:684
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "one-to-many"
 msgstr "一对多(one-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:686
-#, no-c-format
-msgid "set or bag valued at one end, single-valued at the other"
+#: collection_mapping.xml:694
+#, fuzzy, no-c-format
+msgid "set or bag valued at one end and single-valued at the other"
 msgstr "Set或者bag值在一端, 单独值(非集合)在另外一端"
 
 #. Tag: term
-#: collection_mapping.xml:692
+#: collection_mapping.xml:700
 #, no-c-format
 msgid "many-to-many"
 msgstr "多对多(many-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:694
+#: collection_mapping.xml:702
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "两端都是set或bag值"
 
 #. Tag: para
-#: collection_mapping.xml:703
-#, no-c-format
+#: collection_mapping.xml:711
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a bidirectional many-to-many association simply by mapping "
-"two many-to-many associations to the same database table and declaring one "
-"end as <emphasis>inverse</emphasis> (which one is your choice, but it can "
-"not be an indexed collection)."
+"You can specify a bidirectional many-to-many association by mapping two many-"
+"to-many associations to the same database table and declaring one end as "
+"<emphasis>inverse</emphasis>. You cannot select an indexed collection."
 msgstr ""
 "要建立一个双向的多对多关联,只需要映射两个many-to-many关联到同一个数据库表"
 "中,并再定义其中的一端为<emphasis>inverse</emphasis>(使用哪一端要根据你的选"
 "择,但它不能是一个索引集合)。"
 
 #. Tag: para
-#: collection_mapping.xml:710
-#, no-c-format
+#: collection_mapping.xml:718
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example of a bidirectional many-to-many association; each category "
-"can have many items and each item can be in many categories:"
+"Here is an example of a bidirectional many-to-many association that "
+"illustrates how each category can have many items and each item can be in "
+"many categories:"
 msgstr ""
 "这里有一个many-to-many的双向关联的例子;每一个category都可以有很多items,每一个"
 "items可以属于很多categories:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:715
+#: collection_mapping.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1137,14 +1151,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:717
-#, no-c-format
+#: collection_mapping.xml:725
+#, fuzzy, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
 "emphasis> persisted. This means that Hibernate has two representations in "
-"memory for every bidirectional association, one link from A to B and another "
+"memory for every bidirectional association: one link from A to B and another "
 "link from B to A. This is easier to understand if you think about the Java "
-"object model and how we create a many-to-many relationship in Java:"
+"object model and how a many-to-many relationship in Javais created:"
 msgstr ""
 "如果只对关联的反向端进行了改变,这个改变<emphasis>不会</emphasis>被持久化。 "
 "这表示Hibernate为每个双向关联在内存中存在两次表现,一个从A连接到B,另一个从B连"
@@ -1152,7 +1166,7 @@
 "让你更容易理解:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:725
+#: collection_mapping.xml:733
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1167,7 +1181,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:727
+#: collection_mapping.xml:735
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1175,10 +1189,10 @@
 msgstr "非反向端用于把内存中的表示保存到数据库中。"
 
 #. Tag: para
-#: collection_mapping.xml:731
-#, no-c-format
+#: collection_mapping.xml:739
+#, fuzzy, no-c-format
 msgid ""
-"You may define a bidirectional one-to-many association by mapping a one-to-"
+"You can define a bidirectional one-to-many association by mapping a one-to-"
 "many association to the same table column(s) as a many-to-one association "
 "and declaring the many-valued end <literal>inverse=\"true\"</literal>."
 msgstr ""
@@ -1187,7 +1201,7 @@
 "literal>。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:737
+#: collection_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1210,37 +1224,37 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:739
-#, no-c-format
+#: collection_mapping.xml:747
+#, fuzzy, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
-"doesn't affect the operation of cascades, these are orthogonal concepts!"
+"does not affect the operation of cascades as these are orthogonal concepts."
 msgstr ""
 "在“一”这一端定义<literal>inverse=\"true\"</literal>不会影响级联操作,二者是正"
 "交的概念!"
 
 #. Tag: title
-#: collection_mapping.xml:747
+#: collection_mapping.xml:755
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "双向关联,涉及有序集合类"
 
 #. Tag: para
-#: collection_mapping.xml:748
-#, no-c-format
+#: collection_mapping.xml:756
+#, fuzzy, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
-"list&gt;</literal> or <literal>&lt;map&gt;</literal> requires special "
-"consideration. If there is a property of the child class which maps to the "
-"index column, no problem, we can continue using <literal>inverse=\"true\"</"
-"literal> on the collection mapping:"
+"list&gt;</literal> or <literal>&lt;map&gt;</literal>, requires special "
+"consideration. If there is a property of the child class that maps to the "
+"index column you can use <literal>inverse=\"true\"</literal> on the "
+"collection mapping:"
 msgstr ""
 "对于有一端是<literal>&lt;list&gt;</literal>或者<literal>&lt;map&gt;</literal>"
 "的双向关联,需要加以特别考虑。假若子类中的一个属性映射到索引字段,没问题,我"
 "们仍然可以在集合类映射上使用<literal>inverse=\"true\"</literal>:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1267,21 +1281,21 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:757
-#, no-c-format
+#: collection_mapping.xml:765
+#, fuzzy, no-c-format
 msgid ""
-"But, if there is no such property on the child class, we can't think of the "
-"association as truly bidirectional (there is information available at one "
-"end of the association that is not available at the other end). In this "
-"case, we can't map the collection <literal>inverse=\"true\"</literal>. "
-"Instead, we could use the following mapping:"
+"If there is no such property on the child class, the association cannot be "
+"considered truly bidirectional. That is, there is information available at "
+"one end of the association that is not available at the other end. In this "
+"case, you cannot map the collection <literal>inverse=\"true\"</literal>. "
+"Instead, you could use the following mapping:"
 msgstr ""
 "但是,假若子类中没有这样的属性存在,我们不能认为这个关联是真正的双向关联(信"
 "息不对称,在关联的一端有一些另外一端没有的信息)。在这种情况下,我们不能使用"
 "<literal>inverse=\"true\"</literal>。我们需要这样用:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:764
+#: collection_mapping.xml:772
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1309,34 +1323,33 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:766
-#, no-c-format
+#: collection_mapping.xml:774
+#, fuzzy, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
-"responsible for updates to the foreign key. TODO: Does this really result in "
-"some unnecessary update statements?"
+"responsible for updates to the foreign key."
 msgstr ""
 "注意在这个映射中,关联中集合类\"值\"一端负责来更新外键.TODO: Does this "
 "really result in some unnecessary update statements?"
 
 #. Tag: title
-#: collection_mapping.xml:774
+#: collection_mapping.xml:782
 #, no-c-format
 msgid "Ternary associations"
 msgstr "三重关联(Ternary associations)"
 
 #. Tag: para
-#: collection_mapping.xml:776
-#, no-c-format
+#: collection_mapping.xml:784
+#, fuzzy, no-c-format
 msgid ""
-"There are three possible approaches to mapping a ternary association. One is "
-"to use a <literal>Map</literal> with an association as its index:"
+"There are three possible approaches to mapping a ternary association. One "
+"approach is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 "有三种可能的途径来映射一个三重关联。第一种是使用一个<literal>Map</literal>,"
 "把一个关联作为其索引:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:781
+#: collection_mapping.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1347,7 +1360,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:783
+#: collection_mapping.xml:791
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1358,41 +1371,40 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:785
-#, no-c-format
+#: collection_mapping.xml:793
+#, fuzzy, no-c-format
 msgid ""
-"A second approach is to simply remodel the association as an entity class. "
-"This is the approach we use most commonly."
+"A second approach is to remodel the association as an entity class. This is "
+"the most common approach."
 msgstr ""
 "第二种方法是简单的把关联重新建模为一个实体类。这使我们最经常使用的方法。"
 
 #. Tag: para
-#: collection_mapping.xml:790
-#, no-c-format
+#: collection_mapping.xml:798
+#, fuzzy, no-c-format
 msgid ""
-"A final alternative is to use composite elements, which we will discuss "
+"A final alternative is to use composite elements, which will be discussed "
 "later."
 msgstr "最后一种选择是使用复合元素,我们会在后面讨论"
 
 #. Tag: literal
-#: collection_mapping.xml:797
+#: collection_mapping.xml:805
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "使用&lt;idbag&gt;"
 
 #. Tag: para
-#: collection_mapping.xml:799
-#, no-c-format
+#: collection_mapping.xml:807
+#, fuzzy, no-c-format
 msgid ""
-"If you've fully embraced our view that composite keys are a bad thing and "
-"that entities should have synthetic identifiers (surrogate keys), then you "
-"might find it a bit odd that the many to many associations and collections "
-"of values that we've shown so far all map to tables with composite keys! "
-"Now, this point is quite arguable; a pure association table doesn't seem to "
-"benefit much from a surrogate key (though a collection of composite values "
-"<emphasis>might</emphasis>). Nevertheless, Hibernate provides a feature that "
-"allows you to map many to many associations and collections of values to a "
-"table with a surrogate key."
+"The majority of the many-to-many associations and collections of values "
+"shown previously all map to tables with composite keys, even though it has "
+"been have suggested that entities should have synthetic identifiers "
+"(surrogate keys). A pure association table does not seem to benefit much "
+"from a surrogate key, although a collection of composite values "
+"<emphasis>might</emphasis>. It is for this reason that Hibernate provides a "
+"feature that allows you to map many-to-many associations and collections of "
+"values to a table with a surrogate key."
 msgstr ""
 "如果你完全信奉我们对于“联合主键(composite keys)是个坏东西”,和“实体应该使用"
 "(无机的)自己生成的代用标识符(surrogate keys)”的观点,也许你会感到有一些奇"
@@ -1403,17 +1415,17 @@
 "个使用代用标识符的表去。"
 
 #. Tag: para
-#: collection_mapping.xml:810
-#, no-c-format
+#: collection_mapping.xml:817
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
-"literal> (or <literal>Collection</literal>) with bag semantics."
+"literal> (or <literal>Collection</literal>) with bag semantics. For example:"
 msgstr ""
 "<literal>&lt;idbag&gt;</literal> 属性让你使用bag语义来映射一个<literal>List</"
 "literal> (或<literal>Collection</literal>)。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:815
+#: collection_mapping.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1426,33 +1438,33 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:817
-#, no-c-format
+#: collection_mapping.xml:824
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
-"generator, just like an entity class! A different surrogate key is assigned "
-"to each collection row. Hibernate does not provide any mechanism to discover "
-"the surrogate key value of a particular row, however."
+"An <literal>&lt;idbag&gt;</literal> has a synthetic id generator, just like "
+"an entity class. A different surrogate key is assigned to each collection "
+"row. Hibernate does not, however, provide any mechanism for discovering the "
+"surrogate key value of a particular row."
 msgstr ""
 "你可以理解,<literal>&lt;idbag&gt;</literal>人工的id生成器,就好像是实体类一"
 "样!集合的每一行都有一个不同的人造关键字。但是,Hibernate没有提供任何机制来让"
 "你取得某个特定行的人造关键字。"
 
 #. Tag: para
-#: collection_mapping.xml:824
-#, no-c-format
+#: collection_mapping.xml:831
+#, fuzzy, no-c-format
 msgid ""
-"Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
-"<emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt;</"
-"literal>! Hibernate can locate individual rows efficiently and update or "
-"delete them individually, just like a list, map or set."
+"The update performance of an <literal>&lt;idbag&gt;</literal> supersedes a "
+"regular <literal>&lt;bag&gt;</literal>. Hibernate can locate individual rows "
+"efficiently and update or delete them individually, similar to a list, map "
+"or set."
 msgstr ""
 "注意<literal>&lt;idbag&gt;</literal>的更新性能要比普通的<literal>&lt;bag&gt;"
 "</literal>高得多!Hibernate可以有效的定位到不同的行,分别进行更新或删除工作,"
 "就如同处理一个list, map或者set一样。"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:837
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1463,21 +1475,26 @@
 "<literal>&lt;idbag&gt;</literal>集合的标识符。"
 
 #. Tag: title
-#: collection_mapping.xml:855
+#: collection_mapping.xml:861
 #, no-c-format
 msgid "Collection examples"
 msgstr "集合例子(Collection example)"
 
 #. Tag: para
-#: collection_mapping.xml:857
+#: collection_mapping.xml:863
+#, fuzzy, no-c-format
+msgid "This section covers collection examples."
+msgstr "集合例子(Collection example)"
+
+#. Tag: para
+#: collection_mapping.xml:867
 #, no-c-format
 msgid ""
-"The previous sections are pretty confusing. So lets look at an example. This "
-"class:"
-msgstr "在前面的几个章节的确非常令人迷惑。 因此让我们来看一个例子。这个类:"
+"The following class has a collection of <literal>Child</literal> instances:"
+msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:862
+#: collection_mapping.xml:871
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1499,17 +1516,17 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:864
-#, no-c-format
+#: collection_mapping.xml:873
+#, fuzzy, no-c-format
 msgid ""
-"has a collection of <literal>Child</literal> instances. If each child has at "
-"most one parent, the most natural mapping is a one-to-many association:"
+"If each child has, at most, one parent, the most natural mapping is a one-to-"
+"many association:"
 msgstr ""
 "这个类有一个<literal>Child</literal>的实例集合。如果每一个子实例至多有一个父"
 "实例, 那么最自然的映射是一个one-to-many的关联关系:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:870
+#: collection_mapping.xml:879
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1535,13 +1552,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:872
+#: collection_mapping.xml:881
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "在以下的表定义中反应了这个映射关系:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:876
+#: collection_mapping.xml:885
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1551,7 +1568,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:878
+#: collection_mapping.xml:887
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1561,7 +1578,7 @@
 "了:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:883
+#: collection_mapping.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1589,13 +1606,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:885
+#: collection_mapping.xml:894
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "请注意<literal>NOT NULL</literal>的约束:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:889
+#: collection_mapping.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1607,18 +1624,18 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:891
-#, no-c-format
+#: collection_mapping.xml:900
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, if you absolutely insist that this association should be "
-"unidirectional, you can declare the <literal>NOT NULL</literal> constraint "
-"on the <literal>&lt;key&gt;</literal> mapping:"
+"Alternatively, if this association must be unidirectional you can declare "
+"the <literal>NOT NULL</literal> constraint on the <literal>&lt;key&gt;</"
+"literal> mapping:"
 msgstr ""
 "另外,如果你绝对坚持这个关联应该是单向的,你可以对<literal>&lt;key&gt;</"
 "literal>映射声明<literal>NOT NULL</literal>约束:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:897
+#: collection_mapping.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1644,16 +1661,16 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:899
-#, no-c-format
+#: collection_mapping.xml:908
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if a child might have multiple parents, a many-to-many "
+"On the other hand, if a child has multiple parents, a many-to-many "
 "association is appropriate:"
 msgstr ""
 "另外一方面,如果一个子实例可能有多个父实例, 那么就应该使用many-to-many关联:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:904
+#: collection_mapping.xml:913
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1679,13 +1696,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:906
+#: collection_mapping.xml:915
 #, no-c-format
 msgid "Table definitions:"
 msgstr "表定义:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:910
+#: collection_mapping.xml:919
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1700,24 +1717,35 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:912
-#, no-c-format
+#: collection_mapping.xml:921
+#, fuzzy, no-c-format
 msgid ""
-"For more examples and a complete walk-through a parent/child relationship "
-"mapping, see <xref linkend=\"example-parentchild\"/>."
+"For more examples and a complete explanation of a parent/child relationship "
+"mapping, see <xref linkend=\"example-parentchild\"/> for more information."
 msgstr ""
 "更多的例子,以及一个完整的父/子关系映射的排练,请参阅<xref linkend=\"example-"
 "parentchild\"/>."
 
 #. Tag: para
-#: collection_mapping.xml:917
-#, no-c-format
-msgid ""
-"Even more exotic association mappings are possible, we will catalog all "
-"possibilities in the next chapter."
+#: collection_mapping.xml:926
+#, fuzzy, no-c-format
+msgid "Even more complex association mappings are covered in the next chapter."
 msgstr "甚至可能出现更加复杂的关联映射,我们会在下一章中列出所有可能性。"
 
+#~ msgid "Collection Mapping"
+#~ msgstr "集合类(Collections)映射"
+
+#~ msgid "Some examples, first, a set of strings:"
+#~ msgstr ""
+#~ "包含一组整数的bag(还设置了<literal>order-by</literal>参数指定了迭代的顺"
+#~ "序):"
+
 #~ msgid ""
+#~ "The previous sections are pretty confusing. So lets look at an example. "
+#~ "This class:"
+#~ msgstr "在前面的几个章节的确非常令人迷惑。 因此让我们来看一个例子。这个类:"
+
+#~ msgid ""
 #~ "<literal>column_name</literal> (required): The name of the column holding "
 #~ "the collection index values."
 #~ msgstr "<literal>column</literal>(可选):保存集合索引值的字段名。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,35 +11,35 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: component_mapping.xml:5
+#: component_mapping.xml:29
 #, no-c-format
 msgid "Component Mapping"
 msgstr "组件(Component)映射"
 
 #. Tag: para
-#: component_mapping.xml:7
-#, no-c-format
+#: component_mapping.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
-"different contexts, for different purposes, throughout Hibernate."
+"different contexts and purposes throughout Hibernate."
 msgstr ""
 "<emphasis>组件</emphasis>(Component)这个概念在Hibernate中几处不同的地方为了不"
 "同的目的被重复使用."
 
 #. Tag: title
-#: component_mapping.xml:13
+#: component_mapping.xml:37
 #, no-c-format
 msgid "Dependent objects"
 msgstr "依赖对象(Dependent objects)"
 
 #. Tag: para
-#: component_mapping.xml:15
-#, no-c-format
+#: component_mapping.xml:39
+#, fuzzy, no-c-format
 msgid ""
-"A component is a contained object that is persisted as a value type, not an "
-"entity reference. The term \"component\" refers to the object-oriented "
-"notion of composition (not to architecture-level components). For example, "
-"you might model a person like this:"
+"A component is a contained object that is persisted as a value type and not "
+"an entity reference. The term \"component\" refers to the object-oriented "
+"notion of composition and not to architecture-level components. For example, "
+"you can model a person like this:"
 msgstr ""
 "组件(Component)是一个被包含的对象,在持久化的过程中,它被当作值类型,而并非一"
 "个实体的引用。在这篇文档中,组件这一术语指的是面向对象的合成概念(而并不是系"
@@ -47,7 +47,7 @@
 "建模:"
 
 #. Tag: programlisting
-#: component_mapping.xml:21
+#: component_mapping.xml:45
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -78,7 +78,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:23
+#: component_mapping.xml:47
 #, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
@@ -107,26 +107,26 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:25
-#, no-c-format
+#: component_mapping.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"Now <literal>Name</literal> may be persisted as a component of "
-"<literal>Person</literal>. Notice that <literal>Name</literal> defines "
-"getter and setter methods for its persistent properties, but doesn't need to "
-"declare any interfaces or identifier properties."
+"Now <literal>Name</literal> can be persisted as a component of "
+"<literal>Person</literal>. <literal>Name</literal> defines getter and setter "
+"methods for its persistent properties, but it does not need to declare any "
+"interfaces or identifier properties."
 msgstr ""
 "在持久化的过程中,<literal>姓名(Name)</literal>可以作为<literal>人(Person)</"
 "literal>的一个组件。需要注意的是:你应该为<literal>姓名</literal>的持久化属性"
 "定义getter和setter方法,但是你不需要实现任何的接口或申明标识符字段。"
 
 #. Tag: para
-#: component_mapping.xml:32
-#, no-c-format
-msgid "Our Hibernate mapping would look like:"
+#: component_mapping.xml:56
+#, fuzzy, no-c-format
+msgid "Our Hibernate mapping would look like this:"
 msgstr "以下是这个例子的Hibernate映射文件:"
 
 #. Tag: programlisting
-#: component_mapping.xml:36
+#: component_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -144,7 +144,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:38
+#: component_mapping.xml:62
 #, no-c-format
 msgid ""
 "The person table would have the columns <literal>pid</literal>, "
@@ -156,16 +156,16 @@
 "literal>等字段。"
 
 #. Tag: para
-#: component_mapping.xml:46
-#, no-c-format
+#: component_mapping.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"Like all value types, components do not support shared references. In other "
+"Like value types, components do not support shared references. In other "
 "words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
-"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
-"reloading the containing object, Hibernate will assume that if all component "
-"columns are null, then the entire component is null. This should be okay for "
-"most purposes."
+"would contain two independent name objects that were only \"the same\" by "
+"value. The null value semantics of a component are <emphasis>ad hoc</"
+"emphasis>. When reloading the containing object, Hibernate will assume that "
+"if all component columns are null, then the entire component is null. This "
+"is suitable for most purposes."
 msgstr ""
 "就像所有的值类型一样, 组件不支持共享引用。 换句话说,两个人可能重名,但是两个"
 "Person对象应该包含两个独立的Name对象,只不过这两个Name对象具有“同样”的值。 组"
@@ -174,13 +174,13 @@
 "没有问题的。"
 
 #. Tag: para
-#: component_mapping.xml:55
-#, no-c-format
+#: component_mapping.xml:78
+#, fuzzy, no-c-format
 msgid ""
-"The properties of a component may be of any Hibernate type (collections, "
+"The properties of a component can be of any Hibernate type (collections, "
 "many-to-one associations, other components, etc). Nested components should "
 "<emphasis>not</emphasis> be considered an exotic usage. Hibernate is "
-"intended to support a very fine-grained object model."
+"intended to support a fine-grained object model."
 msgstr ""
 "组件的属性可以是任意一种Hibernate类型(包括集合, 多对多关联, 以及其它组件等"
 "等)。嵌套组件不应该被当作一种特殊的应用(Nested components should not be "
@@ -188,7 +188,7 @@
 "型。"
 
 #. Tag: para
-#: component_mapping.xml:62
+#: component_mapping.xml:85
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -199,7 +199,7 @@
 "literal>子元素,用来表明component类中的一个属性是指向包含它的实体的引用。"
 
 #. Tag: programlisting
-#: component_mapping.xml:68
+#: component_mapping.xml:91
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -218,26 +218,26 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:73
+#: component_mapping.xml:96
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "在集合中出现的依赖对象 (Collections of dependent objects)"
 
 #. Tag: para
-#: component_mapping.xml:75
-#, no-c-format
+#: component_mapping.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"Collections of components are supported (eg. an array of type <literal>Name</"
-"literal>). Declare your component collection by replacing the <literal>&lt;"
-"element&gt;</literal> tag with a <literal>&lt;composite-element&gt;</"
-"literal> tag."
+"Collections of components are supported (e.g. an array of type "
+"<literal>Name</literal>). Declare your component collection by replacing the "
+"<literal>&lt;element&gt;</literal> tag with a <literal>&lt;composite-"
+"element&gt;</literal> tag:"
 msgstr ""
 "Hibernate支持组件的集合(例如: 一个元素是姓名(Name)这种类型的数组)。 你可以使"
 "用<literal>&lt;composite-element&gt;</literal>标签替代<literal>&lt;"
 "element&gt;</literal>标签来定义你的组件集合。"
 
 #. Tag: programlisting
-#: component_mapping.xml:82
+#: component_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -251,28 +251,27 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:84
-#, no-c-format
+#: component_mapping.xml:108
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you define a <literal>Set</literal> of composite elements, it is "
-"very important to implement <literal>equals()</literal> and <literal>hashCode"
-"()</literal> correctly."
+"If you define a <literal>Set</literal> of composite elements, it is "
+"important to implement <literal>equals()</literal> and <literal>hashCode()</"
+"literal> correctly."
 msgstr ""
 "注意,如果你定义的Set包含组合元素(composite-element),正确地实现"
 "<literal>equals()</literal>和<literal>hashCode()</literal>是非常重要的。"
 
 #. Tag: para
-#: component_mapping.xml:90
-#, no-c-format
+#: component_mapping.xml:115
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may contain components but not collections. If your "
-"composite element itself contains components, use the <literal>&lt;nested-"
-"composite-element&gt;</literal> tag. This is a pretty exotic case - a "
-"collection of components which themselves have components. By this stage you "
-"should be asking yourself if a one-to-many association is more appropriate. "
-"Try remodelling the composite element as an entity - but note that even "
-"though the Java model is the same, the relational model and persistence "
-"semantics are still slightly different."
+"Composite elements can contain components but not collections. If your "
+"composite element contains components, use the <literal>&lt;nested-composite-"
+"element&gt;</literal> tag. This case is a collection of components which "
+"themselves have components. You may want to consider if a one-to-many "
+"association is more appropriate. Remodel the composite element as an entity, "
+"but be aware that even though the Java model is the same, the relational "
+"model and persistence semantics are still slightly different."
 msgstr ""
 "组合元素可以包含组件,但是不能包含集合。如果你的组合元素自身包含组件, 你必须"
 "使用<literal>&lt;nested-composite-element&gt;</literal>标签。这是一个相当特殊"
@@ -282,17 +281,16 @@
 "义会有细微的变化。"
 
 #. Tag: para
-#: component_mapping.xml:102
-#, no-c-format
+#: component_mapping.xml:127
+#, fuzzy, no-c-format
 msgid ""
-"Please note that a composite element mapping doesn't support null-able "
-"properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate has "
-"to use each columns value to identify a record when deleting objects (there "
-"is no separate primary key column in the composite element table), which is "
-"not possible with null values. You have to either use only not-null "
-"properties in a composite-element or choose a <literal>&lt;list&gt;</"
-"literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or "
-"<literal>&lt;idbag&gt;</literal>."
+"A composite element mapping does not support null-able properties if you are "
+"using a <literal>&lt;set&gt;</literal>. There is no separate primary key "
+"column in the composite element table. Hibernate uses each column's value to "
+"identify a record when deleting objects, which is not possible with null "
+"values. You have to either use only not-null properties in a composite-"
+"element or choose a <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</"
+"literal>, <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>."
 msgstr ""
 "请注意如果你使用<literal>&lt;set&gt;</literal>标签,一个组合元素的映射不支持可"
 "能为空的属性. 当删除对象时, Hibernate必须使用每一个字段的值来确定一条记录(在"
@@ -303,14 +301,14 @@
 "set&gt;</literal>。"
 
 #. Tag: para
-#: component_mapping.xml:113
-#, no-c-format
+#: component_mapping.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
-"<literal>&lt;many-to-one&gt;</literal> element. A mapping like this allows "
-"you to map extra columns of a many-to-many association table to the "
-"composite element class. The following is a many-to-many association from "
-"<literal>Order</literal> to <literal>Item</literal> where "
+"<literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to "
+"map extra columns of a many-to-many association table to the composite "
+"element class. The following is a many-to-many association from "
+"<literal>Order</literal> to <literal>Item</literal>, where "
 "<literal>purchaseDate</literal>, <literal>price</literal> and "
 "<literal>quantity</literal> are properties of the association:"
 msgstr ""
@@ -323,7 +321,7 @@
 "<literal>quantity</literal> 。"
 
 #. Tag: programlisting
-#: component_mapping.xml:123
+#: component_mapping.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -342,14 +340,14 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:125
-#, no-c-format
+#: component_mapping.xml:150
+#, fuzzy, no-c-format
 msgid ""
-"Of course, there can't be a reference to the purchae on the other side, for "
-"bidirectional association navigation. Remember that components are value "
-"types and don't allow shared references. A single <literal>Purchase</"
-"literal> can be in the set of an <literal>Order</literal>, but it can't be "
-"referenced by the <literal>Item</literal> at the same time."
+"There cannot be a reference to the purchase on the other side for "
+"bidirectional association navigation. Components are value types and do not "
+"allow shared references. A single <literal>Purchase</literal> can be in the "
+"set of an <literal>Order</literal>, but it cannot be referenced by the "
+"<literal>Item</literal> at the same time."
 msgstr ""
 "当然,当你定义Item时,你无法引用这些purchase,因此你无法实现双向关联查询。记"
 "住组件是值类型,并且不允许共享引用。某一个特定的<literal>Purchase</literal> "
@@ -357,13 +355,13 @@
 "literal>所引用。"
 
 #. Tag: para
-#: component_mapping.xml:133
+#: component_mapping.xml:158
 #, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr "其实组合元素的这个用法可以扩展到三重或多重关联:"
 
 #. Tag: programlisting
-#: component_mapping.xml:135
+#: component_mapping.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -379,25 +377,25 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
-#, no-c-format
+#: component_mapping.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"Composite elements may appear in queries using the same syntax as "
+"Composite elements can appear in queries using the same syntax as "
 "associations to other entities."
 msgstr "在查询中,表达组合元素的语法和关联到其他实体的语法是一样的。"
 
 #. Tag: title
-#: component_mapping.xml:145
+#: component_mapping.xml:170
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "组件作为Map的索引(Components as Map indices )"
 
 #. Tag: para
-#: component_mapping.xml:147
-#, no-c-format
+#: component_mapping.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
-"component class as the key of a <literal>Map</literal>. Make sure you "
+"The <literal>&lt;composite-map-key&gt;</literal> element allows you to map a "
+"component class as the key of a <literal>Map</literal>. Ensure that you "
 "override <literal>hashCode()</literal> and <literal>equals()</literal> "
 "correctly on the component class."
 msgstr ""
@@ -406,61 +404,67 @@
 "<literal>hashCode()</literal> 和 <literal>equals()</literal>方法。"
 
 #. Tag: title
-#: component_mapping.xml:156
+#: component_mapping.xml:181
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr "组件作为联合标识符(Components as composite identifiers)"
 
 #. Tag: para
-#: component_mapping.xml:158
-#, no-c-format
+#: component_mapping.xml:183
+#, fuzzy, no-c-format
 msgid ""
-"You may use a component as an identifier of an entity class. Your component "
+"You can use a component as an identifier of an entity class. Your component "
 "class must satisfy certain requirements:"
 msgstr ""
 "你可以使用一个组件作为一个实体类的标识符。 你的组件类必须满足以下要求:"
 
 #. Tag: para
-#: component_mapping.xml:165
+#: component_mapping.xml:190
 #, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr "它必须实现<literal>java.io.Serializable</literal>接口"
 
 #. Tag: para
-#: component_mapping.xml:170
-#, no-c-format
+#: component_mapping.xml:195
+#, fuzzy, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
-"literal>, consistently with the database's notion of composite key equality."
+"literal> consistently with the database's notion of composite key equality."
 msgstr ""
 "它必须重新实现<literal>equals()</literal>和<literal>hashCode()</literal>方"
 "法, 始终和组合关键字在数据库中的概念保持一致"
 
-#. Tag: emphasis
-#: component_mapping.xml:179
+#. Tag: title
+#: component_mapping.xml:204
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:205
+#, fuzzy, no-c-format
 msgid ""
-"Note: in Hibernate3, the second requirement is not an absolutely hard "
-"requirement of Hibernate. But do it anyway."
+"In Hibernate3, although the second requirement is not an absolutely hard "
+"requirement of Hibernate, it is recommended."
 msgstr ""
 "注意:在Hibernate3中,第二个要求并非是Hibernate强制必须的。但最好这样做。"
 
 #. Tag: para
-#: component_mapping.xml:183
-#, no-c-format
+#: component_mapping.xml:211
+#, fuzzy, no-c-format
 msgid ""
-"You can't use an <literal>IdentifierGenerator</literal> to generate "
+"You cannot use an <literal>IdentifierGenerator</literal> to generate "
 "composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 "你不能使用一个<literal>IdentifierGenerator</literal>产生组合关键字。一个应用"
 "程序必须分配它自己的标识符。"
 
 #. Tag: para
-#: component_mapping.xml:188
-#, no-c-format
+#: component_mapping.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
-"<literal>&lt;key-property&gt;</literal> elements) in place of the usual "
+"Use the <literal>&lt;composite-id&gt;</literal> tag, with nested "
+"<literal>&lt;key-property&gt;</literal> elements, in place of the usual "
 "<literal>&lt;id&gt;</literal> declaration. For example, the "
 "<literal>OrderLine</literal> class has a primary key that depends upon the "
 "(composite) primary key of <literal>Order</literal>."
@@ -471,43 +475,43 @@
 "literal>的(联合)主键。"
 
 #. Tag: programlisting
-#: component_mapping.xml:196
+#: component_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
-"    \n"
+"\n"
 "    <composite-id name=\"id\" class=\"OrderLineId\">\n"
 "        <key-property name=\"lineId\"/>\n"
 "        <key-property name=\"orderId\"/>\n"
 "        <key-property name=\"customerId\"/>\n"
 "    </composite-id>\n"
-"    \n"
+"\n"
 "    <property name=\"name\"/>\n"
-"    \n"
+"\n"
 "    <many-to-one name=\"order\" class=\"Order\"\n"
 "            insert=\"false\" update=\"false\">\n"
 "        <column name=\"orderId\"/>\n"
 "        <column name=\"customerId\"/>\n"
 "    </many-to-one>\n"
 "    ....\n"
-"    \n"
+"\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:198
-#, no-c-format
+#: component_mapping.xml:226
+#, fuzzy, no-c-format
 msgid ""
-"Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
-"also composite. You must declare this in your mappings for other classes. An "
-"association to <literal>OrderLine</literal> would be mapped like this:"
+"Any foreign keys referencing the <literal>OrderLine</literal> table are now "
+"composite. Declare this in your mappings for other classes. An association "
+"to <literal>OrderLine</literal> is mapped like this:"
 msgstr ""
 "现在,任何指向<literal>OrderLine</literal>的外键都是复合的。在你的映射文件"
 "中,必须为其他类也这样声明。例如,一个指向<literal>OrderLine</literal>的关联"
 "可能被这样映射:"
 
 #. Tag: programlisting
-#: component_mapping.xml:204
+#: component_mapping.xml:232
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -519,17 +523,17 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:206
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
-"(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
-"the <literal>column</literal> attribute everywhere.)"
+"The <literal>column</literal> element is an alternative to the "
+"<literal>column</literal> attribute everywhere. Using the <literal>column</"
+"literal> element just gives more declaration options, which are mostly "
+"useful when utilizing <literal>hbm2ddl</literal>"
 msgstr ""
-"(注意在各个地方<literal>&lt;column&gt;</literal>标签都是<literal>column</"
-"literal>属性的替代写法。)"
 
 #. Tag: para
-#: component_mapping.xml:211
+#: component_mapping.xml:244
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -539,7 +543,7 @@
 "键:"
 
 #. Tag: programlisting
-#: component_mapping.xml:216
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -553,7 +557,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:218
+#: component_mapping.xml:251
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -562,7 +566,7 @@
 "在<literal>Order</literal>中,<literal>OrderLine</literal>的集合则是这样:"
 
 #. Tag: programlisting
-#: component_mapping.xml:223
+#: component_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -575,15 +579,13 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:225
-#, no-c-format
-msgid ""
-"(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
-"columns.)"
+#: component_mapping.xml:258
+#, fuzzy, no-c-format
+msgid "The <literal>&lt;one-to-many&gt;</literal> element declares no columns."
 msgstr "(与通常一样,<literal>&lt;one-to-many&gt;</literal>元素不声明任何列.)"
 
 #. Tag: para
-#: component_mapping.xml:229
+#: component_mapping.xml:262
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -591,7 +593,7 @@
 msgstr "假若<literal>OrderLine</literal>本身拥有一个集合,它也具有组合外键。"
 
 #. Tag: programlisting
-#: component_mapping.xml:234
+#: component_mapping.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -612,19 +614,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:239
+#: component_mapping.xml:272
 #, no-c-format
 msgid "Dynamic components"
 msgstr "动态组件 (Dynamic components)"
 
 #. Tag: para
-#: component_mapping.xml:241
-#, no-c-format
-msgid "You may even map a property of type <literal>Map</literal>:"
+#: component_mapping.xml:274
+#, fuzzy, no-c-format
+msgid "You can also map a property of type <literal>Map</literal>:"
 msgstr "你甚至可以映射<literal>Map</literal>类型的属性:"
 
 #. Tag: programlisting
-#: component_mapping.xml:245
+#: component_mapping.xml:278
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -635,19 +637,26 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:247
-#, no-c-format
+#: component_mapping.xml:280
+#, fuzzy, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "
 "identical to <literal>&lt;component&gt;</literal>. The advantage of this "
 "kind of mapping is the ability to determine the actual properties of the "
-"bean at deployment time, just by editing the mapping document. Runtime "
+"bean at deployment time just by editing the mapping document. Runtime "
 "manipulation of the mapping document is also possible, using a DOM parser. "
-"Even better, you can access (and change) Hibernate's configuration-time "
-"metamodel via the <literal>Configuration</literal> object."
+"You can also access, and change, Hibernate's configuration-time metamodel "
+"via the <literal>Configuration</literal> object."
 msgstr ""
 "从<literal>&lt;dynamic-component&gt;</literal>映射的语义上来讲,它和"
 "<literal>&lt;component&gt;</literal>是相同的。 这种映射类型的优点在于通过修改"
 "映射文件,就可以具有在部署时检测真实属性的能力。利用一个DOM解析器,也可以在程"
 "序运行时操作映射文件。 更好的是,你可以通过<literal>Configuration</literal>对"
 "象来访问(或者修改)Hibernate的运行时元模型。"
+
+#~ msgid ""
+#~ "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
+#~ "the <literal>column</literal> attribute everywhere.)"
+#~ msgstr ""
+#~ "(注意在各个地方<literal>&lt;column&gt;</literal>标签都是<literal>column</"
+#~ "literal>属性的替代写法。)"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/configuration.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/configuration.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/configuration.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,21 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: configuration.xml:5
+#: configuration.xml:29
 #, no-c-format
 msgid "Configuration"
 msgstr "配置"
 
 #. Tag: para
-#: configuration.xml:7
-#, no-c-format
+#: configuration.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"Because Hibernate is designed to operate in many different environments, "
-"there are a large number of configuration parameters. Fortunately, most have "
-"sensible default values and Hibernate is distributed with an example "
+"Hibernate is designed to operate in many different environments and, as "
+"such, there is a broad range of configuration parameters. Fortunately, most "
+"have sensible default values and Hibernate is distributed with an example "
 "<literal>hibernate.properties</literal> file in <literal>etc/</literal> that "
-"shows the various options. Just put the example file in your classpath and "
-"customize it."
+"displays the various options. Simply put the example file in your classpath "
+"and customize it to suit your needs."
 msgstr ""
 "由于Hibernate是为了能在各种不同环境下工作而设计的, 因此存在着大量的配置参数. "
 "幸运的是多数配置参数都 有比较直观的默认值, 并有随Hibernate一同分发的配置样例"
@@ -34,20 +34,20 @@
 "定义的修改."
 
 #. Tag: title
-#: configuration.xml:16
+#: configuration.xml:40
 #, no-c-format
 msgid "Programmatic configuration"
 msgstr "可编程的配置方式"
 
 #. Tag: para
-#: configuration.xml:18
-#, no-c-format
+#: configuration.xml:42
+#, fuzzy, no-c-format
 msgid ""
-"An instance of <literal>org.hibernate.cfg.Configuration</literal> represents "
-"an entire set of mappings of an application's Java types to an SQL database. "
-"The <literal>Configuration</literal> is used to build an (immutable) "
-"<literal>SessionFactory</literal>. The mappings are compiled from various "
-"XML mapping files."
+"An instance of <classname>org.hibernate.cfg.Configuration</classname> "
+"represents an entire set of mappings of an application's Java types to an "
+"SQL database. The <classname>org.hibernate.cfg.Configuration</classname> is "
+"used to build an immutable <interfacename>org.hibernate.SessionFactory</"
+"interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 "一个<literal>org.hibernate.cfg.Configuration</literal>实例代表了一个应用程序"
 "中Java类型 到SQL数据库映射的完整集合. <literal>Configuration</literal>被用来"
@@ -55,19 +55,20 @@
 "不同的XML映射定义文件编译而来."
 
 #. Tag: para
-#: configuration.xml:26
-#, no-c-format
+#: configuration.xml:49
+#, fuzzy, no-c-format
 msgid ""
-"You may obtain a <literal>Configuration</literal> instance by instantiating "
-"it directly and specifying XML mapping documents. If the mapping files are "
-"in the classpath, use <literal>addResource()</literal>:"
+"You can obtain a <classname>org.hibernate.cfg.Configuration</classname> "
+"instance by instantiating it directly and specifying XML mapping documents. "
+"If the mapping files are in the classpath, use <literal>addResource()</"
+"literal>. For example:"
 msgstr ""
 "你可以直接实例化<literal>Configuration</literal>来获取一个实例,并为它指定XML"
 "映射定义 文件. 如果映射定 义文件在类路径(classpath)中, 请使用"
 "<literal>addResource()</literal>:"
 
 #. Tag: programlisting
-#: configuration.xml:32
+#: configuration.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -76,17 +77,17 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:34
-#, no-c-format
+#: configuration.xml:57
+#, fuzzy, no-c-format
 msgid ""
-"An alternative (sometimes better) way is to specify the mapped class, and "
-"let Hibernate find the mapping document for you:"
+"An alternative way is to specify the mapped class and allow Hibernate to "
+"find the mapping document for you:"
 msgstr ""
 "一个替代方法(有时是更好的选择)是,指定被映射的类,让Hibernate帮你寻找映射定"
 "义文件:"
 
 #. Tag: programlisting
-#: configuration.xml:39
+#: configuration.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -95,12 +96,12 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:41
-#, no-c-format
+#: configuration.xml:64
+#, fuzzy, no-c-format
 msgid ""
-"Then Hibernate will look for mapping files named <literal>/org/hibernate/"
-"auction/Item.hbm.xml</literal> and <literal>/org/hibernate/auction/Bid.hbm."
-"xml</literal> in the classpath. This approach eliminates any hardcoded "
+"Hibernate will then search for mapping files named <filename>/org/hibernate/"
+"auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction/Bid.hbm."
+"xml</filename> in the classpath. This approach eliminates any hardcoded "
 "filenames."
 msgstr ""
 "Hibernate将会在类路径(classpath)中寻找名字为 <literal>/org/hibernate/auction/"
@@ -108,15 +109,15 @@
 "literal>映射定义文件. 这种方式消除了任何对文件名的硬编码(hardcoded)."
 
 #. Tag: para
-#: configuration.xml:48
-#, no-c-format
+#: configuration.xml:70
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Configuration</literal> also allows you to specify configuration "
-"properties:"
+"A <classname>org.hibernate.cfg.Configuration</classname> also allows you to "
+"specify configuration properties. For example:"
 msgstr "<literal>Configuration</literal>也允许你指定配置属性:"
 
 #. Tag: programlisting
-#: configuration.xml:53
+#: configuration.xml:75
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -130,35 +131,35 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:55
-#, no-c-format
+#: configuration.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"This is not the only way to pass configuration properties to Hibernate. The "
-"various options include:"
+"This is not the only way to pass configuration properties to Hibernate. Some "
+"alternative options include:"
 msgstr "当然这不是唯一的传递Hibernate配置属性的方式, 其他可选方式还包括:"
 
 #. Tag: para
-#: configuration.xml:62
-#, no-c-format
+#: configuration.xml:84
+#, fuzzy, no-c-format
 msgid ""
-"Pass an instance of <literal>java.util.Properties</literal> to "
+"Pass an instance of <classname>java.util.Properties</classname> to "
 "<literal>Configuration.setProperties()</literal>."
 msgstr ""
 "传一个<literal>java.util.Properties</literal>实例给 <literal>Configuration."
 "setProperties()</literal>."
 
 #. Tag: para
-#: configuration.xml:68
-#, no-c-format
+#: configuration.xml:90
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>hibernate.properties</literal> in a root directory of the "
-"classpath."
+"Place a file named <filename>hibernate.properties</filename> in a root "
+"directory of the classpath."
 msgstr ""
 "将<literal>hibernate.properties</literal>放置在类路径(classpath)的根目录下 "
 "(root directory)."
 
 #. Tag: para
-#: configuration.xml:74
+#: configuration.xml:95
 #, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
@@ -168,219 +169,221 @@
 "literal>)属性."
 
 #. Tag: para
-#: configuration.xml:80
-#, no-c-format
+#: configuration.xml:100
+#, fuzzy, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
-"cfg.xml</literal> (discussed later)."
+"cfg.xml</literal> (this is discussed later)."
 msgstr ""
 "在<literal>hibernate.cfg.xml</literal>中加入元素 <literal>&lt;property&gt;</"
 "literal> (稍后讨论)."
 
 #. Tag: para
-#: configuration.xml:87
+#: configuration.xml:107
 #, no-c-format
 msgid ""
-"<literal>hibernate.properties</literal> is the easiest approach if you want "
-"to get started quickly."
+"If you want to get started quickly<filename>hibernate.properties</filename> "
+"is the easiest approach."
 msgstr ""
-"如果想尽快体验Hibernate, <literal>hibernate.properties</literal>是最简单的方"
-"式."
 
 #. Tag: para
-#: configuration.xml:92
-#, no-c-format
+#: configuration.xml:111
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Configuration</literal> is intended as a startup-time object, "
-"to be discarded once a <literal>SessionFactory</literal> is created."
+"The <classname>org.hibernate.cfg.Configuration</classname> is intended as a "
+"startup-time object that will be discarded once a <literal>SessionFactory</"
+"literal> is created."
 msgstr ""
 "<literal>Configuration</literal>实例被设计成启动期间(startup-time)对象, 一"
 "旦<literal>SessionFactory</literal>创建完成它就被丢弃了."
 
 #. Tag: title
-#: configuration.xml:100
+#: configuration.xml:119
 #, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "获得SessionFactory"
 
 #. Tag: para
-#: configuration.xml:102
-#, no-c-format
+#: configuration.xml:121
+#, fuzzy, no-c-format
 msgid ""
-"When all mappings have been parsed by the <literal>Configuration</literal>, "
-"the application must obtain a factory for <literal>Session</literal> "
-"instances. This factory is intended to be shared by all application threads:"
+"When all mappings have been parsed by the <classname>org.hibernate.cfg."
+"Configuration</classname>, the application must obtain a factory for "
+"<interfacename>org.hibernate.Session</interfacename> instances. This factory "
+"is intended to be shared by all application threads:"
 msgstr ""
 "当所有映射定义被<literal>Configuration</literal>解析后, 应用程序必须获得一个"
 "用于构造<literal>Session</literal>实例的工厂. 这个工厂将被应用程序的所有线程"
 "共享:"
 
 #. Tag: programlisting
-#: configuration.xml:108
+#: configuration.xml:127
 #, no-c-format
 msgid "<![CDATA[SessionFactory sessions = cfg.buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:110
-#, no-c-format
+#: configuration.xml:129
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does allow your application to instantiate more than one "
-"<literal>SessionFactory</literal>. This is useful if you are using more than "
-"one database."
+"<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful "
+"if you are using more than one database."
 msgstr ""
 "Hibernate允许你的应用程序创建多个<literal>SessionFactory</literal>实例. 这对 "
 "使用多个数据库的应用来说很有用."
 
 #. Tag: title
-#: configuration.xml:119
+#: configuration.xml:138
 #, no-c-format
 msgid "JDBC connections"
 msgstr "JDBC连接"
 
 #. Tag: para
-#: configuration.xml:121
-#, no-c-format
+#: configuration.xml:140
+#, fuzzy, no-c-format
 msgid ""
-"Usually, you want to have the <literal>SessionFactory</literal> create and "
-"pool JDBC connections for you. If you take this approach, opening a "
-"<literal>Session</literal> is as simple as:"
+"It is advisable to have the <interfacename>org.hibernate.SessionFactory</"
+"interfacename> create and pool JDBC connections for you. If you take this "
+"approach, opening a <interfacename>org.hibernate.Session</interfacename> is "
+"as simple as:"
 msgstr ""
 "通常你希望<literal>SessionFactory</literal>来为你创建和缓存(pool)JDBC连接. 如"
 "果你采用这种方式, 只需要如下例所示那样,打开一个<literal>Session</literal>:"
 
 #. Tag: programlisting
-#: configuration.xml:127
+#: configuration.xml:146
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessions.openSession(); // open a new Session]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:129
-#, no-c-format
+#: configuration.xml:148
+#, fuzzy, no-c-format
 msgid ""
-"As soon as you do something that requires access to the database, a JDBC "
+"Once you start a task that requires access to the database, a JDBC "
 "connection will be obtained from the pool."
 msgstr ""
 "一旦你需要进行数据访问时, 就会从连接池(connection pool)获得一个JDBC连接."
 
 #. Tag: para
-#: configuration.xml:134
-#, no-c-format
+#: configuration.xml:153
+#, fuzzy, no-c-format
 msgid ""
-"For this to work, we need to pass some JDBC connection properties to "
-"Hibernate. All Hibernate property names and semantics are defined on the "
-"class <literal>org.hibernate.cfg.Environment</literal>. We will now describe "
-"the most important settings for JDBC connection configuration."
+"Before you can do this, you first need to pass some JDBC connection "
+"properties to Hibernate. All Hibernate property names and semantics are "
+"defined on the class <classname>org.hibernate.cfg.Environment</classname>. "
+"The most important settings for JDBC connection configuration are outlined "
+"below."
 msgstr ""
 "为了使这种方式工作起来, 我们需要向Hibernate传递一些JDBC连接的属性. 所有"
 "Hibernate属性的名字和语义都在<literal>org.hibernate.cfg.Environment</literal>"
 "中定义. 我们现在将描述JDBC连接配置中最重要的设置."
 
 #. Tag: para
-#: configuration.xml:141
-#, no-c-format
+#: configuration.xml:159
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will obtain (and pool) connections using <literal>java.sql."
-"DriverManager</literal> if you set the following properties:"
+"Hibernate will obtain and pool connections using <classname>java.sql."
+"DriverManager</classname> if you set the following properties:"
 msgstr ""
 "如果你设置如下属性,Hibernate将使用<literal>java.sql.DriverManager</literal>"
 "来获得(和缓存)JDBC连接 :"
 
 #. Tag: title
-#: configuration.xml:147
+#: configuration.xml:165
 #, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Hibernate JDBC属性"
 
 #. Tag: entry
-#: configuration.xml:153 configuration.xml:241 configuration.xml:338
-#: configuration.xml:529 configuration.xml:725 configuration.xml:832
-#: configuration.xml:920
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353
+#: configuration.xml:548 configuration.xml:743 configuration.xml:850
+#: configuration.xml:938
 #, no-c-format
 msgid "Property name"
 msgstr "属性名"
 
 #. Tag: entry
-#: configuration.xml:154 configuration.xml:242 configuration.xml:339
-#: configuration.xml:530 configuration.xml:726 configuration.xml:833
-#: configuration.xml:921
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354
+#: configuration.xml:549 configuration.xml:744 configuration.xml:851
+#: configuration.xml:939
 #, no-c-format
 msgid "Purpose"
 msgstr "用途"
 
-#. Tag: literal
-#: configuration.xml:160
+#. Tag: property
+#: configuration.xml:178
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: emphasis
-#: configuration.xml:163
+#: configuration.xml:181
 #, no-c-format
 msgid "JDBC driver class"
 msgstr "jdbc驱动类"
 
-#. Tag: literal
-#: configuration.xml:168
+#. Tag: property
+#: configuration.xml:186
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: emphasis
-#: configuration.xml:171
+#: configuration.xml:189
 #, no-c-format
 msgid "JDBC URL"
 msgstr "jdbc URL"
 
-#. Tag: literal
-#: configuration.xml:176 configuration.xml:272
+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: emphasis
-#: configuration.xml:179
+#: configuration.xml:197
 #, no-c-format
 msgid "database user"
 msgstr "数据库用户"
 
-#. Tag: literal
-#: configuration.xml:184 configuration.xml:280
+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: emphasis
-#: configuration.xml:187
+#: configuration.xml:205
 #, no-c-format
 msgid "database user password"
 msgstr "数据库用户密码"
 
-#. Tag: literal
-#: configuration.xml:192
+#. Tag: property
+#: configuration.xml:210
 #, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr "hibernate.connection.pool_size"
 
 #. Tag: emphasis
-#: configuration.xml:195
+#: configuration.xml:213
 #, no-c-format
 msgid "maximum number of pooled connections"
 msgstr "连接池容量上限数目"
 
 #. Tag: para
-#: configuration.xml:202
-#, no-c-format
+#: configuration.xml:220
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate's own connection pooling algorithm is however quite rudimentary. "
+"Hibernate's own connection pooling algorithm is, however, quite rudimentary. "
 "It is intended to help you get started and is <emphasis>not intended for use "
-"in a production system</emphasis> or even for performance testing. You "
+"in a production system</emphasis>, or even for performance testing. You "
 "should use a third party pool for best performance and stability. Just "
-"replace the <literal>hibernate.connection.pool_size</literal> property with "
-"connection pool specific settings. This will turn off Hibernate's internal "
-"pool. For example, you might like to use C3P0."
+"replace the <property>hibernate.connection.pool_size</property> property "
+"with connection pool specific settings. This will turn off Hibernate's "
+"internal pool. For example, you might like to use c3p0."
 msgstr ""
 "但Hibernate自带的连接池算法相当不成熟. 它只是为了让你快些上手<emphasis>,并不"
 "适合用于产品系统</emphasis>或性能测试中。 出于最佳性能和稳定性考虑你应该使用"
@@ -389,15 +392,16 @@
 "C3P0."
 
 #. Tag: para
-#: configuration.xml:212
-#, no-c-format
+#: configuration.xml:230
+#, fuzzy, no-c-format
 msgid ""
 "C3P0 is an open source JDBC connection pool distributed along with Hibernate "
-"in the <literal>lib</literal> directory. Hibernate will use its "
-"<literal>C3P0ConnectionProvider</literal> for connection pooling if you set "
-"<literal>hibernate.c3p0.*</literal> properties. If you'd like to use Proxool "
-"refer to the packaged <literal>hibernate.properties</literal> and the "
-"Hibernate web site for more information."
+"in the <filename>lib</filename> directory. Hibernate will use its "
+"<classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for "
+"connection pooling if you set <property>hibernate.c3p0.*</property> "
+"properties. If you would like to use Proxool, refer to the packaged "
+"<filename>hibernate.properties</filename> and the Hibernate web site for "
+"more information."
 msgstr ""
 "C3P0是一个随Hibernate一同分发的开源的JDBC连接池, 它位于<literal>lib</literal>"
 "目录下。 如果你设置了<literal>hibernate.c3p0.*</literal>相关的属性, Hibernate"
@@ -406,14 +410,15 @@
 "Hibernate网站获取更多的信息."
 
 #. Tag: para
-#: configuration.xml:221
-#, no-c-format
+#: configuration.xml:238
+#, fuzzy, no-c-format
 msgid ""
-"Here is an example <literal>hibernate.properties</literal> file for C3P0:"
+"The following is an example <filename>hibernate.properties</filename> file "
+"for c3p0:"
 msgstr "这是一个使用C3P0的<literal>hibernate.properties</literal>样例文件:"
 
 #. Tag: programlisting
-#: configuration.xml:225
+#: configuration.xml:242
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
@@ -428,56 +433,56 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:227
-#, no-c-format
+#: configuration.xml:244
+#, fuzzy, no-c-format
 msgid ""
 "For use inside an application server, you should almost always configure "
 "Hibernate to obtain connections from an application server "
-"<literal>Datasource</literal> registered in JNDI. You'll need to set at "
-"least one of the following properties:"
+"<interfacename>javax.sql.Datasource</interfacename> registered in JNDI. You "
+"will need to set at least one of the following properties:"
 msgstr ""
 "为了能在应用程序服务器(application server)中使用Hibernate, 应当总是将"
 "Hibernate 配置成从注册在JNDI中的<literal>Datasource</literal>处获得连接,你至"
 "少需要设置下列属性中的一个:"
 
 #. Tag: title
-#: configuration.xml:235
+#: configuration.xml:251
 #, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Hibernate数据源属性"
 
-#. Tag: literal
-#: configuration.xml:248
+#. Tag: property
+#: configuration.xml:264
 #, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr "hibernate.connection.datasource"
 
 #. Tag: emphasis
-#: configuration.xml:251
+#: configuration.xml:267
 #, no-c-format
 msgid "datasource JNDI name"
 msgstr "数据源JNDI名字"
 
-#. Tag: literal
-#: configuration.xml:256
+#. Tag: property
+#: configuration.xml:272
 #, no-c-format
 msgid "hibernate.jndi.url"
 msgstr "hibernate.jndi.url"
 
 #. Tag: entry
-#: configuration.xml:258
+#: configuration.xml:274
 #, fuzzy, no-c-format
 msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr "JNDI提供者的URL"
 
-#. Tag: literal
-#: configuration.xml:264
+#. Tag: property
+#: configuration.xml:280
 #, no-c-format
 msgid "hibernate.jndi.class"
 msgstr "hibernate.jndi.class"
 
 #. Tag: entry
-#: configuration.xml:266
+#: configuration.xml:282
 #, no-c-format
 msgid ""
 "<emphasis>class of the JNDI <literal>InitialContextFactory</literal></"
@@ -485,29 +490,29 @@
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:274
+#: configuration.xml:290
 #, no-c-format
 msgid "<emphasis>database user</emphasis> (optional)"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:282
+#: configuration.xml:298
 #, no-c-format
 msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:290
-#, no-c-format
+#: configuration.xml:306
+#, fuzzy, no-c-format
 msgid ""
-"Here's an example <literal>hibernate.properties</literal> file for an "
+"Here is an example <filename>hibernate.properties</filename> file for an "
 "application server provided JNDI datasource:"
 msgstr ""
 "这是一个使用应用程序服务器提供的JNDI数据源的<literal>hibernate.properties</"
 "literal>样例文件:"
 
 #. Tag: programlisting
-#: configuration.xml:295
+#: configuration.xml:311
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
@@ -519,7 +524,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:297
+#: configuration.xml:313
 #, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
@@ -529,55 +534,56 @@
 "(container-managed transactions)中去."
 
 #. Tag: para
-#: configuration.xml:302
-#, no-c-format
+#: configuration.xml:318
+#, fuzzy, no-c-format
 msgid ""
-"Arbitrary connection properties may be given by prepending "
-"\"<literal>hibernate.connection</literal>\" to the property name. For "
-"example, you may specify a <literal>charSet</literal> using "
-"<literal>hibernate.connection.charSet</literal>."
+"Arbitrary connection properties can be given by prepending "
+"\"<literal>hibernate.connection</literal>\" to the connection property name. "
+"For example, you can specify a <property>charSet</property> connection "
+"property using <property>hibernate.connection.charSet</property>."
 msgstr ""
 "任何连接(connection)属性的属性名都要以\"<literal>hibernate.connnection</"
 "literal>\"开头. 例如, 你可能会使用<literal>hibernate.connection.charSet</"
 "literal>来指定字符集<literal>charSet</literal>."
 
 #. Tag: para
-#: configuration.xml:308
-#, no-c-format
+#: configuration.xml:324
+#, fuzzy, no-c-format
 msgid ""
-"You may define your own plugin strategy for obtaining JDBC connections by "
-"implementing the interface <literal>org.hibernate.connection."
-"ConnectionProvider</literal>. You may select a custom implementation by "
-"setting <literal>hibernate.connection.provider_class</literal>."
+"You can define your own plugin strategy for obtaining JDBC connections by "
+"implementing the interface <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>, and specifying your custom "
+"implementation via the <property>hibernate.connection.provider_class</"
+"property> property."
 msgstr ""
 "通过实现<literal>org.hibernate.connection.ConnectionProvider</literal>接口,"
 "你可以定义属于 你自己的获得JDBC连接的插件策略。通过设置<literal>hibernate."
 "connection.provider_class</literal>, 你可以选择一个自定义的实现."
 
 #. Tag: title
-#: configuration.xml:317
+#: configuration.xml:333
 #, no-c-format
 msgid "Optional configuration properties"
 msgstr "可选的配置属性"
 
 #. Tag: para
-#: configuration.xml:319
-#, no-c-format
+#: configuration.xml:335
+#, fuzzy, no-c-format
 msgid ""
-"There are a number of other properties that control the behaviour of "
+"There are a number of other properties that control the behavior of "
 "Hibernate at runtime. All are optional and have reasonable default values."
 msgstr ""
 "有大量属性能用来控制Hibernate在运行期的行为. 它们都是可选的, 并拥有适当的默认"
 "值."
 
-#. Tag: para
-#: configuration.xml:324
-#, no-c-format
+#. Tag: warning
+#: configuration.xml:341
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Warning: some of these properties are \"system-level\" only.</"
-"emphasis> System-level properties can be set only via <literal>java -"
-"Dproperty=value</literal> or <literal>hibernate.properties</literal>. They "
-"may <emphasis>not</emphasis> be set by the other techniques described above."
+"<emphasis>Some of these properties are \"system-level\" only.</emphasis> "
+"System-level properties can be set only via <literal>java -Dproperty=value</"
+"literal> or <filename>hibernate.properties</filename>. They "
+"<emphasis>cannot</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>警告: 其中一些属性是\"系统级(system-level)的\".</emphasis> 系统级属"
 "性只能通过<literal>java -Dproperty=value</literal>或 <literal>hibernate."
@@ -585,33 +591,34 @@
 "设置."
 
 #. Tag: title
-#: configuration.xml:332
+#: configuration.xml:347
 #, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Hibernate配置属性"
 
-#. Tag: literal
-#: configuration.xml:345
+#. Tag: property
+#: configuration.xml:360
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: configuration.xml:347
+#: configuration.xml:362
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a Hibernate <literal>Dialect</literal> which allows "
-"Hibernate to generate SQL optimized for a particular relational database."
+"The classname of a Hibernate <classname>org.hibernate.dialect.Dialect</"
+"classname> which allows Hibernate to generate SQL optimized for a particular "
+"relational database."
 msgstr ""
 "一个Hibernate <placeholder-1/>类名允许Hibernate针对特定的关系数据库生成优化的"
 "SQL. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:351
+#: configuration.xml:365
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>full.classname.of.Dialect</"
-"literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>full.classname.of."
+"Dialect</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -653,14 +660,23 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:359
+#. Tag: para
+#: configuration.xml:369
 #, no-c-format
+msgid ""
+"In most cases Hibernate will actually be able to choose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation based on "
+"the <literal>JDBC metadata</literal> returned by the JDBC driver."
+msgstr ""
+
+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr "hibernate.show_sql"
 
 #. Tag: entry
-#: configuration.xml:361
+#: configuration.xml:380
 #, fuzzy, no-c-format
 msgid ""
 "Write all SQL statements to console. This is an alternative to setting the "
@@ -671,14 +687,14 @@
 "设为<placeholder-2/>。 <placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:365 configuration.xml:377 configuration.xml:471
-#: configuration.xml:484 configuration.xml:497 configuration.xml:510
-#: configuration.xml:564 configuration.xml:591 configuration.xml:605
-#: configuration.xml:660 configuration.xml:888 configuration.xml:903
-#: configuration.xml:993
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490
+#: configuration.xml:503 configuration.xml:516 configuration.xml:529
+#: configuration.xml:583 configuration.xml:610 configuration.xml:623
+#: configuration.xml:678 configuration.xml:906 configuration.xml:921
+#: configuration.xml:1011
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>true</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>true</literal> | "
 "<literal>false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -721,26 +737,26 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:373
+#. Tag: property
+#: configuration.xml:392
 #, no-c-format
 msgid "hibernate.format_sql"
 msgstr "hibernate.format_sql"
 
 #. Tag: entry
-#: configuration.xml:375
+#: configuration.xml:394
 #, fuzzy, no-c-format
 msgid "Pretty print the SQL in the log and console."
 msgstr "在log和console中打印出更漂亮的SQL。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:385
+#. Tag: property
+#: configuration.xml:404
 #, no-c-format
 msgid "hibernate.default_schema"
 msgstr "hibernate.default_schema"
 
 #. Tag: entry
-#: configuration.xml:387
+#: configuration.xml:406
 #, fuzzy, no-c-format
 msgid ""
 "Qualify unqualified table names with the given schema/tablespace in "
@@ -750,9 +766,10 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:390
+#: configuration.xml:409
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
+msgid ""
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -794,25 +811,25 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:398
+#. Tag: property
+#: configuration.xml:417
 #, no-c-format
 msgid "hibernate.default_catalog"
 msgstr "hibernate.default_catalog"
 
 #. Tag: entry
-#: configuration.xml:400
+#: configuration.xml:419
 #, fuzzy, no-c-format
 msgid ""
-"Qualify unqualified table names with the given catalog in generated SQL."
+"Qualifies unqualified table names with the given catalog in generated SQL."
 msgstr ""
 "在生成的SQL中, 将给定的catalog附加于非全限定名的表名上. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:403
+#: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>CATALOG_NAME</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -854,26 +871,26 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:411
+#. Tag: property
+#: configuration.xml:430
 #, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr "hibernate.session_factory_name"
 
 #. Tag: entry
-#: configuration.xml:413
+#: configuration.xml:432
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>SessionFactory</literal> will be automatically bound to this "
-"name in JNDI after it has been created."
+"The <interfacename>org.hibernate.SessionFactory</interfacename> will be "
+"automatically bound to this name in JNDI after it has been created."
 msgstr ""
 "<placeholder-1/>创建后,将自动使用这个名字绑定到JNDI中. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:416 configuration.xml:859
+#: configuration.xml:435 configuration.xml:877
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jndi/composite/name</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jndi/composite/name</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -916,17 +933,17 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:424
+#. Tag: property
+#: configuration.xml:443
 #, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr "hibernate.max_fetch_depth"
 
 #. Tag: entry
-#: configuration.xml:426
+#: configuration.xml:445
 #, fuzzy, no-c-format
 msgid ""
-"Set a maximum \"depth\" for the outer join fetch tree for single-ended "
+"Sets a maximum \"depth\" for the outer join fetch tree for single-ended "
 "associations (one-to-one, many-to-one). A <literal>0</literal> disables "
 "default outer join fetching."
 msgstr ""
@@ -934,55 +951,55 @@
 "为<placeholder-1/>意味着将关闭默认的外连接抓取. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:430
-#, no-c-format
+#: configuration.xml:449
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>0</literal> and <literal>3</literal>"
 msgstr ""
 "<emphasis role=\"strong\">取值</emphasis> 建议在<literal>0</literal>到"
 "<literal>3</literal>之间取值"
 
-#. Tag: literal
-#: configuration.xml:439
+#. Tag: property
+#: configuration.xml:458
 #, no-c-format
 msgid "hibernate.default_batch_fetch_size"
 msgstr "hibernate.default_batch_fetch_size"
 
 #. Tag: entry
-#: configuration.xml:441
+#: configuration.xml:460
 #, fuzzy, no-c-format
-msgid "Set a default size for Hibernate batch fetching of associations."
+msgid "Sets a default size for Hibernate batch fetching of associations."
 msgstr "为Hibernate关联的批量抓取设置默认数量. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:443
-#, no-c-format
+#: configuration.xml:462
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values <literal>4</"
 "literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 "<emphasis role=\"strong\">取值</emphasis> 建议的取值为<literal>4</literal>, "
 "<literal>8</literal>, 和<literal>16</literal>"
 
-#. Tag: literal
-#: configuration.xml:452
+#. Tag: property
+#: configuration.xml:471
 #, no-c-format
 msgid "hibernate.default_entity_mode"
 msgstr "hibernate.default_entity_mode"
 
 #. Tag: entry
-#: configuration.xml:454
+#: configuration.xml:473
 #, fuzzy, no-c-format
 msgid ""
-"Set a default mode for entity representation for all sessions opened from "
+"Sets a default mode for entity representation for all sessions opened from "
 "this <literal>SessionFactory</literal>"
 msgstr ""
 "为由这个<placeholder-1/>打开的所有Session指定默认的实体表现模式. "
 "<placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:457
+#: configuration.xml:476
 #, no-c-format
 msgid ""
 "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>pojo</"
@@ -991,44 +1008,44 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>dynamic-map</literal>, "
 "<literal>dom4j</literal>, <literal>pojo</literal>"
 
-#. Tag: literal
-#: configuration.xml:465
+#. Tag: property
+#: configuration.xml:484
 #, no-c-format
 msgid "hibernate.order_updates"
 msgstr "hibernate.order_updates"
 
 #. Tag: entry
-#: configuration.xml:467
+#: configuration.xml:486
 #, fuzzy, no-c-format
 msgid ""
-"Force Hibernate to order SQL updates by the primary key value of the items "
+"Forces Hibernate to order SQL updates by the primary key value of the items "
 "being updated. This will result in fewer transaction deadlocks in highly "
 "concurrent systems."
 msgstr ""
 "强制Hibernate按照被更新数据的主键,为SQL更新排序。这么做将减少在高并发系统中"
 "事务的死锁。 <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:479
+#. Tag: property
+#: configuration.xml:498
 #, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr "hibernate.generate_statistics"
 
 #. Tag: entry
-#: configuration.xml:481
+#: configuration.xml:500
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, Hibernate will collect statistics useful for performance tuning."
 msgstr "如果开启, Hibernate将收集有助于性能调节的统计数据. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:492
+#. Tag: property
+#: configuration.xml:511
 #, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr "hibernate.use_identifer_rollback"
 
 #. Tag: entry
-#: configuration.xml:494
+#: configuration.xml:513
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, generated identifier properties will be reset to default values "
@@ -1036,14 +1053,14 @@
 msgstr ""
 "如果开启, 在对象被删除时生成的标识属性将被重设为默认值. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:505
+#. Tag: property
+#: configuration.xml:524
 #, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr "hibernate.use_sql_comments"
 
 #. Tag: entry
-#: configuration.xml:507
+#: configuration.xml:526
 #, fuzzy, no-c-format
 msgid ""
 "If turned on, Hibernate will generate comments inside the SQL, for easier "
@@ -1053,87 +1070,87 @@
 ">. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:521
+#: configuration.xml:540
 #, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "Hibernate JDBC和连接(connection)属性"
 
-#. Tag: literal
-#: configuration.xml:536
+#. Tag: property
+#: configuration.xml:555
 #, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr "hibernate.jdbc.fetch_size"
 
 #. Tag: entry
-#: configuration.xml:538
+#: configuration.xml:557
 #, fuzzy, no-c-format
 msgid ""
 "A non-zero value determines the JDBC fetch size (calls <literal>Statement."
 "setFetchSize()</literal>)."
 msgstr "非零值,指定JDBC抓取数量的大小 (调用<placeholder-1/>)."
 
-#. Tag: literal
-#: configuration.xml:545
+#. Tag: property
+#: configuration.xml:564
 #, no-c-format
 msgid "hibernate.jdbc.batch_size"
 msgstr "hibernate.jdbc.batch_size"
 
 #. Tag: entry
-#: configuration.xml:547
+#: configuration.xml:566
 #, fuzzy, no-c-format
 msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr "非零值,允许Hibernate使用JDBC2的批量更新. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:549
-#, no-c-format
+#: configuration.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> recommended values between "
+"<emphasis role=\"strong\">e.g.</emphasis> recommended values between "
 "<literal>5</literal> and <literal>30</literal>"
 msgstr ""
 "<emphasis role=\"strong\">取值</emphasis> 建议取<literal>5</literal>到"
 "<literal>30</literal>之间的值"
 
-#. Tag: literal
-#: configuration.xml:557
+#. Tag: property
+#: configuration.xml:576
 #, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr "hibernate.jdbc.batch_versioned_data"
 
 #. Tag: entry
-#: configuration.xml:559
+#: configuration.xml:578
 #, fuzzy, no-c-format
 msgid ""
 "Set this property to <literal>true</literal> if your JDBC driver returns "
-"correct row counts from <literal>executeBatch()</literal> (it is usually "
-"safe to turn this option on). Hibernate will then use batched DML for "
+"correct row counts from <literal>executeBatch()</literal>. Iit is usually "
+"safe to turn this option on. Hibernate will then use batched DML for "
 "automatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 "如果你想让你的JDBC驱动从<placeholder-1/>返回正确的行计数 , 那么将此属性设为"
 "<placeholder-2/>(开启这个选项通常是安全的). 同时,Hibernate将为自动版本化的数"
 "据使用批量DML. 默认值为<placeholder-3/>. <placeholder-4/>"
 
-#. Tag: literal
-#: configuration.xml:572
+#. Tag: property
+#: configuration.xml:591
 #, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr "hibernate.jdbc.factory_class"
 
 #. Tag: entry
-#: configuration.xml:574
+#: configuration.xml:593
 #, fuzzy, no-c-format
 msgid ""
-"Select a custom <literal>Batcher</literal>. Most applications will not need "
-"this configuration property."
+"Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfacename>. "
+"Most applications will not need this configuration property."
 msgstr ""
 "选择一个自定义的<placeholder-1/>. 多数应用程序不需要这个配置属性. "
 "<placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:577
+#: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "BatcherFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1176,53 +1193,54 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:585
+#. Tag: property
+#: configuration.xml:604
 #, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr "hibernate.jdbc.use_scrollable_resultset"
 
 #. Tag: entry
-#: configuration.xml:587
+#: configuration.xml:606
 #, fuzzy, no-c-format
 msgid ""
 "Enables use of JDBC2 scrollable resultsets by Hibernate. This property is "
-"only necessary when using user supplied JDBC connections, Hibernate uses "
+"only necessary when using user-supplied JDBC connections. Hibernate uses "
 "connection metadata otherwise."
 msgstr ""
 "允许Hibernate使用JDBC2的可滚动结果集. 只有在使用用户提供的JDBC连接时,这个选"
 "项才是必要的, 否则Hibernate会使用连接的元数据. <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:599
+#. Tag: property
+#: configuration.xml:618
 #, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr "hibernate.jdbc.use_streams_for_binary"
 
 #. Tag: entry
-#: configuration.xml:601
+#: configuration.xml:620
 #, fuzzy, no-c-format
 msgid ""
 "Use streams when writing/reading <literal>binary</literal> or "
-"<literal>serializable</literal> types to/from JDBC (system-level property)."
+"<literal>serializable</literal> types to/from JDBC. <emphasis>*system-level "
+"property*</emphasis>"
 msgstr ""
 "在JDBC读写<placeholder-1/>或<placeholder-2/> 的类型时使用流(stream)(系统级属"
 "性). <placeholder-3/>"
 
-#. Tag: literal
-#: configuration.xml:613
+#. Tag: property
+#: configuration.xml:631
 #, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr "hibernate.jdbc.use_get_generated_keys"
 
 #. Tag: entry
-#: configuration.xml:615
+#: configuration.xml:633
 #, fuzzy, no-c-format
 msgid ""
-"Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
+"Enables use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</literal> "
 "to retrieve natively generated keys after insert. Requires JDBC3+ driver and "
 "JRE1.4+, set to false if your driver has problems with the Hibernate "
-"identifier generators. By default, tries to determine the driver "
+"identifier generators. By default, it tries to determine the driver "
 "capabilities using connection metadata."
 msgstr ""
 "在数据插入数据库之后,允许使用JDBC3 <placeholder-1/> 来获取数据库生成的key"
@@ -1231,10 +1249,10 @@
 "<placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:621 configuration.xml:751 configuration.xml:763
-#: configuration.xml:777 configuration.xml:815
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781
+#: configuration.xml:795 configuration.xml:833
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>true|false</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>true|false</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -1276,27 +1294,28 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:629
+#. Tag: property
+#: configuration.xml:647
 #, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr "hibernate.connection.provider_class"
 
 #. Tag: entry
-#: configuration.xml:631
+#: configuration.xml:649
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a custom <literal>ConnectionProvider</literal> which "
-"provides JDBC connections to Hibernate."
+"The classname of a custom <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename> which provides JDBC connections to "
+"Hibernate."
 msgstr ""
 "自定义<placeholder-1/>的类名, 此类用来向Hibernate提供JDBC连接. <placeholder-"
 "2/>"
 
 #. Tag: para
-#: configuration.xml:634
+#: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "ConnectionProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1339,27 +1358,28 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:642
+#. Tag: property
+#: configuration.xml:660
 #, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr "hibernate.connection.isolation"
 
 #. Tag: entry
-#: configuration.xml:644
+#: configuration.xml:662
 #, fuzzy, no-c-format
 msgid ""
-"Set the JDBC transaction isolation level. Check <literal>java.sql."
-"Connection</literal> for meaningful values but note that most databases do "
-"not support all isolation levels."
+"Sets the JDBC transaction isolation level. Check <interfacename>java.sql."
+"Connection</interfacename> for meaningful values, but note that most "
+"databases do not support all isolation levels and some define additional, "
+"non-standard isolations."
 msgstr ""
 "设置JDBC事务隔离级别. 查看<placeholder-1/>来了解各个值的具体意义, 但请注意多"
 "数数据库都不支持所有的隔离级别. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:648
+#: configuration.xml:666
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>1, 2, 4, 8</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -1401,39 +1421,38 @@
 "<emphasis role=\"strong\">取值</emphasis><literal>true</literal> | "
 "<literal>false</literal>"
 
-#. Tag: literal
-#: configuration.xml:656
+#. Tag: property
+#: configuration.xml:674
 #, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr "hibernate.connection.autocommit"
 
 #. Tag: entry
-#: configuration.xml:658
+#: configuration.xml:676
 #, fuzzy, no-c-format
-msgid "Enables autocommit for JDBC pooled connections (not recommended)."
+msgid "Enables autocommit for JDBC pooled connections (it is not recommended)."
 msgstr ""
 "允许被缓存的JDBC连接开启自动提交(autocommit) (不建议). <placeholder-1/>"
 
-#. Tag: literal
-#: configuration.xml:668
+#. Tag: property
+#: configuration.xml:686
 #, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr "hibernate.connection.release_mode"
 
 #. Tag: entry
-#: configuration.xml:670
+#: configuration.xml:688
 #, fuzzy, no-c-format
 msgid ""
-"Specify when Hibernate should release JDBC connections. By default, a JDBC "
+"Specifies when Hibernate should release JDBC connections. By default, a JDBC "
 "connection is held until the session is explicitly closed or disconnected. "
-"For an application server JTA datasource, you should use "
-"<literal>after_statement</literal> to aggressively release connections after "
-"every JDBC call. For a non-JTA connection, it often makes sense to release "
-"the connection at the end of each transaction, by using "
-"<literal>after_transaction</literal>. <literal>auto</literal> will choose "
-"<literal>after_statement</literal> for the JTA and CMT transaction "
-"strategies and <literal>after_transaction</literal> for the JDBC transaction "
-"strategy."
+"For an application server JTA datasource, use <literal>after_statement</"
+"literal> to aggressively release connections after every JDBC call. For a "
+"non-JTA connection, it often makes sense to release the connection at the "
+"end of each transaction, by using <literal>after_transaction</literal>. "
+"<literal>auto</literal> will choose <literal>after_statement</literal> for "
+"the JTA and CMT transaction strategies and <literal>after_transaction</"
+"literal> for the JDBC transaction strategy."
 msgstr ""
 "指定Hibernate在何时释放JDBC连接. 默认情况下,直到Session被显式关闭或被断开连接"
 "时,才会释放JDBC连接. 对于应用程序服务器的JTA数据源, 你应当使用<placeholder-1/"
@@ -1443,11 +1462,11 @@
 "<placeholder-6/><placeholder-7/>"
 
 #. Tag: para
-#: configuration.xml:681
+#: configuration.xml:699
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>auto</literal> (default) | "
-"<literal>on_close</literal> | <literal>after_transaction</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>auto</literal> (default) "
+"| <literal>on_close</literal> | <literal>after_transaction</literal> | "
 "<literal>after_statement</literal>"
 msgstr ""
 "<emphasis role=\"strong\">取值</emphasis><literal>auto</literal> (默认) | "
@@ -1455,11 +1474,11 @@
 "<literal>after_statement</literal>"
 
 #. Tag: para
-#: configuration.xml:686
+#: configuration.xml:704
 #, fuzzy, no-c-format
 msgid ""
-"Note that this setting only affects <literal>Session</literal>s returned "
-"from <literal>SessionFactory.openSession</literal>. For <literal>Session</"
+"This setting only affects <literal>Session</literal>s returned from "
+"<literal>SessionFactory.openSession</literal>. For <literal>Session</"
 "literal>s obtained through <literal>SessionFactory.getCurrentSession</"
 "literal>, the <literal>CurrentSessionContext</literal> implementation "
 "configured for use controls the connection release mode for those "
@@ -1472,61 +1491,64 @@
 "literal>的连接释放模式。请参阅<xref linkend=\"architecture-current-session\"/"
 ">。"
 
-#. Tag: literal
-#: configuration.xml:698
+#. Tag: entry
+#: configuration.xml:715
 #, no-c-format
-msgid "hibernate.connection.<emphasis>&lt;propertyName&gt;</emphasis>"
+msgid ""
+"<property>hibernate.connection.</property><emphasis>&lt;propertyName&gt;</"
+"emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:700
+#: configuration.xml:718
 #, fuzzy, no-c-format
 msgid ""
-"Pass the JDBC property <literal>propertyName</literal> to "
+"Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to "
 "<literal>DriverManager.getConnection()</literal>."
 msgstr ""
 "传一个<literal>java.util.Properties</literal>实例给 <literal>Configuration."
 "setProperties()</literal>."
 
-#. Tag: literal
-#: configuration.xml:707
+#. Tag: entry
+#: configuration.xml:724
 #, no-c-format
-msgid "hibernate.jndi.<emphasis>&lt;propertyName&gt;</emphasis>"
+msgid ""
+"<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;</emphasis>"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:709
+#: configuration.xml:727
 #, fuzzy, no-c-format
 msgid ""
-"Pass the property <literal>propertyName</literal> to the JNDI "
+"Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the JNDI "
 "<literal>InitialContextFactory</literal>."
 msgstr ""
 "传一个<literal>java.util.Properties</literal>实例给 <literal>Configuration."
 "setProperties()</literal>."
 
 #. Tag: title
-#: configuration.xml:719
+#: configuration.xml:737
 #, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Hibernate缓存属性"
 
 #. Tag: literal
-#: configuration.xml:732
+#: configuration.xml:750
 #, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr "hibernate.cache.provider_class"
 
 #. Tag: entry
-#: configuration.xml:734
+#: configuration.xml:752
 #, fuzzy, no-c-format
 msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr "自定义的<placeholder-1/>的类名. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:736
+#: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "CacheProvider</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1570,16 +1592,16 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:744
+#: configuration.xml:762
 #, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr "hibernate.cache.use_minimal_puts"
 
 #. Tag: entry
-#: configuration.xml:746
+#: configuration.xml:764
 #, fuzzy, no-c-format
 msgid ""
-"Optimize second-level cache operation to minimize writes, at the cost of "
+"Optimizes second-level cache operation to minimize writes, at the cost of "
 "more frequent reads. This setting is most useful for clustered caches and, "
 "in Hibernate3, is enabled by default for clustered cache implementations."
 msgstr ""
@@ -1587,29 +1609,29 @@
 "的集群缓存非常有用, 对集群缓存的实现而言,默认是开启的. <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:759
+#: configuration.xml:777
 #, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr "hibernate.cache.use_query_cache"
 
 #. Tag: entry
-#: configuration.xml:761
+#: configuration.xml:779
 #, fuzzy, no-c-format
 msgid ""
-"Enable the query cache, individual queries still have to be set cachable."
+"Enables the query cache. Individual queries still have to be set cachable."
 msgstr "允许查询缓存, 个别查询仍然需要被设置为可缓存的. <placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:771
+#: configuration.xml:789
 #, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr "hibernate.cache.use_second_level_cache"
 
 #. Tag: entry
-#: configuration.xml:773
+#: configuration.xml:791
 #, fuzzy, no-c-format
 msgid ""
-"May be used to completely disable the second level cache, which is enabled "
+"Can be used to completely disable the second level cache, which is enabled "
 "by default for classes which specify a <literal>&lt;cache&gt;</literal> "
 "mapping."
 msgstr ""
@@ -1617,13 +1639,13 @@
 "会默认开启二级缓存. <placeholder-2/>"
 
 #. Tag: literal
-#: configuration.xml:785
+#: configuration.xml:803
 #, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr "hibernate.cache.query_cache_factory"
 
 #. Tag: entry
-#: configuration.xml:787
+#: configuration.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a custom <literal>QueryCache</literal> interface, defaults "
@@ -1633,10 +1655,10 @@
 "<placeholder-3/>"
 
 #. Tag: para
-#: configuration.xml:790
+#: configuration.xml:808
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of.QueryCache</"
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of.QueryCache</"
 "literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1680,21 +1702,21 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:798
+#: configuration.xml:816
 #, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr "hibernate.cache.region_prefix"
 
 #. Tag: entry
-#: configuration.xml:800
+#: configuration.xml:818
 #, fuzzy, no-c-format
 msgid "A prefix to use for second-level cache region names."
 msgstr "二级缓存区域名的前缀. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:802
+#: configuration.xml:820
 #, fuzzy, no-c-format
-msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
+msgid "<emphasis role=\"strong\">e.g.</emphasis> <literal>prefix</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "<emphasis role=\"strong\">eg.</emphasis><literal>true</literal> | "
@@ -1737,13 +1759,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:810
+#: configuration.xml:828
 #, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr "hibernate.cache.use_structured_entries"
 
 #. Tag: entry
-#: configuration.xml:812
+#: configuration.xml:830
 #, fuzzy, no-c-format
 msgid ""
 "Forces Hibernate to store data in the second-level cache in a more human-"
@@ -1751,19 +1773,19 @@
 msgstr "强制Hibernate以更人性化的格式将数据存入二级缓存. <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:826
+#: configuration.xml:844
 #, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Hibernate事务属性"
 
 #. Tag: literal
-#: configuration.xml:839
+#: configuration.xml:857
 #, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr "hibernate.transaction.factory_class"
 
 #. Tag: entry
-#: configuration.xml:841
+#: configuration.xml:859
 #, fuzzy, no-c-format
 msgid ""
 "The classname of a <literal>TransactionFactory</literal> to use with "
@@ -1774,10 +1796,10 @@
 "<placeholder-3/>). <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:845
+#: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionFactory</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1821,13 +1843,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:853
+#: configuration.xml:871
 #, no-c-format
 msgid "jta.UserTransaction"
 msgstr "jta.UserTransaction"
 
 #. Tag: entry
-#: configuration.xml:855
+#: configuration.xml:873
 #, fuzzy, no-c-format
 msgid ""
 "A JNDI name used by <literal>JTATransactionFactory</literal> to obtain the "
@@ -1837,27 +1859,27 @@
 "<placeholder-3/>"
 
 #. Tag: literal
-#: configuration.xml:867
+#: configuration.xml:885
 #, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr "hibernate.transaction.manager_lookup_class"
 
 #. Tag: entry
-#: configuration.xml:869
+#: configuration.xml:887
 #, fuzzy, no-c-format
 msgid ""
-"The classname of a <literal>TransactionManagerLookup</literal> - required "
-"when JVM-level caching is enabled or when using hilo generator in a JTA "
-"environment."
+"The classname of a <literal>TransactionManagerLookup</literal>. It is "
+"required when JVM-level caching is enabled or when using hilo generator in a "
+"JTA environment."
 msgstr ""
 "一个<placeholder-1/>的类名 - 当使用JVM级缓存,或在JTA环境中使用hilo生成器的时"
 "候需要该类. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:873
+#: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>classname.of."
 "TransactionManagerLookup</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -1901,13 +1923,13 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:881
+#: configuration.xml:899
 #, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr "hibernate.transaction.flush_before_completion"
 
 #. Tag: entry
-#: configuration.xml:883
+#: configuration.xml:901
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically flushed during the before "
@@ -1920,17 +1942,17 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: configuration.xml:896
+#: configuration.xml:914
 #, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr "hibernate.transaction.auto_close_session"
 
 #. Tag: entry
-#: configuration.xml:898
+#: configuration.xml:916
 #, fuzzy, no-c-format
 msgid ""
 "If enabled, the session will be automatically closed during the after "
-"completion phase of the transaction. Built-in and utomatic session context "
+"completion phase of the transaction. Built-in and automatic session context "
 "management is preferred, see <xref linkend=\"architecture-current-session\"/"
 ">."
 msgstr ""
@@ -1939,22 +1961,22 @@
 "<placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:914
+#: configuration.xml:932
 #, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "其他属性"
 
 #. Tag: literal
-#: configuration.xml:927
+#: configuration.xml:945
 #, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr "hibernate.current_session_context_class"
 
 #. Tag: entry
-#: configuration.xml:929
+#: configuration.xml:947
 #, fuzzy, no-c-format
 msgid ""
-"Supply a (custom) strategy for the scoping of the \"current\" "
+"Supply a custom strategy for the scoping of the \"current\" "
 "<literal>Session</literal>. See <xref linkend=\"architecture-current-session"
 "\"/> for more information about the built-in strategies."
 msgstr ""
@@ -1962,10 +1984,10 @@
 "<xref linkend=\"architecture-current-session\"/> 。 <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:934
+#: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>jta</literal> | "
 "<literal>thread</literal> | <literal>managed</literal> | <literal>custom."
 "Class</literal>"
 msgstr ""
@@ -1974,22 +1996,22 @@
 "Class</literal>"
 
 #. Tag: literal
-#: configuration.xml:943
+#: configuration.xml:961
 #, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr "hibernate.query.factory_class"
 
 #. Tag: entry
-#: configuration.xml:945
+#: configuration.xml:963
 #, fuzzy, no-c-format
 msgid "Chooses the HQL parser implementation."
 msgstr "选择HQL解析器的实现. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:947
+#: configuration.xml:965
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>org.hibernate.hql.ast."
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>org.hibernate.hql.ast."
 "ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.classic."
 "ClassicQueryTranslatorFactory</literal>"
 msgstr ""
@@ -1998,26 +2020,26 @@
 "ClassicQueryTranslatorFactory</literal>"
 
 #. Tag: literal
-#: configuration.xml:956
+#: configuration.xml:974
 #, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr "hibernate.query.substitutions"
 
 #. Tag: entry
-#: configuration.xml:958
+#: configuration.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"Mapping from tokens in Hibernate queries to SQL tokens (tokens might be "
-"function or literal names, for example)."
+"Is used to map from tokens in Hibernate queries to SQL tokens (tokens might "
+"be function or literal names, for example)."
 msgstr ""
 "将Hibernate查询中的符号映射到SQL查询中的符号 (符号可能是函数名或常量名字). "
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:961
+#: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
 "hqlFunction=SQLFUNC</literal>"
 msgstr ""
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
@@ -2061,16 +2083,16 @@
 "<literal>false</literal>"
 
 #. Tag: literal
-#: configuration.xml:969
+#: configuration.xml:987
 #, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr "hibernate.hbm2ddl.auto"
 
 #. Tag: entry
-#: configuration.xml:971
+#: configuration.xml:989
 #, fuzzy, no-c-format
 msgid ""
-"Automatically validate or export schema DDL to the database when the "
+"Automatically validates or exports schema DDL to the database when the "
 "<literal>SessionFactory</literal> is created. With <literal>create-drop</"
 "literal>, the database schema will be dropped when the "
 "<literal>SessionFactory</literal> is closed explicitly."
@@ -2080,10 +2102,10 @@
 "schema. <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:977
+#: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
+"<emphasis role=\"strong\">e.g.</emphasis> <literal>validate</literal> | "
 "<literal>update</literal> | <literal>create</literal> | <literal>create-"
 "drop</literal>"
 msgstr ""
@@ -2092,39 +2114,39 @@
 "drop</literal>"
 
 #. Tag: literal
-#: configuration.xml:986
+#: configuration.xml:1004
 #, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr "hibernate.cglib.use_reflection_optimizer"
 
 #. Tag: entry
-#: configuration.xml:988
+#: configuration.xml:1006
 #, fuzzy, no-c-format
 msgid ""
-"Enables use of CGLIB instead of runtime reflection (System-level property). "
-"Reflection can sometimes be useful when troubleshooting, note that Hibernate "
-"always requires CGLIB even if you turn off the optimizer. You can not set "
-"this property in <literal>hibernate.cfg.xml</literal>."
+"Enables the use of CGLIB instead of runtime reflection (System-level "
+"property). Reflection can sometimes be useful when troubleshooting. "
+"Hibernate always requires CGLIB even if you turn off the optimizer. You "
+"cannot set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 "开启CGLIB来替代运行时反射机制(系统级属性). 反射机制有时在除错时比较有用. 注意"
 "即使关闭这个优化, Hibernate还是需要CGLIB. 你不能在<placeholder-1/>中设置此属"
 "性. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:1004
+#: configuration.xml:1022
 #, no-c-format
 msgid "SQL Dialects"
 msgstr "SQL方言"
 
 #. Tag: para
-#: configuration.xml:1006
-#, no-c-format
+#: configuration.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"You should always set the <literal>hibernate.dialect</literal> property to "
-"the correct <literal>org.hibernate.dialect.Dialect</literal> subclass for "
-"your database. If you specify a dialect, Hibernate will use sensible "
-"defaults for some of the other properties listed above, saving you the "
-"effort of specifying them manually."
+"Always set the <literal>hibernate.dialect</literal> property to the correct "
+"<literal>org.hibernate.dialect.Dialect</literal> subclass for your database. "
+"If you specify a dialect, Hibernate will use sensible defaults for some of "
+"the other properties listed above. This means that you will not have to "
+"specify them manually."
 msgstr ""
 "你应当总是为你的数据库将<literal>hibernate.dialect</literal>属性设置成正确的 "
 "<literal>org.hibernate.dialect.Dialect</literal>子类. 如果你指定一种方言, "
@@ -2132,19 +2154,19 @@
 "夫."
 
 #. Tag: title
-#: configuration.xml:1014
+#: configuration.xml:1032
 #, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Hibernate SQL方言 (<literal>hibernate.dialect</literal>)"
 
 #. Tag: entry
-#: configuration.xml:1022
+#: configuration.xml:1040
 #, no-c-format
 msgid "RDBMS"
 msgstr "RDBMS"
 
 #. Tag: entry
-#: configuration.xml:1023
+#: configuration.xml:1041
 #, fuzzy, no-c-format
 msgid "Dialect"
 msgstr ""
@@ -2154,286 +2176,298 @@
 "方言"
 
 #. Tag: entry
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "<entry>DB2</entry>"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1028
+#: configuration.xml:1046
 #, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr "org.hibernate.dialect.DB2Dialect"
 
 #. Tag: entry
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "DB2 AS/400"
 msgstr "DB2 AS/400"
 
 #. Tag: literal
-#: configuration.xml:1031
+#: configuration.xml:1049
 #, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr "org.hibernate.dialect.DB2400Dialect"
 
 #. Tag: entry
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "DB2 OS390"
 msgstr "DB2 OS390"
 
 #. Tag: literal
-#: configuration.xml:1034
+#: configuration.xml:1052
 #, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr "org.hibernate.dialect.DB2390Dialect"
 
 #. Tag: entry
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "PostgreSQL"
 msgstr "PostgreSQL"
 
 #. Tag: literal
-#: configuration.xml:1037
+#: configuration.xml:1055
 #, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr "org.hibernate.dialect.PostgreSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "MySQL"
 msgstr "MySQL"
 
 #. Tag: literal
-#: configuration.xml:1040
+#: configuration.xml:1058
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr "org.hibernate.dialect.MySQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "MySQL with InnoDB"
 msgstr "MySQL with InnoDB"
 
 #. Tag: literal
-#: configuration.xml:1043
+#: configuration.xml:1061
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr "org.hibernate.dialect.MySQLInnoDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "MySQL with MyISAM"
 msgstr "MySQL with MyISAM"
 
 #. Tag: literal
-#: configuration.xml:1046
+#: configuration.xml:1064
 #, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr "org.hibernate.dialect.MySQLMyISAMDialect"
 
 #. Tag: entry
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "Oracle (any version)"
 msgstr "Oracle (any version)"
 
 #. Tag: literal
-#: configuration.xml:1049
+#: configuration.xml:1067
 #, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr "org.hibernate.dialect.OracleDialect"
 
 #. Tag: entry
-#: configuration.xml:1052
-#, no-c-format
-msgid "Oracle 9i/10g"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "Oracle 9i"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
-#: configuration.xml:1052
-#, no-c-format
-msgid "org.hibernate.dialect.Oracle9Dialect"
+#: configuration.xml:1070
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle9iDialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
-#: configuration.xml:1055
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "Oracle 10g"
+msgstr "Oracle 9i/10g"
+
+#. Tag: literal
+#: configuration.xml:1073
+#, fuzzy, no-c-format
+msgid "org.hibernate.dialect.Oracle10gDialect"
+msgstr "org.hibernate.dialect.OracleDialect"
+
+#. Tag: entry
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1055
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1058
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1061
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1064
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1067
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1070
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1112
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1100
+#: configuration.xml:1121
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "外连接抓取(Outer Join Fetching)"
 
 #. Tag: para
-#: configuration.xml:1102
-#, no-c-format
+#: configuration.xml:1123
+#, fuzzy, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
 "<emphasis>outer join fetching</emphasis> will often increase performance by "
-"limiting the number of round trips to and from the database (at the cost of "
-"possibly more work performed by the database itself). Outer join fetching "
-"allows a whole graph of objects connected by many-to-one, one-to-many, many-"
-"to-many and one-to-one associations to be retrieved in a single SQL "
-"<literal>SELECT</literal>."
+"limiting the number of round trips to and from the database. This is, "
+"however, at the cost of possibly more work performed by the database itself. "
+"Outer join fetching allows a whole graph of objects connected by many-to-"
+"one, one-to-many, many-to-many and one-to-one associations to be retrieved "
+"in a single SQL <literal>SELECT</literal>."
 msgstr ""
 "如果你的数据库支持ANSI, Oracle或Sybase风格的外连接, <emphasis>外连接抓取</"
 "emphasis>通常能通过限制往返数据库次数 (更多的工作交由数据库自己来完成)来提高"
@@ -2441,13 +2475,13 @@
 "one, one-to-many, many-to-many和one-to-one关联获取连接对象的整个对象图."
 
 #. Tag: para
-#: configuration.xml:1111
-#, no-c-format
+#: configuration.xml:1132
+#, fuzzy, no-c-format
 msgid ""
-"Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
+"Outer join fetching can be disabled <emphasis>globally</emphasis> by setting "
 "the property <literal>hibernate.max_fetch_depth</literal> to <literal>0</"
 "literal>. A setting of <literal>1</literal> or higher enables outer join "
-"fetching for one-to-one and many-to-one associations which have been mapped "
+"fetching for one-to-one and many-to-one associations that have been mapped "
 "with <literal>fetch=\"join\"</literal>."
 msgstr ""
 "将<literal>hibernate.max_fetch_depth</literal>设为<literal>0</literal>能在"
@@ -2456,23 +2490,23 @@
 "<literal>fetch=\"join\"</literal>来映射."
 
 #. Tag: para
-#: configuration.xml:1119
+#: configuration.xml:1140
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr "参见<xref linkend=\"performance-fetching\"/>获得更多信息."
 
 #. Tag: title
-#: configuration.xml:1126
+#: configuration.xml:1147
 #, no-c-format
 msgid "Binary Streams"
 msgstr "二进制流 (Binary Streams)"
 
 #. Tag: para
-#: configuration.xml:1128
-#, no-c-format
+#: configuration.xml:1149
+#, fuzzy, no-c-format
 msgid ""
-"Oracle limits the size of <literal>byte</literal> arrays that may be passed "
-"to/from its JDBC driver. If you wish to use large instances of "
+"Oracle limits the size of <literal>byte</literal> arrays that can be passed "
+"to and/or from its JDBC driver. If you wish to use large instances of "
 "<literal>binary</literal> or <literal>serializable</literal> type, you "
 "should enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. "
 "<emphasis>This is a system-level setting only.</emphasis>"
@@ -2483,80 +2517,81 @@
 "use_streams_for_binary</literal>属性. <emphasis>这是系统级属性.</emphasis>"
 
 #. Tag: title
-#: configuration.xml:1139
+#: configuration.xml:1160
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "二级缓存与查询缓存"
 
 #. Tag: para
-#: configuration.xml:1141
-#, no-c-format
+#: configuration.xml:1162
+#, fuzzy, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
 "use a process or cluster scoped second-level cache system with Hibernate. "
-"See the <xref linkend=\"performance-cache\"/> for more details."
+"See the <xref linkend=\"performance-cache\"/> for more information."
 msgstr ""
 "以<literal>hibernate.cache</literal>为前缀的属性允许你在Hibernate中,使用进程"
 "或群集范围内的二级缓存系统. 参见<xref linkend=\"performance-cache\"/>获取更多"
 "的详情."
 
 #. Tag: title
-#: configuration.xml:1151
+#: configuration.xml:1172
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "查询语言中的替换"
 
 #. Tag: para
-#: configuration.xml:1153
-#, no-c-format
+#: configuration.xml:1174
+#, fuzzy, no-c-format
 msgid ""
-"You may define new Hibernate query tokens using <literal>hibernate.query."
+"You can define new Hibernate query tokens using <literal>hibernate.query."
 "substitutions</literal>. For example:"
 msgstr ""
 "你可以使用<literal>hibernate.query.substitutions</literal>在Hibernate中定义新"
 "的查询符号. 例如:"
 
 #. Tag: programlisting
-#: configuration.xml:1158
+#: configuration.xml:1179
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions true=1, false=0"
 
 #. Tag: para
-#: configuration.xml:1160
-#, no-c-format
+#: configuration.xml:1181
+#, fuzzy, no-c-format
 msgid ""
-"would cause the tokens <literal>true</literal> and <literal>false</literal> "
-"to be translated to integer literals in the generated SQL."
+"This would cause the tokens <literal>true</literal> and <literal>false</"
+"literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 "将导致符号<literal>true</literal>和<literal>false</literal>在生成的SQL中被翻"
 "译成整数常量."
 
 #. Tag: programlisting
-#: configuration.xml:1165
+#: configuration.xml:1186
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1167
-#, no-c-format
-msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
+#: configuration.xml:1188
+#, fuzzy, no-c-format
+msgid ""
+"This would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr "将允许你重命名SQL中的<literal>LOWER</literal>函数."
 
 #. Tag: title
-#: configuration.xml:1174
+#: configuration.xml:1195
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Hibernate的统计(statistics)机制"
 
 #. Tag: para
-#: configuration.xml:1176
-#, no-c-format
+#: configuration.xml:1197
+#, fuzzy, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
-"will expose a number of metrics that are useful when tuning a running system "
-"via <literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
+"exposes a number of metrics that are useful when tuning a running system via "
+"<literal>SessionFactory.getStatistics()</literal>. Hibernate can even be "
 "configured to expose these statistics via JMX. Read the Javadoc of the "
 "interfaces in <literal>org.hibernate.stats</literal> for more information."
 msgstr ""
@@ -2567,40 +2602,34 @@
 "息."
 
 #. Tag: title
-#: configuration.xml:1188
+#: configuration.xml:1209
 #, no-c-format
 msgid "Logging"
 msgstr "日志"
 
 #. Tag: para
-#: configuration.xml:1190
+#: configuration.xml:1211
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr "Hibernate使用Apache commons-logging来为各种事件记录日志."
-
-#. Tag: para
-#: configuration.xml:1194
-#, no-c-format
 msgid ""
-"The commons-logging service will direct output to either Apache Log4j (if "
-"you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
-"logging (if running under JDK1.4 or above). You may download Log4j from "
-"<literal>http://jakarta.apache.org</literal>. To use Log4j you will need to "
-"place a <literal>log4j.properties</literal> file in your classpath, an "
-"example properties file is distributed with Hibernate in the <literal>src/</"
-"literal> directory."
+"Hibernate utilizes <ulink url=\"http://www.slf4j.org/\">Simple Logging "
+"Facade for Java</ulink> (SLF4J) in order to log various system events. SLF4J "
+"can direct your logging output to several logging frameworks (NOP, Simple, "
+"log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on your chosen "
+"binding. In order to setup logging you will need <filename>slf4j-api.jar</"
+"filename> in your classpath together with the jar file for your preferred "
+"binding - <filename>slf4j-log4j12.jar</filename> in the case of Log4J. See "
+"the SLF4J <ulink url=\"http://www.slf4j.org/manual.html\">documentation</"
+"ulink> for more detail. To use Log4j you will also need to place a "
+"<filename>log4j.properties</filename> file in your classpath. An example "
+"properties file is distributed with Hibernate in the <literal>src/</literal> "
+"directory."
 msgstr ""
-"commons-logging将直接输出到Apache Log4j(如果在类路径中包括<literal>log4j."
-"jar</literal>)或 JDK1.4 logging (如果运行在JDK1.4或以上的环境下). 你可以从"
-"<literal>http://jakarta.apache.org</literal> 下载Log4j. 要使用Log4j,你需要将"
-"<literal>log4j.properties</literal>文件放置在类路径下, 随Hibernate 一同分发的"
-"样例属性文件在<literal>src/</literal>目录下."
 
 #. Tag: para
-#: configuration.xml:1204
-#, no-c-format
+#: configuration.xml:1222
+#, fuzzy, no-c-format
 msgid ""
-"We strongly recommend that you familiarize yourself with Hibernate's log "
+"It is recommended that you familiarize yourself with Hibernate's log "
 "messages. A lot of work has been put into making the Hibernate log as "
 "detailed as possible, without making it unreadable. It is an essential "
 "troubleshooting device. The most interesting log categories are the "
@@ -2611,67 +2640,67 @@
 "类有如下这些:"
 
 #. Tag: title
-#: configuration.xml:1213
+#: configuration.xml:1231
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Hibernate日志类别"
 
 #. Tag: entry
-#: configuration.xml:1219
+#: configuration.xml:1237
 #, no-c-format
 msgid "Category"
 msgstr "类别"
 
 #. Tag: entry
-#: configuration.xml:1220
+#: configuration.xml:1238
 #, no-c-format
 msgid "Function"
 msgstr "功能"
 
 #. Tag: literal
-#: configuration.xml:1225
+#: configuration.xml:1243
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1226
+#: configuration.xml:1244
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr "在所有SQL DML语句被执行时为它们记录日志"
 
 #. Tag: literal
-#: configuration.xml:1229
+#: configuration.xml:1247
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1230
+#: configuration.xml:1248
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "为所有JDBC参数记录日志"
 
 #. Tag: literal
-#: configuration.xml:1233
+#: configuration.xml:1251
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1252
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr "在所有SQL DDL语句执行时为它们记录日志"
 
 #. Tag: literal
-#: configuration.xml:1237
+#: configuration.xml:1255
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1256
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2679,80 +2708,81 @@
 msgstr "在session清洗(flush)时,为所有与其关联的实体(最多20个)的状态记录日志"
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1262
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1263
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "为所有二级缓存的活动记录日志"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1266
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1267
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "为事务相关的活动记录日志"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1270
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1271
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "为所有JDBC资源的获取记录日志"
 
 #. Tag: literal
-#: configuration.xml:1256
+#: configuration.xml:1274
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.AST"
 
 #. Tag: entry
-#: configuration.xml:1257
+#: configuration.xml:1275
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr "在解析查询的时候,记录HQL和SQL的AST分析日志"
 
 #. Tag: literal
-#: configuration.xml:1262
+#: configuration.xml:1280
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1281
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "为JAAS认证请求做日志"
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1284
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1267
-#, no-c-format
+#: configuration.xml:1285
+#, fuzzy, no-c-format
 msgid ""
-"Log everything (a lot of information, but very useful for troubleshooting)"
+"Log everything. This is a lot of information but it is useful for "
+"troubleshooting"
 msgstr "为任何Hibernate相关信息做日志 (信息量较大, 但对查错非常有帮助)"
 
 #. Tag: para
-#: configuration.xml:1276
+#: configuration.xml:1294
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2765,13 +2795,13 @@
 "<literal>hibernate.show_sql</literal>属性。"
 
 #. Tag: title
-#: configuration.xml:1286
+#: configuration.xml:1304
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "实现<literal>NamingStrategy</literal>"
 
 #. Tag: para
-#: configuration.xml:1288
+#: configuration.xml:1306
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2781,10 +2811,10 @@
 "和schema 元素指定一个“命名标准”."
 
 #. Tag: para
-#: configuration.xml:1293
-#, no-c-format
+#: configuration.xml:1311
+#, fuzzy, no-c-format
 msgid ""
-"You may provide rules for automatically generating database identifiers from "
+"You can provide rules for automatically generating database identifiers from "
 "Java identifiers or for processing \"logical\" column and table names given "
 "in the mapping file into \"physical\" table and column names. This feature "
 "helps reduce the verbosity of the mapping document, eliminating repetitive "
@@ -2795,17 +2825,17 @@
 "理成\"物理\"表/列名的规则. 这个特性有助于减少冗长的映射定义文件."
 
 #. Tag: para
-#: configuration.xml:1302
-#, no-c-format
+#: configuration.xml:1320
+#, fuzzy, no-c-format
 msgid ""
-"You may specify a different strategy by calling <literal>Configuration."
+"You can specify a different strategy by calling <literal>Configuration."
 "setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 "在加入映射定义前,你可以调用 <literal>Configuration.setNamingStrategy()</"
 "literal>指定一个不同的命名策略:"
 
 #. Tag: programlisting
-#: configuration.xml:1307
+#: configuration.xml:1325
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2816,7 +2846,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1309
+#: configuration.xml:1327
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2826,13 +2856,13 @@
 "略, 对 一些应用程序而言,可能是非常有用的起点."
 
 #. Tag: title
-#: configuration.xml:1317
+#: configuration.xml:1335
 #, no-c-format
 msgid "XML configuration file"
 msgstr "XML配置文件"
 
 #. Tag: para
-#: configuration.xml:1319
+#: configuration.xml:1337
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -2845,16 +2875,16 @@
 "件同时存在,它将覆盖前者的属性."
 
 #. Tag: para
-#: configuration.xml:1326
-#, no-c-format
+#: configuration.xml:1344
+#, fuzzy, no-c-format
 msgid ""
-"The XML configuration file is by default expected to be in the root o your "
+"The XML configuration file is by default expected to be in the root of your "
 "<literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 "XML配置文件被默认是放在<literal>CLASSPATH</literal>的根目录下. 这是一个例子:"
 
 #. Tag: programlisting
-#: configuration.xml:1331
+#: configuration.xml:1349
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -2898,15 +2928,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1333
-#, no-c-format
+#: configuration.xml:1351
+#, fuzzy, no-c-format
 msgid ""
-"As you can see, the advantage of this approach is the externalization of the "
-"mapping file names to configuration. The <literal>hibernate.cfg.xml</"
-"literal> is also more convenient once you have to tune the Hibernate cache. "
-"Note that is your choice to use either <literal>hibernate.properties</"
-"literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, "
-"except for the above mentioned benefits of using the XML syntax."
+"The advantage of this approach is the externalization of the mapping file "
+"names to configuration. The <literal>hibernate.cfg.xml</literal> is also "
+"more convenient once you have to tune the Hibernate cache. It is your choice "
+"to use either <literal>hibernate.properties</literal> or <literal>hibernate."
+"cfg.xml</literal>. Both are equivalent, except for the above mentioned "
+"benefits of using the XML syntax."
 msgstr ""
 "如你所见, 这个方法优势在于,在配置文件中指出了映射定义文件的名字. 一旦你需要"
 "调整Hibernate的缓存, <literal>hibernate.cfg.xml</literal>也是更方便. 注意,"
@@ -2914,14 +2944,14 @@
 "literal>完全是由你来决定, 除了上面提到的XML语法的优势之外, 两者是等价的."
 
 #. Tag: para
-#: configuration.xml:1342
-#, no-c-format
-msgid "With the XML configuration, starting Hibernate is then as simple as"
+#: configuration.xml:1360
+#, fuzzy, no-c-format
+msgid "With the XML configuration, starting Hibernate is then as simple as:"
 msgstr ""
 "使用XML配置,使得启动Hibernate变的异常简单, 如下所示,一行代码就可以搞定:"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1364
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -2929,13 +2959,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
-#, no-c-format
-msgid "You can pick a different XML configuration file using"
+#: configuration.xml:1366
+#, fuzzy, no-c-format
+msgid "You can select a different XML configuration file using:"
 msgstr "你可以使用如下代码来添加一个不同的XML配置文件"
 
 #. Tag: programlisting
-#: configuration.xml:1352
+#: configuration.xml:1370
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2944,28 +2974,28 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1357
+#: configuration.xml:1375
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "J2EE应用程序服务器的集成"
 
 #. Tag: para
-#: configuration.xml:1359
+#: configuration.xml:1377
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr "针对J2EE体系,Hibernate有如下几个集成的方面:"
 
 #. Tag: para
-#: configuration.xml:1365
-#, no-c-format
+#: configuration.xml:1383
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
 "connections managed by the container and provided through JNDI. Usually, a "
 "JTA compatible <literal>TransactionManager</literal> and a "
 "<literal>ResourceManager</literal> take care of transaction management "
-"(CMT), esp. distributed transaction handling across several datasources. You "
-"may of course also demarcate transaction boundaries programmatically (BMT) "
-"or you might want to use the optional Hibernate <literal>Transaction</"
+"(CMT), especially distributed transaction handling across several "
+"datasources. You can also demarcate transaction boundaries programmatically "
+"(BMT), or you might want to use the optional Hibernate <literal>Transaction</"
 "literal> API for this to keep your code portable."
 msgstr ""
 "<emphasis>容器管理的数据源(Container-managed datasources)</emphasis>: "
@@ -2977,7 +3007,7 @@
 "API."
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1398
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -2987,15 +3017,15 @@
 "<literal>SessionFactory</literal>绑定到JNDI."
 
 #. Tag: para
-#: configuration.xml:1389
-#, no-c-format
+#: configuration.xml:1407
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
-"literal> may be automatically bound to the scope of JTA transactions. Simply "
+"<emphasis>JTA Session binding:</emphasis> the Hibernate <literal>Session</"
+"literal> can be automatically bound to the scope of JTA transactions. Simply "
 "lookup the <literal>SessionFactory</literal> from JNDI and get the current "
-"<literal>Session</literal>. Let Hibernate take care of flushing and closing "
-"the <literal>Session</literal> when your JTA transaction completes. "
-"Transaction demarcation is either declarative (CMT) or programmatic (BMT/"
+"<literal>Session</literal>. Let Hibernate manage flushing and closing the "
+"<literal>Session</literal> when your JTA transaction completes. Transaction "
+"demarcation is either declarative (CMT) or programmatic (BMT/"
 "UserTransaction)."
 msgstr ""
 "<emphasis>JTA Session绑定:</emphasis> Hibernate <literal>Session</literal> 可"
@@ -3005,16 +3035,16 @@
 "的(CMT),也可以是编程式的(BMT/UserTransaction)."
 
 #. Tag: para
-#: configuration.xml:1402
-#, no-c-format
+#: configuration.xml:1420
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
-"server (e.g. JBoss AS), you can chose to deploy Hibernate as a managed "
+"<emphasis>JMX deployment:</emphasis> if you have a JMX capable application "
+"server (e.g. JBoss AS), you can choose to deploy Hibernate as a managed "
 "MBean. This saves you the one line startup code to build your "
 "<literal>SessionFactory</literal> from a <literal>Configuration</literal>. "
-"The container will startup your <literal>HibernateService</literal>, and "
-"ideally also take care of service dependencies (Datasource has to be "
-"available before Hibernate starts, etc)."
+"The container will startup your <literal>HibernateService</literal> and also "
+"take care of service dependencies (datasource has to be available before "
+"Hibernate starts, etc)."
 msgstr ""
 "<emphasis>JMX部署:</emphasis> 如果你使用支持JMX应用程序服务器(如, JBoss AS), "
 "那么你可以选择将Hibernate部署成托管MBean. 这将为你省去一行从"
@@ -3023,7 +3053,7 @@
 "依赖关系 (在Hibernate启动前,数据源必须是可用的,等等)."
 
 #. Tag: para
-#: configuration.xml:1413
+#: configuration.xml:1431
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -3035,18 +3065,18 @@
 "<literal>after_statement</literal>."
 
 #. Tag: title
-#: configuration.xml:1420
+#: configuration.xml:1438
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "事务策略配置"
 
 #. Tag: para
-#: configuration.xml:1422
-#, no-c-format
+#: configuration.xml:1440
+#, fuzzy, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
 "transaction demarcation system in your architecture. If you let Hibernate "
-"use JDBC directly, through a connection pool, you may begin and end your "
+"use JDBC directly through a connection pool, you can begin and end your "
 "transactions by calling the JDBC API. If you run in a J2EE application "
 "server, you might want to use bean-managed transactions and call the JTA API "
 "and <literal>UserTransaction</literal> when needed."
@@ -3057,7 +3087,7 @@
 "的时候调用JTA API和<literal>UserTransaction</literal>."
 
 #. Tag: para
-#: configuration.xml:1430
+#: configuration.xml:1448
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -3073,70 +3103,70 @@
 "定 一个<literal>Transaction</literal>实例的工厂类."
 
 #. Tag: para
-#: configuration.xml:1437
-#, no-c-format
-msgid "There are three standard (built-in) choices:"
+#: configuration.xml:1455
+#, fuzzy, no-c-format
+msgid "There are three standard, or built-in, choices:"
 msgstr "有三个标准(内建)的选择:"
 
 #. Tag: literal
-#: configuration.xml:1443
+#: configuration.xml:1461
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "org.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1463
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr "委托给数据库(JDBC)事务(默认)"
 
 #. Tag: literal
-#: configuration.xml:1449
+#: configuration.xml:1467
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1451
-#, no-c-format
+#: configuration.xml:1469
+#, fuzzy, no-c-format
 msgid ""
-"delegates to container-managed transaction if an existing transaction is "
-"underway in this context (e.g. EJB session bean method), otherwise a new "
-"transaction is started and bean-managed transaction are used."
+"delegates to container-managed transactions if an existing transaction is "
+"underway in this context (for example, EJB session bean method). Otherwise, "
+"a new transaction is started and bean-managed transactions are used."
 msgstr ""
 "如果在上下文环境中存在运行着的事务(如, EJB会话Bean的方法), 则委托给容器管 理"
 "的事务, 否则,将启动一个新的事务,并使用Bean管理的事务."
 
 #. Tag: literal
-#: configuration.xml:1459
+#: configuration.xml:1477
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1461
+#: configuration.xml:1479
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr "委托给容器管理的JTA事务"
 
 #. Tag: para
-#: configuration.xml:1466
-#, no-c-format
+#: configuration.xml:1484
+#, fuzzy, no-c-format
 msgid ""
-"You may also define your own transaction strategies (for a CORBA transaction "
+"You can also define your own transaction strategies (for a CORBA transaction "
 "service, for example)."
 msgstr "你也可以定义属于你自己的事务策略 (如, 针对CORBA的事务服务)"
 
 #. Tag: para
-#: configuration.xml:1471
-#, no-c-format
+#: configuration.xml:1489
+#, fuzzy, no-c-format
 msgid ""
-"Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
-"with JTA, etc.) require access to the JTA <literal>TransactionManager</"
-"literal> in a managed environment. In an application server you have to "
-"specify how Hibernate should obtain a reference to the "
-"<literal>TransactionManager</literal>, since J2EE does not standardize a "
-"single mechanism:"
+"Some features in Hibernate (i.e., the second level cache, Contextual "
+"Sessions with JTA, etc.) require access to the JTA "
+"<literal>TransactionManager</literal> in a managed environment. In an "
+"application server, since J2EE does not standardize a single mechanism, you "
+"have to specify how Hibernate should obtain a reference to the "
+"<literal>TransactionManager</literal>:"
 msgstr ""
 "Hibernate的一些特性 (比如二级缓存, Contextual Sessions with JTA等等)需要访问"
 "在托管环境中的JTA <literal>TransactionManager</literal>. 由于J2EE没有标准化一"
@@ -3144,172 +3174,172 @@
 "<literal>TransactionManager</literal>的引用:"
 
 #. Tag: title
-#: configuration.xml:1479
+#: configuration.xml:1497
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "JTA TransactionManagers"
 
 #. Tag: entry
-#: configuration.xml:1485
+#: configuration.xml:1503
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "Transaction工厂类"
 
 #. Tag: entry
-#: configuration.xml:1486
+#: configuration.xml:1504
 #, no-c-format
 msgid "Application Server"
 msgstr "应用程序服务器"
 
 #. Tag: literal
-#: configuration.xml:1491
+#: configuration.xml:1509
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1492
+#: configuration.xml:1510
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1495
+#: configuration.xml:1513
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1496
+#: configuration.xml:1514
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1499
+#: configuration.xml:1517
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1518
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1503
+#: configuration.xml:1521
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1522
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1507
+#: configuration.xml:1525
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1508
+#: configuration.xml:1526
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1511
+#: configuration.xml:1529
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1512
+#: configuration.xml:1530
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1515
+#: configuration.xml:1533
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1516
+#: configuration.xml:1534
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1519
+#: configuration.xml:1537
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1520
+#: configuration.xml:1538
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1523
+#: configuration.xml:1541
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1524
+#: configuration.xml:1542
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1527
+#: configuration.xml:1545
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1528
+#: configuration.xml:1546
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1537
+#: configuration.xml:1555
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "JNDI绑定的<literal>SessionFactory</literal>"
 
 #. Tag: para
-#: configuration.xml:1539
-#, no-c-format
+#: configuration.xml:1557
+#, fuzzy, no-c-format
 msgid ""
-"A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
-"lookup of the factory and the creation of new <literal>Session</literal>s. "
-"Note that this is not related to a JNDI bound <literal>Datasource</literal>, "
-"both simply use the same registry!"
+"A JNDI-bound Hibernate <literal>SessionFactory</literal> can simplify the "
+"lookup function of the factory and create new <literal>Session</literal>s. "
+"This is not, however, related to a JNDI bound <literal>Datasource</literal>; "
+"both simply use the same registry."
 msgstr ""
 "与JNDI绑定的Hibernate的<literal>SessionFactory</literal>能简化工厂的查询,简"
 "化创建新的<literal>Session</literal>. 需要注意的是这与JNDI绑定"
 "<literal>Datasource</literal>没有关系, 它们只是恰巧用了相同的注册表!"
 
 #. Tag: para
-#: configuration.xml:1546
-#, no-c-format
+#: configuration.xml:1564
+#, fuzzy, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
-"namespace, specify a name (eg. <literal>java:hibernate/SessionFactory</"
+"namespace, specify a name (e.g. <literal>java:hibernate/SessionFactory</"
 "literal>) using the property <literal>hibernate.session_factory_name</"
 "literal>. If this property is omitted, the <literal>SessionFactory</literal> "
-"will not be bound to JNDI. (This is especially useful in environments with a "
-"read-only JNDI default implementation, e.g. Tomcat.)"
+"will not be bound to JNDI. This is especially useful in environments with a "
+"read-only JNDI default implementation (in Tomcat, for example)."
 msgstr ""
 "如果你希望将<literal>SessionFactory</literal>绑定到一个JNDI的名字空间, 用属性"
 "<literal>hibernate.session_factory_name</literal>指定一个名字(如, "
@@ -3318,7 +3348,7 @@
 "现的环境中,这个设置尤其有用, 如Tomcat.)"
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1572
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -3332,14 +3362,15 @@
 "的<literal>InitialContext</literal>."
 
 #. Tag: para
-#: configuration.xml:1561
-#, no-c-format
+#: configuration.xml:1579
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
 "JNDI after you call <literal>cfg.buildSessionFactory()</literal>. This means "
-"you will at least have this call in some startup code (or utility class) in "
-"your application, unless you use JMX deployment with the "
-"<literal>HibernateService</literal> (discussed later)."
+"you will have this call in some startup code, or utility class in your "
+"application, unless you use JMX deployment with the "
+"<literal>HibernateService</literal> (this is discussed later in greater "
+"detail)."
 msgstr ""
 "在你调用<literal>cfg.buildSessionFactory()</literal>后, Hibernate会自动将"
 "<literal>SessionFactory</literal>注册到JNDI. 这意味这你至少需要在你应用程序的"
@@ -3347,21 +3378,22 @@
 "literal>来做JMX部署 (见后面讨论)."
 
 #. Tag: para
-#: configuration.xml:1568
-#, no-c-format
+#: configuration.xml:1586
+#, fuzzy, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
-"class may obtain the <literal>SessionFactory</literal> using a JNDI lookup."
+"class, you can obtain the <literal>SessionFactory</literal> using a JNDI "
+"lookup."
 msgstr ""
 "假若你使用JNDI <literal>SessionFactory</literal>,EJB或者任何其它类都可以从"
 "JNDI中找到此<literal>SessionFactory</literal>。"
 
 #. Tag: para
-#: configuration.xml:1573
-#, no-c-format
+#: configuration.xml:1591
+#, fuzzy, no-c-format
 msgid ""
-"We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
-"a managed environment and use a <literal>static</literal> singleton "
+"It is recommended that you bind the <literal>SessionFactory</literal> to "
+"JNDI in a managed environment and use a <literal>static</literal> singleton "
 "otherwise. To shield your application code from these details, we also "
 "recommend to hide the actual lookup code for a <literal>SessionFactory</"
 "literal> in a helper class, such as <literal>HibernateUtil.getSessionFactory"
@@ -3376,33 +3408,34 @@
 "第一章。"
 
 #. Tag: title
-#: configuration.xml:1585
+#: configuration.xml:1603
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "在JTA环境下使用Current Session context (当前session上下文)管理"
 
 #. Tag: para
-#: configuration.xml:1587
+#: configuration.xml:1605
 #, fuzzy, no-c-format
 msgid ""
-"The easiest way to handle <literal>Session</literal>s and transactions is "
-"Hibernates automatic \"current\" <literal>Session</literal> management. See "
-"the discussion of <xref linkend=\"architecture-current-session\"/>current "
-"sessions. Using the <literal>\"jta\"</literal> session context, if there is "
-"no Hibernate <literal>Session</literal> associated with the current JTA "
-"transaction, one will be started and associated with that JTA transaction "
-"the first time you call <literal>sessionFactory.getCurrentSession()</"
-"literal>. The <literal>Session</literal>s retrieved via "
-"<literal>getCurrentSession()</literal> in <literal>\"jta\"</literal> context "
-"will be set to automatically flush before the transaction completes, close "
-"after the transaction completes, and aggressively release JDBC connections "
-"after each statement. This allows the <literal>Session</literal>s to be "
-"managed by the life cycle of the JTA transaction to which it is associated, "
-"keeping user code clean of such management concerns. Your code can either "
-"use JTA programmatically through <literal>UserTransaction</literal>, or "
-"(recommended for portable code) use the Hibernate <literal>Transaction</"
-"literal> API to set transaction boundaries. If you run in an EJB container, "
-"declarative transaction demarcation with CMT is preferred."
+"The easiest way to handle <literal>Sessions</literal> and transactions is "
+"Hibernate's automatic \"current\" <literal>Session</literal> management. For "
+"a discussion of contextual sessions see <link linkend=\"architecture-current-"
+"session\"></link>. Using the <literal>\"jta\"</literal> session context, if "
+"there is no Hibernate <literal>Session</literal> associated with the current "
+"JTA transaction, one will be started and associated with that JTA "
+"transaction the first time you call <literal>sessionFactory.getCurrentSession"
+"()</literal>. The <literal>Session</literal>s retrieved via "
+"<literal>getCurrentSession()</literal> in the<literal>\"jta\"</literal> "
+"context are set to automatically flush before the transaction completes, "
+"close after the transaction completes, and aggressively release JDBC "
+"connections after each statement. This allows the <literal>Session</"
+"literal>s to be managed by the life cycle of the JTA transaction to which it "
+"is associated, keeping user code clean of such management concerns. Your "
+"code can either use JTA programmatically through <literal>UserTransaction</"
+"literal>, or (recommended for portable code) use the Hibernate "
+"<literal>Transaction</literal> API to set transaction boundaries. If you run "
+"in an EJB container, declarative transaction demarcation with CMT is "
+"preferred."
 msgstr ""
 "在Hibernate中,管理<literal>Session</literal>和transaction最好的方法是自动的"
 "\"当前\"<literal>Session</literal>管理。请参见<xref linkend=\"architecture-"
@@ -3420,20 +3453,20 @@
 "EJB容器中,建议对CMT使用声明式事务声明。"
 
 #. Tag: title
-#: configuration.xml:1610
+#: configuration.xml:1628
 #, no-c-format
 msgid "JMX deployment"
 msgstr "JMX部署"
 
 #. Tag: para
-#: configuration.xml:1612
-#, no-c-format
+#: configuration.xml:1630
+#, fuzzy, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
 "executed somewhere to get a <literal>SessionFactory</literal> into JNDI. You "
-"can do this either in a <literal>static</literal> initializer block (like "
-"the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as a "
-"<emphasis>managed service</emphasis>."
+"can do this either in a <literal>static</literal> initializer block, like "
+"the one in <literal>HibernateUtil</literal>, or you can deploy Hibernate as "
+"a <emphasis>managed service</emphasis>."
 msgstr ""
 "为了将<literal>SessionFactory</literal>注册到JNDI中,<literal>cfg."
 "buildSessionFactory()</literal>这行代码仍需在某处被执行. 你可在一个"
@@ -3441,12 +3474,12 @@
 "中执行它或将Hibernate部署为一个<emphasis>托管的服务</emphasis>."
 
 #. Tag: para
-#: configuration.xml:1620
-#, no-c-format
+#: configuration.xml:1638
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
 "literal> for deployment on an application server with JMX capabilities, such "
-"as JBoss AS. The actual deployment and configuration is vendor specific. "
+"as JBoss AS. The actual deployment and configuration is vendor-specific. "
 "Here is an example <literal>jboss-service.xml</literal> for JBoss 4.0.x:"
 msgstr ""
 "为了部署在一个支持JMX的应用程序服务器上,Hibernate和 <literal>org.hibernate."
@@ -3455,7 +3488,7 @@
 "literal>样例:"
 
 #. Tag: programlisting
-#: configuration.xml:1627
+#: configuration.xml:1645
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3506,15 +3539,15 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1629
-#, no-c-format
+#: configuration.xml:1647
+#, fuzzy, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
 "packaged in a JAR file with the extension <literal>.sar</literal> (service "
 "archive). You also need to package Hibernate, its required third-party "
 "libraries, your compiled persistent classes, as well as your mapping files "
-"in the same archive. Your enterprise beans (usually session beans) may be "
-"kept in their own JAR file, but you may include this EJB JAR file in the "
+"in the same archive. Your enterprise beans (usually session beans) can be "
+"kept in their own JAR file, but you can include this EJB JAR file in the "
 "main service archive to get a single (hot-)deployable unit. Consult the "
 "JBoss AS documentation for more information about JMX service and EJB "
 "deployment."
@@ -3526,6 +3559,31 @@
 "JAR文件一同包含进能独立(热)部署的主服务文档. 参考JBoss AS文档以了解更多的JMX"
 "服务与EJB部署的信息."
 
+#~ msgid ""
+#~ "<literal>hibernate.properties</literal> is the easiest approach if you "
+#~ "want to get started quickly."
+#~ msgstr ""
+#~ "如果想尽快体验Hibernate, <literal>hibernate.properties</literal>是最简单的"
+#~ "方式."
+
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr "Hibernate使用Apache commons-logging来为各种事件记录日志."
+
+#~ msgid ""
+#~ "The commons-logging service will direct output to either Apache Log4j (if "
+#~ "you include <literal>log4j.jar</literal> in your classpath) or JDK1.4 "
+#~ "logging (if running under JDK1.4 or above). You may download Log4j from "
+#~ "<literal>http://jakarta.apache.org</literal>. To use Log4j you will need "
+#~ "to place a <literal>log4j.properties</literal> file in your classpath, an "
+#~ "example properties file is distributed with Hibernate in the <literal>src/"
+#~ "</literal> directory."
+#~ msgstr ""
+#~ "commons-logging将直接输出到Apache Log4j(如果在类路径中包括<literal>log4j."
+#~ "jar</literal>)或 JDK1.4 logging (如果运行在JDK1.4或以上的环境下). 你可以从"
+#~ "<literal>http://jakarta.apache.org</literal> 下载Log4j. 要使用Log4j,你需"
+#~ "要将<literal>log4j.properties</literal>文件放置在类路径下, 随Hibernate 一"
+#~ "同分发的样例属性文件在<literal>src/</literal>目录下."
+
 #~ msgid "<placeholder-1/> (optional)"
 #~ msgstr "<placeholder-1/> (可选)"
 

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/events.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/events.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/events.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,11 +18,11 @@
 
 #. Tag: para
 #: events.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is often useful for the application to react to certain events that occur "
-"inside Hibernate. This allows implementation of certain kinds of generic "
-"functionality, and extension of Hibernate functionality."
+"It is useful for the application to react to certain events that occur "
+"inside Hibernate. This allows for the implementation of generic "
+"functionality and the extension of Hibernate functionality."
 msgstr ""
 "应用程序能够响应Hibernate内部产生的特定事件是非常有用的。这样就允许实现某些通"
 "用的功能 以及允许对Hibernate功能进行扩展。"
@@ -35,10 +35,10 @@
 
 #. Tag: para
 #: events.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
-"session to the application allowing the application to inspect and/or "
+"session to the application, allowing the application to inspect and/or "
 "manipulate properties of a persistent object before it is saved, updated, "
 "deleted or loaded. One possible use for this is to track auditing "
 "information. For example, the following <literal>Interceptor</literal> "
@@ -58,10 +58,10 @@
 
 #. Tag: para
 #: events.xml:51
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may either implement <literal>Interceptor</literal> directly or (better) "
-"extend <literal>EmptyInterceptor</literal>."
+"You can either implement <literal>Interceptor</literal> directly or extend "
+"<literal>EmptyInterceptor</literal>."
 msgstr ""
 "你可以直接实现<literal>Interceptor</literal>接口,也可以(最好)继承自"
 "<literal>EmptyInterceptor</literal>。"
@@ -157,9 +157,9 @@
 
 #. Tag: para
 #: events.xml:58
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Interceptors come in two flavors: <literal>Session</literal>-scoped and "
+"There are two kinds of inteceptors: <literal>Session</literal>-scoped and "
 "<literal>SessionFactory</literal>-scoped."
 msgstr ""
 "拦截器可以有两种:<literal>Session</literal>范围内的,和"
@@ -185,16 +185,16 @@
 
 #. Tag: para
 #: events.xml:71
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
 "the <literal>Configuration</literal> object prior to building the "
-"<literal>SessionFactory</literal>. In this case, the supplied interceptor "
-"will be applied to all sessions opened from that <literal>SessionFactory</"
-"literal>; this is true unless a session is opened explicitly specifying the "
-"interceptor to use. <literal>SessionFactory</literal>-scoped interceptors "
-"must be thread safe, taking care to not store session-specific state since "
-"multiple sessions will use this interceptor (potentially) concurrently."
+"<literal>SessionFactory</literal>. Unless a session is opened explicitly "
+"specifying the interceptor to use, the supplied interceptor will be applied "
+"to all sessions opened from that <literal>SessionFactory</literal>. "
+"<literal>SessionFactory</literal>-scoped interceptors must be thread safe. "
+"Ensure that you do not store session-specific states, since multiple "
+"sessions will use this interceptor potentially concurrently."
 msgstr ""
 "<literal>SessionFactory</literal>范围内的拦截器要通过<literal>Configuration</"
 "literal>中注册,而这必须在创建<literal>SessionFactory</literal>之前。在这种情"
@@ -218,30 +218,30 @@
 
 #. Tag: para
 #: events.xml:87
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you have to react to particular events in your persistence layer, you may "
+"If you have to react to particular events in your persistence layer, you can "
 "also use the Hibernate3 <emphasis>event</emphasis> architecture. The event "
-"system can be used in addition or as a replacement for interceptors."
+"system can be used in addition, or as a replacement, for interceptors."
 msgstr ""
 "如果需要响应持久层的某些特殊事件,你也可以使用Hibernate3的事件框架。 该事件系"
 "统可以用来替代拦截器,也可以作为拦截器的补充来使用。"
 
 #. Tag: para
 #: events.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Essentially all of the methods of the <literal>Session</literal> interface "
-"correlate to an event. You have a <literal>LoadEvent</literal>, a "
-"<literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD "
-"or the <literal>org.hibernate.event</literal> package for the full list of "
-"defined event types). When a request is made of one of these methods, the "
-"Hibernate <literal>Session</literal> generates an appropriate event and "
-"passes it to the configured event listeners for that type. Out-of-the-box, "
-"these listeners implement the same processing in which those methods always "
+"All the methods of the <literal>Session</literal> interface correlate to an "
+"event. You have a <literal>LoadEvent</literal>, a <literal>FlushEvent</"
+"literal>, etc. Consult the XML configuration-file DTD or the <literal>org."
+"hibernate.event</literal> package for the full list of defined event types. "
+"When a request is made of one of these methods, the Hibernate "
+"<literal>Session</literal> generates an appropriate event and passes it to "
+"the configured event listeners for that type. Out-of-the-box, these "
+"listeners implement the same processing in which those methods always "
 "resulted. However, you are free to implement a customization of one of the "
 "listener interfaces (i.e., the <literal>LoadEvent</literal> is processed by "
-"the registered implemenation of the <literal>LoadEventListener</literal> "
+"the registered implementation of the <literal>LoadEventListener</literal> "
 "interface), in which case their implementation would be responsible for "
 "processing any <literal>load()</literal> requests made of the "
 "<literal>Session</literal>."
@@ -259,26 +259,25 @@
 
 #. Tag: para
 #: events.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The listeners should be considered effectively singletons; meaning, they are "
-"shared between requests, and thus should not save any state as instance "
-"variables."
+"The listeners should be considered singletons. This means they are shared "
+"between requests, and should not save any state as instance variables."
 msgstr ""
 "监听器应该被看作是单例(singleton)对象,也就是说,所有同类型的事件的处理共享同"
 "一个监听器实例,因此监听器 不应该保存任何状态(也就是不应该使用成员变量)。"
 
 #. Tag: para
 #: events.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A custom listener should implement the appropriate interface for the event "
-"it wants to process and/or extend one of the convenience base classes (or "
-"even the default event listeners used by Hibernate out-of-the-box as these "
-"are declared non-final for this purpose). Custom listeners can either be "
+"A custom listener implements the appropriate interface for the event it "
+"wants to process and/or extend one of the convenience base classes (or even "
+"the default event listeners used by Hibernate out-of-the-box as these are "
+"declared non-final for this purpose). Custom listeners can either be "
 "registered programmatically through the <literal>Configuration</literal> "
-"object, or specified in the Hibernate configuration XML (declarative "
-"configuration through the properties file is not supported). Here's an "
+"object, or specified in the Hibernate configuration XML. Declarative "
+"configuration through the properties file is not supported. Here is an "
 "example of a custom load event listener:"
 msgstr ""
 "用户定制的监听器应该实现与所要处理的事件相对应的接口,或者从一个合适的基类继"
@@ -333,8 +332,8 @@
 
 #. Tag: para
 #: events.xml:132
-#, no-c-format
-msgid "Instead, you may register it programmatically:"
+#, fuzzy, no-c-format
+msgid "Instead, you can register it programmatically:"
 msgstr "看看用另一种方式,通过编程的方式来注册它。"
 
 #. Tag: programlisting
@@ -349,13 +348,13 @@
 
 #. Tag: para
 #: events.xml:138
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
 "name is used in multiple <literal>&lt;listener/&gt;</literal> elements, each "
-"reference will result in a separate instance of that class. If you need the "
-"capability to share listener instances between listener types you must use "
-"the programmatic registration approach."
+"reference will result in a separate instance of that class. If you need to "
+"share listener instances between listener types you must use the "
+"programmatic registration approach."
 msgstr ""
 "通过在XML配置文件声明而注册的监听器不能共享实例。如果在多个<literal>&lt;"
 "listener/&gt;</literal>节点中使用 了相同的类的名字,则每一个引用都将会产生一"
@@ -364,11 +363,11 @@
 
 #. Tag: para
 #: events.xml:146
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
-"configuration? Well, a listener implementation could implement multiple "
-"event listener interfaces. Having the type additionally defined during "
+"configuration? A listener implementation could implement multiple event "
+"listener interfaces. Having the type additionally defined during "
 "registration makes it easier to turn custom listeners on or off during "
 "configuration."
 msgstr ""
@@ -384,12 +383,12 @@
 
 #. Tag: para
 #: events.xml:157
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
-"session facade layer. Now, Hibernate3 allows certain actions to be "
-"permissioned via JACC, and authorized via JAAS. This is optional "
-"functionality built on top of the event architecture."
+"session facade layer. Hibernate3 allows certain actions to be permissioned "
+"via JACC, and authorized via JAAS. This is an optional functionality that is "
+"built on top of the event architecture."
 msgstr ""
 "通常,Hibernate应用程序的声明式安全机制由会话外观层(session facade)所管理。 "
 "现在,Hibernate3允许某些特定的行为由JACC进行许可管理,由JAAS进行授权管理。 本"
@@ -421,12 +420,12 @@
 
 #. Tag: para
 #: events.xml:170
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
-"just a shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class="
-"\"...\"/&gt;&lt;/event&gt;</literal> when there is exactly one listener for "
-"a particular event type."
+"shorthand for <literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/"
+"&gt;&lt;/event&gt;</literal> when there is exactly one listener for a "
+"particular event type."
 msgstr ""
 "注意,<literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal>只是"
 "<literal>&lt;event type=\"...\"&gt;&lt;listener class=\"...\"/&gt;&lt;/"
@@ -434,10 +433,10 @@
 
 #. Tag: para
 #: events.xml:176
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
-"roles:"
+"Next, while still in <literal>hibernate.cfg.xml</literal>, bind the "
+"permissions to roles:"
 msgstr ""
 "接下来,仍然在<literal>hibernate.cfg.xml</literal>文件中,绑定角色的权限:"
 

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_mappings.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_mappings.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_mappings.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,39 +17,39 @@
 msgstr "示例:复杂映射实例"
 
 #. Tag: para
-#: example_mappings.xml:31
-#, no-c-format
-msgid "This chapters shows off some more complex association mappings."
+#: example_mappings.xml:32
+#, fuzzy, no-c-format
+msgid "This chapters explores some more complex association mappings."
 msgstr "本章展示了一些较为复杂的关系映射。"
 
 #. Tag: title
-#: example_mappings.xml:36
+#: example_mappings.xml:37
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employer(雇主)/Employee(雇员)"
 
 #. Tag: para
-#: example_mappings.xml:38
-#, no-c-format
+#: example_mappings.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
-"and <literal>Employee</literal> uses an actual entity class "
-"(<literal>Employment</literal>) to represent the association. This is done "
-"because there might be more than one period of employment for the same two "
-"parties. Components are used to model monetary values and employee names."
+"and <literal>Employee</literal> uses an entity class (<literal>Employment</"
+"literal>) to represent the association. You can do this when there might be "
+"more than one period of employment for the same two parties. Components are "
+"used to model monetary values and employee names."
 msgstr ""
 "下面关于<literal>Employer</literal> 和 <literal>Employee</literal>的关系模型"
 "使用了一个真实的实体类 (<literal>Employment</literal>)来表述,这是因为对于相"
 "同的雇员和雇主可能会有多个雇佣时间段。 对于金额和雇员姓名,用Components建模。"
 
 #. Tag: para
-#: example_mappings.xml:55
-#, no-c-format
-msgid "Heres a possible mapping document:"
+#: example_mappings.xml:56
+#, fuzzy, no-c-format
+msgid "Here is a possible mapping document:"
 msgstr "映射文件可能是这样:"
 
 #. Tag: programlisting
-#: example_mappings.xml:59
+#: example_mappings.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -105,14 +105,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:61
-#, no-c-format
-msgid ""
-"And heres the table schema generated by <literal>SchemaExport</literal>."
+#: example_mappings.xml:62
+#, fuzzy, no-c-format
+msgid "Here is the table schema generated by <literal>SchemaExport</literal>."
 msgstr "用<literal>SchemaExport</literal>生成表结构。"
 
 #. Tag: programlisting
-#: example_mappings.xml:65
+#: example_mappings.xml:66
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -153,22 +152,22 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:70
+#: example_mappings.xml:71
 #, no-c-format
 msgid "Author/Work"
 msgstr "Author(作家)/Work(作品)"
 
 #. Tag: para
-#: example_mappings.xml:72
-#, no-c-format
+#: example_mappings.xml:73
+#, fuzzy, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
-"literal>, <literal>Author</literal> and <literal>Person</literal>. We "
-"represent the relationship between <literal>Work</literal> and "
-"<literal>Author</literal> as a many-to-many association. We choose to "
-"represent the relationship between <literal>Author</literal> and "
-"<literal>Person</literal> as one-to-one association. Another possibility "
-"would be to have <literal>Author</literal> extend <literal>Person</literal>."
+"literal>, <literal>Author</literal> and <literal>Person</literal>. In the "
+"example, the relationship between <literal>Work</literal> and "
+"<literal>Author</literal> is represented as a many-to-many association and "
+"the relationship between <literal>Author</literal> and <literal>Person</"
+"literal> is represented as one-to-one association. Another possibility would "
+"be to have <literal>Author</literal> extend <literal>Person</literal>."
 msgstr ""
 "考虑下面的<literal>Work</literal>,<literal>Author</literal> 和 "
 "<literal>Person</literal>模型的关系。 我们用多对多关系来描述<literal>Work</"
@@ -177,14 +176,14 @@
 "literal>继承<literal>Person</literal>。"
 
 #. Tag: para
-#: example_mappings.xml:90
+#: example_mappings.xml:91
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr "下面的映射文件正确的描述了这些关系:"
 
 #. Tag: programlisting
-#: example_mappings.xml:94
+#: example_mappings.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -241,14 +240,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:96
-#, no-c-format
+#: example_mappings.xml:97
+#, fuzzy, no-c-format
 msgid ""
-"There are four tables in this mapping. <literal>works</literal>, "
+"There are four tables in this mapping: <literal>works</literal>, "
 "<literal>authors</literal> and <literal>persons</literal> hold work, author "
 "and person data respectively. <literal>author_work</literal> is an "
-"association table linking authors to works. Heres the table schema, as "
-"generated by <literal>SchemaExport</literal>."
+"association table linking authors to works. Here is the table schema, as "
+"generated by <literal>SchemaExport</literal>:"
 msgstr ""
 "映射中有4个表。<literal>works</literal>, <literal>authors</literal> 和 "
 "<literal>persons</literal> 分别保存着work,author和person的数据。"
@@ -256,7 +255,7 @@
 "<literal>SchemaExport</literal>生成的。"
 
 #. Tag: programlisting
-#: example_mappings.xml:104
+#: example_mappings.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -297,24 +296,24 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:109
+#: example_mappings.xml:110
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Customer(客户)/Order(订单)/Product(产品)"
 
 #. Tag: para
-#: example_mappings.xml:111
-#, no-c-format
+#: example_mappings.xml:112
+#, fuzzy, no-c-format
 msgid ""
-"Now consider a model of the relationships between <literal>Customer</"
-"literal>, <literal>Order</literal> and <literal>LineItem</literal> and "
-"<literal>Product</literal>. There is a one-to-many association between "
-"<literal>Customer</literal> and <literal>Order</literal>, but how should we "
-"represent <literal>Order</literal> / <literal>LineItem</literal> / "
-"<literal>Product</literal>? I've chosen to map <literal>LineItem</literal> "
-"as an association class representing the many-to-many association between "
-"<literal>Order</literal> and <literal>Product</literal>. In Hibernate, this "
-"is called a composite element."
+"In this section we consider a model of the relationships between "
+"<literal>Customer</literal>, <literal>Order</literal>, <literal>Line Item</"
+"literal> and <literal>Product</literal>. There is a one-to-many association "
+"between <literal>Customer</literal> and <literal>Order</literal>, but how "
+"can you represent <literal>Order</literal> / <literal>LineItem</literal> / "
+"<literal>Product</literal>? In the example, <literal>LineItem</literal> is "
+"mapped as an association class representing the many-to-many association "
+"between <literal>Order</literal> and <literal>Product</literal>. In "
+"Hibernate this is called a composite element."
 msgstr ""
 "现在来考虑<literal>Customer</literal>,<literal>Order</literal> , "
 "<literal>LineItem</literal> 和 <literal>Product</literal>关系的模型。"
@@ -325,13 +324,13 @@
 "Hibernate,这叫做组合元素。"
 
 #. Tag: para
-#: example_mappings.xml:131
-#, no-c-format
-msgid "The mapping document:"
+#: example_mappings.xml:132
+#, fuzzy, no-c-format
+msgid "The mapping document will look like this:"
 msgstr "映射文件如下:"
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -374,7 +373,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:137
+#: example_mappings.xml:138
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -388,7 +387,7 @@
 "literal>也作为连接orders 和 products的关联表。"
 
 #. Tag: programlisting
-#: example_mappings.xml:144
+#: example_mappings.xml:145
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -428,36 +427,30 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:149
+#: example_mappings.xml:150
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "杂例"
 
 #. Tag: para
-#: example_mappings.xml:151
-#, no-c-format
+#: example_mappings.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"These examples are all taken from the Hibernate test suite. You will find "
-"many other useful example mappings there. Look in the <literal>test</"
+"These examples are available from the Hibernate test suite. You will find "
+"many other useful example mappings there by searching in the <literal>test</"
 "literal> folder of the Hibernate distribution."
 msgstr ""
 "这些例子全部来自于Hibernate的test suite,同时你也可以找到其他有用的例子。 可"
 "以参考Hibernate的<literal>test</literal>目录。"
 
-#. Tag: para
-#: example_mappings.xml:157
-#, no-c-format
-msgid "TODO: put words around this stuff"
-msgstr "TODO: put words around this stuff"
-
 #. Tag: title
-#: example_mappings.xml:160
+#: example_mappings.xml:161
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "\"Typed\" one-to-one association"
 
 #. Tag: programlisting
-#: example_mappings.xml:161
+#: example_mappings.xml:162
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -489,13 +482,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:165
+#: example_mappings.xml:166
 #, no-c-format
 msgid "Composite key example"
 msgstr "Composite key example"
 
 #. Tag: programlisting
-#: example_mappings.xml:166
+#: example_mappings.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -614,14 +607,14 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:170
+#: example_mappings.xml:171
 #, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr ""
 "共有组合键属性的多对多(Many-to-many with shared composite key attribute)"
 
 #. Tag: programlisting
-#: example_mappings.xml:171
+#: example_mappings.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -662,13 +655,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:175
+#: example_mappings.xml:176
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "Content based discrimination"
 
 #. Tag: programlisting
-#: example_mappings.xml:176
+#: example_mappings.xml:177
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -724,13 +717,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:180
+#: example_mappings.xml:181
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Associations on alternate keys"
 
 #. Tag: programlisting
-#: example_mappings.xml:181
+#: example_mappings.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -783,3 +776,6 @@
 "    \n"
 "</class>]]>"
 msgstr ""
+
+#~ msgid "TODO: put words around this stuff"
+#~ msgstr "TODO: put words around this stuff"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_parentchild.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_parentchild.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_parentchild.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,21 @@
 
 #. Tag: para
 #: example_parentchild.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"One of the very first things that new users try to do with Hibernate is to "
-"model a parent / child type relationship. There are two different approaches "
-"to this. For various reasons the most convenient approach, especially for "
-"new users, is to model both <literal>Parent</literal> and <literal>Child</"
-"literal> as entity classes with a <literal>&lt;one-to-many&gt;</literal> "
-"association from <literal>Parent</literal> to <literal>Child</literal>. (The "
-"alternative approach is to declare the <literal>Child</literal> as a "
-"<literal>&lt;composite-element&gt;</literal>.) Now, it turns out that "
-"default semantics of a one to many association (in Hibernate) are much less "
-"close to the usual semantics of a parent / child relationship than those of "
-"a composite element mapping. We will explain how to use a "
-"<emphasis>bidirectional one to many association with cascades</emphasis> to "
-"model a parent / child relationship efficiently and elegantly. It's not at "
-"all difficult!"
+"One of the first things that new users want to do with Hibernate is to model "
+"a parent/child type relationship. There are two different approaches to "
+"this. The most convenient approach, especially for new users, is to model "
+"both <literal>Parent</literal> and <literal>Child</literal> as entity "
+"classes with a <literal>&lt;one-to-many&gt;</literal> association from "
+"<literal>Parent</literal> to <literal>Child</literal>. The alternative "
+"approach is to declare the <literal>Child</literal> as a <literal>&lt;"
+"composite-element&gt;</literal>. The default semantics of a one-to-many "
+"association in Hibernate are much less close to the usual semantics of a "
+"parent/child relationship than those of a composite element mapping. We will "
+"explain how to use a <emphasis>bidirectional one-to-many association with "
+"cascades</emphasis> to model a parent/child relationship efficiently and "
+"elegantly."
 msgstr ""
 "刚刚接触Hibernate的人大多是从父子关系(parent / child type relationship)的建"
 "模入手的。父子关系的建模有两种方法。由于种种原因,最方便的方法是把"
@@ -54,29 +53,29 @@
 
 #. Tag: para
 #: example_parentchild.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
-"entity; never of the contained entities. This is a crucial distinction! It "
-"has the following consequences:"
+"entity and not of the contained entities. Be aware that this is a critical "
+"distinction that has the following consequences:"
 msgstr ""
 "Hibernate collections被当作其所属实体而不是其包含实体的一个逻辑部分。这非常重"
 "要!它主要体现为以下几点:"
 
 #. Tag: para
 #: example_parentchild.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"When we remove / add an object from / to a collection, the version number of "
+"When you remove/add an object from/to a collection, the version number of "
 "the collection owner is incremented."
 msgstr "当删除或增加collection中对象的时候,collection所属者的版本值会递增。"
 
 #. Tag: para
 #: example_parentchild.xml:60
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
-"type (eg, a composite element), that object will cease to be persistent and "
+"type (e.g. a composite element), that object will cease to be persistent and "
 "its state will be completely removed from the database. Likewise, adding a "
 "value type instance to the collection will cause its state to be immediately "
 "persistent."
@@ -87,14 +86,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, if an entity is removed from a collection (a one-to-many "
-"or many-to-many association), it will not be deleted, by default. This "
-"behaviour is completely consistent - a change to the internal state of "
-"another entity should not cause the associated entity to vanish! Likewise, "
-"adding an entity to a collection does not cause that entity to become "
-"persistent, by default."
+"Conversely, if an entity is removed from a collection (a one-to-many or many-"
+"to-many association), it will not be deleted by default. This behavior is "
+"completely consistent; a change to the internal state of another entity "
+"should not cause the associated entity to vanish. Likewise, adding an entity "
+"to a collection does not cause that entity to become persistent, by default."
 msgstr ""
 "另一方面,如果从一对多或多对多关联的collection中移除一个实体,在缺省情况下这"
 "个对象并不会被删除。这个行为是完全合乎逻辑的--改变一个实体的内部状态不应该"
@@ -102,13 +100,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:78
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Instead, the default behaviour is that adding an entity to a collection "
-"merely creates a link between the two entities, while removing it removes "
-"the link. This is very appropriate for all sorts of cases. Where it is not "
-"appropriate at all is the case of a parent / child relationship, where the "
-"life of the child is bound to the life cycle of the parent."
+"Adding an entity to a collection, by default, merely creates a link between "
+"the two entities. Removing the entity will remove the link. This is "
+"appropriate for all sorts of cases. However, it is not appropriate in the "
+"case of a parent/child relationship. In this case, the life of the child is "
+"bound to the life cycle of the parent."
 msgstr ""
 "实际上,向Collection增加一个实体的缺省动作只是在两个实体之间创建一个连接而"
 "已,同样移除的时候也只是删除连接。这种处理对于所有的情况都是合适的。对于父子"
@@ -140,8 +138,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:97
-#, no-c-format
-msgid "If we were to execute the following code"
+#, fuzzy, no-c-format
+msgid "If we were to execute the following code:"
 msgstr "如果我们运行下面的代码"
 
 #. Tag: programlisting
@@ -180,10 +178,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:119
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
-"literal> constraint on the <literal>parent_id</literal> column. We can fix "
+"literal> constraint on the <literal>parent_id</literal> column. You can fix "
 "the nullability constraint violation by specifying <literal>not-null=\"true"
 "\"</literal> in the collection mapping:"
 msgstr ""
@@ -209,12 +207,12 @@
 
 #. Tag: para
 #: example_parentchild.xml:130
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The underlying cause of this behaviour is that the link (the foreign key "
+"The underlying cause of this behavior is that the link (the foreign key "
 "<literal>parent_id</literal>) from <literal>p</literal> to <literal>c</"
 "literal> is not considered part of the state of the <literal>Child</literal> "
-"object and is therefore not created in the <literal>INSERT</literal>. So the "
+"object and is therefore not created in the <literal>INSERT</literal>. The "
 "solution is to make the link part of the <literal>Child</literal> mapping."
 msgstr ""
 "这种现象的根本原因是从<literal>p</literal>到<literal>c</literal>的连接(外键"
@@ -231,20 +229,20 @@
 
 #. Tag: para
 #: example_parentchild.xml:139
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"(We also need to add the <literal>parent</literal> property to the "
-"<literal>Child</literal> class.)"
+"You also need to add the <literal>parent</literal> property to the "
+"<literal>Child</literal> class."
 msgstr ""
 "(我们还需要为类<literal>Child</literal>添加<literal>parent</literal>属性)"
 
 #. Tag: para
 #: example_parentchild.xml:143
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
 "link, we tell the collection not to update the link. We use the "
-"<literal>inverse</literal> attribute."
+"<literal>inverse</literal> attribute to do this:"
 msgstr ""
 "现在实体<literal>Child</literal>在管理连接的状态,为了使collection不更新连"
 "接,我们使用<literal>inverse</literal>属性。"
@@ -261,8 +259,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:150
-#, no-c-format
-msgid "The following code would be used to add a new <literal>Child</literal>"
+#, fuzzy, no-c-format
+msgid "The following code would be used to add a new <literal>Child</literal>:"
 msgstr "下面的代码是用来添加一个新的<literal>Child</literal>"
 
 #. Tag: programlisting
@@ -279,16 +277,16 @@
 
 #. Tag: para
 #: example_parentchild.xml:156
-#, no-c-format
-msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
+#, fuzzy, no-c-format
+msgid "Only one SQL <literal>INSERT</literal> would now be issued."
 msgstr "现在,只会有一条<literal>INSERT</literal>语句被执行!"
 
 #. Tag: para
 #: example_parentchild.xml:160
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To tighten things up a bit, we could create an <literal>addChild()</literal> "
-"method of <literal>Parent</literal>."
+"You could also create an <literal>addChild()</literal> method of "
+"<literal>Parent</literal>."
 msgstr ""
 "为了让事情变得井井有条,可以为<literal>Parent</literal>加一个"
 "<literal>addChild()</literal>方法。"
@@ -305,8 +303,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:167
-#, no-c-format
-msgid "Now, the code to add a <literal>Child</literal> looks like"
+#, fuzzy, no-c-format
+msgid "The code to add a <literal>Child</literal> looks like this:"
 msgstr "现在,添加<literal>Child</literal>的代码就是这样"
 
 #. Tag: programlisting
@@ -328,10 +326,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:178
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The explicit call to <literal>save()</literal> is still annoying. We will "
-"address this by using cascades."
+"You can address the frustrations of the explicit call to <literal>save()</"
+"literal> by using cascades."
 msgstr ""
 "需要显式调用<literal>save()</literal>仍然很麻烦,我们可以用级联来解决这个问"
 "题。"
@@ -348,8 +346,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:185
-#, no-c-format
-msgid "This simplifies the code above to"
+#, fuzzy, no-c-format
+msgid "This simplifies the code above to:"
 msgstr "这样上面的代码可以简化为:"
 
 #. Tag: programlisting
@@ -364,9 +362,9 @@
 
 #. Tag: para
 #: example_parentchild.xml:191
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Similarly, we don't need to iterate over the children when saving or "
+"Similarly, we do not need to iterate over the children when saving or "
 "deleting a <literal>Parent</literal>. The following removes <literal>p</"
 "literal> and all its children from the database."
 msgstr ""
@@ -384,8 +382,8 @@
 
 #. Tag: para
 #: example_parentchild.xml:198
-#, no-c-format
-msgid "However, this code"
+#, fuzzy, no-c-format
+msgid "However, the following code:"
 msgstr "然而,这段代码"
 
 #. Tag: programlisting
@@ -401,11 +399,11 @@
 
 #. Tag: para
 #: example_parentchild.xml:204
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"will not remove <literal>c</literal> from the database; it will ony remove "
-"the link to <literal>p</literal> (and cause a <literal>NOT NULL</literal> "
-"constraint violation, in this case). You need to explicitly <literal>delete()"
+"will not remove <literal>c</literal> from the database. In this case, it "
+"will only remove the link to <literal>p</literal> and cause a <literal>NOT "
+"NULL</literal> constraint violation. You need to explicitly <literal>delete()"
 "</literal> the <literal>Child</literal>."
 msgstr ""
 "不会从数据库删除<literal>c</literal>;它只会删除与<literal>p</literal>之间的"
@@ -425,12 +423,12 @@
 
 #. Tag: para
 #: example_parentchild.xml:212
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Now, in our case, a <literal>Child</literal> can't really exist without its "
-"parent. So if we remove a <literal>Child</literal> from the collection, we "
-"really do want it to be deleted. For this, we must use <literal>cascade="
-"\"all-delete-orphan\"</literal>."
+"In our case, a <literal>Child</literal> cannot exist without its parent. So "
+"if we remove a <literal>Child</literal> from the collection, we do want it "
+"to be deleted. To do this, we must use <literal>cascade=\"all-delete-orphan"
+"\"</literal>."
 msgstr ""
 "在我们的例子中,如果没有父对象,子对象就不应该存在,如果将子对象从collection"
 "中移除,实际上我们是想删除它。要实现这种要求,就必须使用<literal>cascade="
@@ -449,13 +447,13 @@
 
 #. Tag: para
 #: example_parentchild.xml:220
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note: even though the collection mapping specifies <literal>inverse=\"true"
-"\"</literal>, cascades are still processed by iterating the collection "
-"elements. So if you require that an object be saved, deleted or updated by "
-"cascade, you must add it to the collection. It is not enough to simply call "
-"<literal>setParent()</literal>."
+"Even though the collection mapping specifies <literal>inverse=\"true\"</"
+"literal>, cascades are still processed by iterating the collection elements. "
+"If you need an object be saved, deleted or updated by cascade, you must add "
+"it to the collection. It is not enough to simply call <literal>setParent()</"
+"literal>."
 msgstr ""
 "注意:即使在collection一方的映射中指定<literal>inverse=\"true\"</literal>,级"
 "联仍然是通过遍历collection中的元素来处理的。如果你想要通过级联进行子对象的插"
@@ -472,20 +470,21 @@
 
 #. Tag: para
 #: example_parentchild.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
-"literal>, made some changes in a UI action and wish to persist these changes "
-"in a new session by calling <literal>update()</literal>. The "
-"<literal>Parent</literal> will contain a collection of childen and, since "
-"cascading update is enabled, Hibernate needs to know which children are "
-"newly instantiated and which represent existing rows in the database. Lets "
-"assume that both <literal>Parent</literal> and <literal>Child</literal> have "
-"genenerated identifier properties of type <literal>Long</literal>. Hibernate "
-"will use the identifier and version/timestamp property value to determine "
-"which of the children are new. (See <xref linkend=\"objectstate-saveorupdate"
-"\"/>.) <emphasis>In Hibernate3, it is no longer necessary to specify an "
-"<literal>unsaved-value</literal> explicitly.</emphasis>"
+"literal>, made some changes in a UI action and wanted to persist these "
+"changes in a new session by calling <literal>update()</literal>. The "
+"<literal>Parent</literal> will contain a collection of children and, since "
+"the cascading update is enabled, Hibernate needs to know which children are "
+"newly instantiated and which represent existing rows in the database. We "
+"will also assume that both <literal>Parent</literal> and <literal>Child</"
+"literal> have generated identifier properties of type <literal>Long</"
+"literal>. Hibernate will use the identifier and version/timestamp property "
+"value to determine which of the children are new. (See <xref linkend="
+"\"objectstate-saveorupdate\"/>.) <emphasis>In Hibernate3, it is no longer "
+"necessary to specify an <literal>unsaved-value</literal> explicitly.</"
+"emphasis>"
 msgstr ""
 "假设我们从<literal>Session</literal>中装入了一个<literal>Parent</literal>对"
 "象,用户界面对其进行了修改,然后希望在一个新的Session里面调用<literal>update"
@@ -500,10 +499,10 @@
 
 #. Tag: para
 #: example_parentchild.xml:244
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
-"literal> and insert <literal>newChild</literal>."
+"literal> and insert <literal>newChild</literal>:"
 msgstr ""
 "下面的代码会更新<literal>parent</literal>和<literal>child</literal>对象,并且"
 "插入<literal>newChild</literal>对象。"
@@ -522,16 +521,15 @@
 
 #. Tag: para
 #: example_parentchild.xml:251
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Well, that's all very well for the case of a generated identifier, but what "
-"about assigned identifiers and composite identifiers? This is more "
-"difficult, since Hibernate can't use the identifier property to distinguish "
-"between a newly instantiated object (with an identifier assigned by the "
-"user) and an object loaded in a previous session. In this case, Hibernate "
-"will either use the timestamp or version property, or will actually query "
-"the second-level cache or, worst case, the database, to see if the row "
-"exists."
+"This may be suitable for the case of a generated identifier, but what about "
+"assigned identifiers and composite identifiers? This is more difficult, "
+"since Hibernate cannot use the identifier property to distinguish between a "
+"newly instantiated object, with an identifier assigned by the user, and an "
+"object loaded in a previous session. In this case, Hibernate will either use "
+"the timestamp or version property, or will actually query the second-level "
+"cache or, worst case, the database, to see if the row exists."
 msgstr ""
 "这对于自动生成标识的情况是非常好的,但是自分配的标识和复合标识怎么办呢?这是"
 "有点麻烦,因为Hibernate没有办法区分新实例化的对象(标识被用户指定了)和前一个"
@@ -546,24 +544,24 @@
 
 #. Tag: para
 #: example_parentchild.xml:286
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There is quite a bit to digest here and it might look confusing first time "
-"around. However, in practice, it all works out very nicely. Most Hibernate "
-"applications use the parent / child pattern in many places."
+"The sections we have just covered can be a bit confusing. However, in "
+"practice, it all works out nicely. Most Hibernate applications use the "
+"parent/child pattern in many places."
 msgstr ""
 "这里有不少东西需要融会贯通,可能会让新手感到迷惑。但是在实践中它们都工作地非"
 "常好。大部分Hibernate应用程序都会经常用到父子对象模式。"
 
 #. Tag: para
 #: example_parentchild.xml:291
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "
 "exist in the case of <literal>&lt;composite-element&gt;</literal> mappings, "
-"which have exactly the semantics of a parent / child relationship. "
-"Unfortunately, there are two big limitations to composite element classes: "
-"composite elements may not own collections, and they should not be the child "
+"which have exactly the semantics of a parent/child relationship. "
+"Unfortunately, there are two big limitations with composite element classes: "
+"composite elements cannot own collections and they should not be the child "
 "of any entity other than the unique parent."
 msgstr ""
 "在第一段中我们曾经提到另一个方案。上面的这些问题都不会出现在<literal>&lt;"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_weblog.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_weblog.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_weblog.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,11 +24,11 @@
 
 #. Tag: para
 #: example_weblog.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The persistent classes represent a weblog, and an item posted in a weblog. "
-"They are to be modelled as a standard parent/child relationship, but we will "
-"use an ordered bag, instead of a set."
+"The persistent classes here represent a weblog and an item posted in a "
+"weblog. They are to be modelled as a standard parent/child relationship, but "
+"we will use an ordered bag, instead of a set:"
 msgstr ""
 "下面的持久化类表示一个weblog和在其中张贴的一个贴子。他们是标准的父/子关系模"
 "型,但是我们会用一个有序包(ordered bag)而非集合(set)。"
@@ -124,8 +124,8 @@
 
 #. Tag: para
 #: example_weblog.xml:49
-#, no-c-format
-msgid "The XML mappings should now be quite straightforward."
+#, fuzzy, no-c-format
+msgid "The XML mappings are now straightforward. For example:"
 msgstr "下列的XML映射应该是很直白的。"
 
 #. Tag: programlisting
@@ -230,10 +230,10 @@
 
 #. Tag: para
 #: example_weblog.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
-"these classes, using Hibernate."
+"these classes using Hibernate:"
 msgstr "下面的类演示了我们可以使用Hibernate对这些类进行的一些操作。"
 
 #. Tag: programlisting

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,11 +18,11 @@
 
 #. Tag: para
 #: filters.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
 "\"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global, "
-"named, parameterized filter that may be enabled or disabled for a particular "
+"named, parameterized filter that can be enabled or disabled for a particular "
 "Hibernate session."
 msgstr ""
 "Hibernate3 提供了一种创新的方式来处理具有“显性(visibility)”规则的数据,那就是"
@@ -38,16 +38,16 @@
 
 #. Tag: para
 #: filters.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 adds the ability to pre-define filter criteria and attach those "
-"filters at both a class and a collection level. A filter criteria is the "
-"ability to define a restriction clause very similiar to the existing \"where"
-"\" attribute available on the class and various collection elements. Except "
-"these filter conditions can be parameterized. The application can then make "
-"the decision at runtime whether given filters should be enabled and what "
-"their parameter values should be. Filters can be used like database views, "
-"but parameterized inside the application."
+"Hibernate3 has the ability to pre-define filter criteria and attach those "
+"filters at both a class level and a collection level. A filter criteria "
+"allows you to define a restriction clause similar to the existing \"where\" "
+"attribute available on the class and various collection elements. These "
+"filter conditions, however, can be parameterized. The application can then "
+"decide at runtime whether certain filters should be enabled and what their "
+"parameter values should be. Filters can be used like database views, but "
+"they are parameterized inside the application."
 msgstr ""
 "Hibernate3新增了对某个类或者集合使用预先定义的过滤器条件(filter criteria)的功"
 "能。过滤器条件相当于定义一个 非常类似于类和各种集合上的“where”属性的约束子"
@@ -79,8 +79,8 @@
 
 #. Tag: para
 #: filters.xml:58
-#, no-c-format
-msgid "Then, this filter can be attached to a class:"
+#, fuzzy, no-c-format
+msgid "This filter can then be attached to a class:"
 msgstr "定义好之后,就可以在某个类中使用这个过滤器:"
 
 #. Tag: programlisting
@@ -96,8 +96,8 @@
 
 #. Tag: para
 #: filters.xml:64
-#, no-c-format
-msgid "or, to a collection:"
+#, fuzzy, no-c-format
+msgid "Or, to a collection:"
 msgstr "也可以在某个集合使用它:"
 
 #. Tag: programlisting
@@ -112,8 +112,8 @@
 
 #. Tag: para
 #: filters.xml:70
-#, no-c-format
-msgid "or, even to both (or multiples of each) at the same time."
+#, fuzzy, no-c-format
+msgid "Or, to both or multiples of each at the same time."
 msgstr ""
 "可以在多个类或集合中使用某个过滤器;某个类或者集合中也可以使用多个过滤器。"
 
@@ -124,11 +124,11 @@
 "The methods on <literal>Session</literal> are: <literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
 "literal>, and <literal>disableFilter(String filterName)</literal>. By "
-"default, filters are <emphasis>not</emphasis> enabled for a given session; "
-"they must be explcitly enabled through use of the <literal>Session."
-"enableFilter()</literal> method, which returns an instance of the "
-"<literal>Filter</literal> interface. Using the simple filter defined above, "
-"this would look like:"
+"default, filters are <emphasis>not</emphasis> enabled for a given session. "
+"Filters must be enabled through use of the <literal>Session.enableFilter()</"
+"literal> method, which returns an instance of the <literal>Filter</literal> "
+"interface. If you used the simple filter defined above, it would look like "
+"this:"
 msgstr ""
 "<literal>Session</literal>对象中会用到的方法有:<literal>enableFilter(String "
 "filterName)</literal>, <literal>getEnabledFilter(String filterName)</"
@@ -147,19 +147,20 @@
 
 #. Tag: para
 #: filters.xml:85
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that methods on the org.hibernate.Filter interface do allow the method-"
-"chaining common to much of Hibernate."
+"Methods on the org.hibernate.Filter interface do allow the method-chaining "
+"common to much of Hibernate."
 msgstr ""
 "注意,org.hibernate.Filter的方法允许链式方法调用。(类似上面例子中启用Filter"
 "之后设定Filter参数这个“方法链”) Hibernate的其他部分也大多有这个特性。"
 
 #. Tag: para
 #: filters.xml:89
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A full example, using temporal data with an effective record date pattern:"
+"The following is a full example, using temporal data with an effective "
+"record date pattern:"
 msgstr "下面是一个比较完整的例子,使用了记录生效日期模式过滤有时效的数据:"
 
 #. Tag: programlisting
@@ -202,11 +203,10 @@
 
 #. Tag: para
 #: filters.xml:95
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Then, in order to ensure that you always get back currently effective "
-"records, simply enable the filter on the session prior to retrieving "
-"employee data:"
+"In order to ensure that you are provided with currently effective records, "
+"enable the filter on the session prior to retrieving employee data:"
 msgstr ""
 "定义好后,如果想要保证取回的都是目前处于生效期的记录,只需在获取雇员数据的操"
 "作之前先开启过滤器即可:"
@@ -227,24 +227,24 @@
 
 #. Tag: para
 #: filters.xml:102
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In the HQL above, even though we only explicitly mentioned a salary "
-"constraint on the results, because of the enabled filter the query will "
-"return only currently active employees who have a salary greater than a "
-"million dollars."
+"Even though a salary constraint was mentioned explicitly on the results in "
+"the above HQL, because of the enabled filter, the query will return only "
+"currently active employees who have a salary greater than one million "
+"dollars."
 msgstr ""
 "在上面的HQL中,虽然我们仅仅显式的使用了一个薪水条件,但因为启用了过滤器,查询"
 "将仅返回那些目前雇用 关系处于生效期的,并且薪水高于一百万美刀的雇员的数据。"
 
 #. Tag: para
 #: filters.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note: if you plan on using filters with outer joining (either through HQL or "
-"load fetching) be careful of the direction of the condition expression. Its "
-"safest to set this up for left outer joining; in general, place the "
-"parameter first followed by the column name(s) after the operator."
+"If you want to use filters with outer joining, either through HQL or load "
+"fetching, be careful of the direction of the condition expression. It is "
+"safest to set this up for left outer joining. Place the parameter first "
+"followed by the column name(s) after the operator."
 msgstr ""
 "注意:如果你打算在使用外连接(或者通过HQL或load fetching)的同时使用过滤器,"
 "要注意条件表达式的方向(左还是右)。 最安全的方式是使用左外连接(left outer "
@@ -252,13 +252,13 @@
 
 #. Tag: para
 #: filters.xml:115
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"After being defined a filter might be attached to multiple entities and/or "
-"collections each with its own condition. That can be tedious when the "
-"conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</"
-"literal> allows defining a default condition, either as an attribute or "
-"CDATA:"
+"After being defined, a filter might be attached to multiple entities and/or "
+"collections each with its own condition. This can be problematic when the "
+"conditions are the same each time. Using <literal>&lt;filter-def/&gt;</"
+"literal> allows you to definine a default condition, either as an attribute "
+"or CDATA:"
 msgstr ""
 "在Filter定义之后,它可能被附加到多个实体和/或集合类,每个都有自己的条件。假若这"
 "些条件都是一样的,每次都要定义就显得很繁琐。因此,<literal>&lt;filter-def/"
@@ -275,12 +275,12 @@
 
 #. Tag: para
 #: filters.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This default condition will then be used whenever the filter is attached to "
-"something without specifying a condition. Note that this means you can give "
-"a specific condition as part of the attachment of the filter which overrides "
-"the default condition in that particular case."
+"This default condition will be used whenever the filter is attached to "
+"something without specifying a condition. This means you can give a specific "
+"condition as part of the attachment of the filter that overrides the default "
+"condition in that particular case."
 msgstr ""
 "当这个filter被附加到任何目的地,而又没有指明条件时,这个条件就会被使用。注"
 "意,换句话说,你可以通过给filter附加特别的条件来重载默认条件。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/inheritance_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/inheritance_mapping.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/inheritance_mapping.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,14 +12,14 @@
 
 #. Tag: title
 #: inheritance_mapping.xml:29
-#, no-c-format
-msgid "Inheritance Mapping"
+#, fuzzy, no-c-format
+msgid "Inheritance mapping"
 msgstr "继承映射(Inheritance Mappings)"
 
 #. Tag: title
 #: inheritance_mapping.xml:32
-#, no-c-format
-msgid "The Three Strategies"
+#, fuzzy, no-c-format
+msgid "The three strategies"
 msgstr "三种策略"
 
 #. Tag: para
@@ -66,18 +66,18 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
-"the same inheritance hierarchy, and then make use of implicit polymorphism "
-"to achieve polymorphism across the whole hierarchy. However, Hibernate does "
-"not support mixing <literal>&lt;subclass&gt;</literal>, and <literal>&lt;"
-"joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;</literal> "
-"mappings under the same root <literal>&lt;class&gt;</literal> element. It is "
-"possible to mix together the table per hierarchy and table per subclass "
-"strategies, under the the same <literal>&lt;class&gt;</literal> element, by "
-"combining the <literal>&lt;subclass&gt;</literal> and <literal>&lt;join&gt;</"
-"literal> elements (see below)."
+"the same inheritance hierarchy. You can then make use of implicit "
+"polymorphism to achieve polymorphism across the whole hierarchy. However, "
+"Hibernate does not support mixing <literal>&lt;subclass&gt;</literal>, "
+"<literal>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-"
+"subclass&gt;</literal> mappings under the same root <literal>&lt;class&gt;</"
+"literal> element. It is possible to mix together the table per hierarchy and "
+"table per subclass strategies under the the same <literal>&lt;class&gt;</"
+"literal> element, by combining the <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal> elements (see below for an example)."
 msgstr ""
 "对于同一个继承层次内的不同分支,可以采用不同的映射策略,然后用隐式多 态来完成"
 "跨越整个层次的多态。但是在同一个<literal>&lt;class&gt;</literal>根元素 下,"
@@ -90,18 +90,18 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
 "subclass</literal>, and <literal>joined-subclass</literal> mappings in "
-"separate mapping documents, directly beneath <literal>hibernate-mapping</"
-"literal>. This allows you to extend a class hierachy just by adding a new "
+"separate mapping documents directly beneath <literal>hibernate-mapping</"
+"literal>. This allows you to extend a class hierarchy by adding a new "
 "mapping file. You must specify an <literal>extends</literal> attribute in "
-"the subclass mapping, naming a previously mapped superclass. Note: "
-"Previously this feature made the ordering of the mapping documents "
-"important. Since Hibernate3, the ordering of mapping files does not matter "
-"when using the extends keyword. The ordering inside a single mapping file "
-"still needs to be defined as superclasses before subclasses."
+"the subclass mapping, naming a previously mapped superclass. Previously this "
+"feature made the ordering of the mapping documents important. Since "
+"Hibernate3, the ordering of mapping files is irrelevant when using the "
+"extends keyword. The ordering inside a single mapping file still needs to be "
+"defined as superclasses before subclasses."
 msgstr ""
 "在多个映射文件中,可以直接在<literal>hibernate-mapping</literal>根下定义"
 "<literal>subclass</literal>,<literal>union-subclass</literal>和"
@@ -132,12 +132,12 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:100
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we have an interface <literal>Payment</literal>, with implementors "
-"<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, "
-"<literal>ChequePayment</literal>. The table per hierarchy mapping would look "
-"like:"
+"Suppose we have an interface <literal>Payment</literal> with the "
+"implementors <literal>CreditCardPayment</literal>, <literal>CashPayment</"
+"literal>, and <literal>ChequePayment</literal>. The table per hierarchy "
+"mapping would display in the following way:"
 msgstr ""
 "假设我们有接口<literal>Payment</literal>和它的几个实现类: "
 "<literal>CreditCardPayment</literal>, <literal>CashPayment</literal>, 和"
@@ -170,11 +170,11 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:109
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Exactly one table is required. There is one big limitation of this mapping "
+"Exactly one table is required. There is a limitation of this mapping "
 "strategy: columns declared by the subclasses, such as <literal>CCTYPE</"
-"literal>, may not have <literal>NOT NULL</literal> constraints."
+"literal>, cannot have <literal>NOT NULL</literal> constraints."
 msgstr ""
 "采用这种策略只需要一张表即可。它有一个很大的限制:要求那些由子类定义的字段, "
 "如<literal>CCTYPE</literal>,不能有<literal>非空(NOT NULL)</literal>约束。"
@@ -187,8 +187,8 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:120
-#, no-c-format
-msgid "A table per subclass mapping would look like:"
+#, fuzzy, no-c-format
+msgid "A table per subclass mapping looks like this:"
 msgstr "对于上例中的几个类而言,采用“每个子类一张表”的映射策略,代码如下所示:"
 
 #. Tag: programlisting
@@ -219,32 +219,32 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:126
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
-"associations to the superclass table (so the relational model is actually a "
-"one-to-one association)."
+"associations to the superclass table so the relational model is actually a "
+"one-to-one association."
 msgstr ""
 "需要四张表。三个子类表通过主键关联到超类表(因而关系模型实际上是一对一关联)。"
 
 #. Tag: title
 #: inheritance_mapping.xml:135
-#, no-c-format
-msgid "Table per subclass, using a discriminator"
+#, fuzzy, no-c-format
+msgid "Table per subclass: using a discriminator"
 msgstr "每个子类一张表(Table per subclass),使用辨别标志(Discriminator)"
 
 #. Tag: para
 #: inheritance_mapping.xml:137
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate's implementation of table per subclass requires no "
+"Hibernate's implementation of table per subclass does not require a "
 "discriminator column. Other object/relational mappers use a different "
-"implementation of table per subclass which requires a type discriminator "
+"implementation of table per subclass that requires a type discriminator "
 "column in the superclass table. The approach taken by Hibernate is much more "
-"difficult to implement but arguably more correct from a relational point of "
-"view. If you would like to use a discriminator column with the table per "
-"subclass strategy, you may combine the use of <literal>&lt;subclass&gt;</"
-"literal> and <literal>&lt;join&gt;</literal>, as follow:"
+"difficult to implement, but arguably more correct from a relational point of "
+"view. If you want to use a discriminator column with the table per subclass "
+"strategy, you can combine the use of <literal>&lt;subclass&gt;</literal> and "
+"<literal>&lt;join&gt;</literal>, as follows:"
 msgstr ""
 "注意,对“每个子类一张表”的映射策略,Hibernate的实现不需要辨别字段,而其他 的"
 "对象/关系映射工具使用了一种不同于Hibernate的实现方法,该方法要求在超类 表中有"
@@ -306,10 +306,10 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:162
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may even mix the table per hierarchy and table per subclass strategies "
-"using this approach:"
+"You can even mix the table per hierarchy and table per subclass strategies "
+"using the following approach:"
 msgstr ""
 "你甚至可以采取如下方法混和使用“每个类分层结构一张表”和“每个子类一张表”这两种"
 "策略:"
@@ -367,10 +367,10 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:182
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are two ways we could go about mapping the table per concrete class "
-"strategy. The first is to use <literal>&lt;union-subclass&gt;</literal>."
+"There are two ways we can map the table per concrete class strategy. First, "
+"you can use <literal>&lt;union-subclass&gt;</literal>."
 msgstr ""
 "对于“每个具体类一张表”的映射策略,可以采用两种方法。第一种方法是使用 "
 "<literal>&lt;union-subclass&gt;</literal>。"
@@ -410,13 +410,13 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:194
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
-"superclass, the column name must be the same on all subclass tables. (We "
-"might relax this in a future release of Hibernate.) The identity generator "
-"strategy is not allowed in union subclass inheritance, indeed the primary "
-"key seed has to be shared accross all unioned subclasses of a hierarchy."
+"superclass, the column name must be the same on all subclass tables. The "
+"identity generator strategy is not allowed in union subclass inheritance. "
+"The primary key seed has to be shared across all unioned subclasses of a "
+"hierarchy."
 msgstr ""
 "这种方式的局限在于,如果一个属性在超类中做了映射,其字段名必须与所有子类 表中"
 "定义的相同。(我们可能会在Hibernate的后续发布版本中放宽此限制。) 不允许在联合"
@@ -426,12 +426,12 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:203
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
-"literal>. Of course, if it is not abstract, an additional table (defaults to "
-"<literal>PAYMENT</literal> in the example above) is needed to hold instances "
-"of the superclass."
+"literal>. If it is not abstract, an additional table (it defaults to "
+"<literal>PAYMENT</literal> in the example above), is needed to hold "
+"instances of the superclass."
 msgstr ""
 "假若超类是抽象类,请使用<literal>abstract=\"true\"</literal>。当然,假若它不"
 "是抽象的,需要一个额外的表(上面的例子中,默认是<literal>PAYMENT</"
@@ -439,8 +439,8 @@
 
 #. Tag: title
 #: inheritance_mapping.xml:213
-#, no-c-format
-msgid "Table per concrete class, using implicit polymorphism"
+#, fuzzy, no-c-format
+msgid "Table per concrete class using implicit polymorphism"
 msgstr "每个具体类一张表,使用隐式多态"
 
 #. Tag: para
@@ -480,14 +480,14 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:221
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Notice that nowhere do we mention the <literal>Payment</literal> interface "
+"Notice that the <literal>Payment</literal> interface is not mentioned "
 "explicitly. Also notice that properties of <literal>Payment</literal> are "
 "mapped in each of the subclasses. If you want to avoid duplication, consider "
-"using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYSTEM "
+"using XML entities (for example, <literal>[ &lt;!ENTITY allproperties SYSTEM "
 "\"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> "
-"declartion and <literal>&amp;allproperties;</literal> in the mapping)."
+"declaration and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 "注意,我们没有在任何地方明确的提及接口<literal>Payment</literal>。同时注意 "
 "<literal>Payment</literal>的属性在每个子类中都进行了映射。如果你想避免重复, "
@@ -536,14 +536,13 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:248
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There is one further thing to notice about this mapping. Since the "
-"subclasses are each mapped in their own <literal>&lt;class&gt;</literal> "
-"element (and since <literal>Payment</literal> is just an interface), each of "
-"the subclasses could easily be part of another inheritance hierarchy! (And "
-"you can still use polymorphic queries against the <literal>Payment</literal> "
-"interface.)"
+"Since the subclasses are each mapped in their own <literal>&lt;class&gt;</"
+"literal> element, and since <literal>Payment</literal> is just an "
+"interface), each of the subclasses could easily be part of another "
+"inheritance hierarchy. You can still use polymorphic queries against the "
+"<literal>Payment</literal> interface."
 msgstr ""
 "对这一映射还有一点需要注意。因为每个子类都在各自独立的元素<literal>&lt;"
 "class&gt;</literal> 中映射(并且<literal>Payment</literal>只是一个接口),每个"
@@ -585,14 +584,14 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:258
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Once again, we don't mention <literal>Payment</literal> explicitly. If we "
-"execute a query against the <literal>Payment</literal> interface - for "
-"example, <literal>from Payment</literal> - Hibernate automatically returns "
+"Once again, <literal>Payment</literal> is not mentioned explicitly. If we "
+"execute a query against the <literal>Payment</literal> interface, for "
+"example <literal>from Payment</literal>, Hibernate automatically returns "
 "instances of <literal>CreditCardPayment</literal> (and its subclasses, since "
 "they also implement <literal>Payment</literal>), <literal>CashPayment</"
-"literal> and <literal>ChequePayment</literal> but not instances of "
+"literal> and <literal>ChequePayment</literal>, but not instances of "
 "<literal>NonelectronicTransaction</literal>."
 msgstr ""
 "我们还是没有明确的提到<literal>Payment</literal>。 如果我们针对接口"
@@ -610,12 +609,11 @@
 
 #. Tag: para
 #: inheritance_mapping.xml:275
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are certain limitations to the \"implicit polymorphism\" approach to "
-"the table per concrete-class mapping strategy. There are somewhat less "
-"restrictive limitations to <literal>&lt;union-subclass&gt;</literal> "
-"mappings."
+"There are limitations to the \"implicit polymorphism\" approach to the table "
+"per concrete-class mapping strategy. There are somewhat less restrictive "
+"limitations to <literal>&lt;union-subclass&gt;</literal> mappings."
 msgstr ""
 "对“每个具体类映射一张表”(table per concrete-class)的映射策略而言,隐式多态"
 "的 方式有一定的限制。而<literal>&lt;union-subclass&gt;</literal>映射的限制则"
@@ -636,122 +634,122 @@
 msgstr "继承映射特性(Features of inheritance mappings)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "继承策略(Inheritance strategy)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:301
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "多态多对一"
 
 #. Tag: entry
-#: inheritance_mapping.xml:302
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "多态一对一"
 
 #. Tag: entry
-#: inheritance_mapping.xml:303
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "多态一对多"
 
 #. Tag: entry
-#: inheritance_mapping.xml:304
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "多态多对多"
 
 #. Tag: entry
-#: inheritance_mapping.xml:305
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:306
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "多态查询"
 
 #. Tag: entry
-#: inheritance_mapping.xml:307
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "多态连接(join)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:308
+#: inheritance_mapping.xml:309
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "外连接(Outer join)读取"
 
 #. Tag: entry
-#: inheritance_mapping.xml:313
+#: inheritance_mapping.xml:314
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "每个类分层结构一张表"
 
 #. Tag: literal
-#: inheritance_mapping.xml:314 inheritance_mapping.xml:325
-#: inheritance_mapping.xml:336
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr "&lt;many-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:315 inheritance_mapping.xml:326
-#: inheritance_mapping.xml:337
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr "&lt;one-to-one&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
 #, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr "&lt;one-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:317 inheritance_mapping.xml:328
-#: inheritance_mapping.xml:339
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr "&lt;many-to-many&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:318 inheritance_mapping.xml:329
-#: inheritance_mapping.xml:340
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341
 #, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr "s.get(Payment.class, id)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:319 inheritance_mapping.xml:330
-#: inheritance_mapping.xml:341 inheritance_mapping.xml:352
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342 inheritance_mapping.xml:353
 #, no-c-format
 msgid "from Payment p"
 msgstr "from Payment p"
 
 #. Tag: literal
-#: inheritance_mapping.xml:320 inheritance_mapping.xml:331
-#: inheritance_mapping.xml:342
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "from Order o join o.payment p"
 msgstr "from Order o join o.payment p"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:321 inheritance_mapping.xml:332
-#: inheritance_mapping.xml:343
+#: inheritance_mapping.xml:322 inheritance_mapping.xml:333
+#: inheritance_mapping.xml:344
 #, no-c-format
 msgid "supported"
 msgstr "支持"
 
 #. Tag: entry
-#: inheritance_mapping.xml:324
+#: inheritance_mapping.xml:325
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -761,13 +759,13 @@
 "每个子类一张表"
 
 #. Tag: entry
-#: inheritance_mapping.xml:335
+#: inheritance_mapping.xml:336
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "每个具体类一张表(union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:338
+#: inheritance_mapping.xml:339
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -775,32 +773,32 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:346
+#: inheritance_mapping.xml:347
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "每个具体类一张表(隐式多态)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:347
+#: inheritance_mapping.xml:348
 #, no-c-format
 msgid "&lt;any&gt;"
 msgstr "&lt;any&gt;"
 
 #. Tag: emphasis
-#: inheritance_mapping.xml:348 inheritance_mapping.xml:349
-#: inheritance_mapping.xml:353 inheritance_mapping.xml:354
+#: inheritance_mapping.xml:349 inheritance_mapping.xml:350
+#: inheritance_mapping.xml:354 inheritance_mapping.xml:355
 #, no-c-format
 msgid "not supported"
 msgstr "不支持"
 
 #. Tag: literal
-#: inheritance_mapping.xml:350
+#: inheritance_mapping.xml:351
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:351
+#: inheritance_mapping.xml:352
 #, no-c-format
 msgid ""
 "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).uniqueResult()"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,12 +24,12 @@
 
 #. Tag: para
 #: performance.xml:34
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
-"for retrieving associated objects if the application needs to navigate the "
-"association. Fetch strategies may be declared in the O/R mapping metadata, "
-"or over-ridden by a particular HQL or <literal>Criteria</literal> query."
+"Hibernate uses a <emphasis>fetching strategy</emphasis> to retrieve "
+"associated objects if the application needs to navigate the association. "
+"Fetch strategies can be declared in the O/R mapping metadata, or over-ridden "
+"by a particular HQL or <literal>Criteria</literal> query."
 msgstr ""
 "<emphasis>抓取策略(fetching strategy)</emphasis> 是指:当应用程序需要在"
 "(Hibernate实体对象图的)关联关系间进行导航的时候, Hibernate如何获取关联对象"
@@ -44,9 +44,9 @@
 
 #. Tag: para
 #: performance.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
+"<emphasis>Join fetching</emphasis>: Hibernate retrieves the associated "
 "instance or collection in the same <literal>SELECT</literal>, using an "
 "<literal>OUTER JOIN</literal>."
 msgstr ""
@@ -56,12 +56,12 @@
 
 #. Tag: para
 #: performance.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
+"<emphasis>Select fetching</emphasis>: a second <literal>SELECT</literal> is "
 "used to retrieve the associated entity or collection. Unless you explicitly "
 "disable lazy fetching by specifying <literal>lazy=\"false\"</literal>, this "
-"second select will only be executed when you actually access the association."
+"second select will only be executed when you access the association."
 msgstr ""
 "<emphasis>查询抓取(Select fetching)</emphasis> - 另外发送一条 "
 "<literal>SELECT</literal> 语句抓取当前对象的关联实体或集合。除非你显式的指定"
@@ -70,13 +70,13 @@
 
 #. Tag: para
 #: performance.xml:63
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
+"<emphasis>Subselect fetching</emphasis>: a second <literal>SELECT</literal> "
 "is used to retrieve the associated collections for all entities retrieved in "
 "a previous query or fetch. Unless you explicitly disable lazy fetching by "
 "specifying <literal>lazy=\"false\"</literal>, this second select will only "
-"be executed when you actually access the association."
+"be executed when you access the association."
 msgstr ""
 "<emphasis>子查询抓取(Subselect fetching)</emphasis> - 另外发送一条"
 "<literal>SELECT</literal> 语句抓取在前面查询到(或者抓取到)的所有实体对象的"
@@ -86,11 +86,11 @@
 
 #. Tag: para
 #: performance.xml:72
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
-"fetching - Hibernate retrieves a batch of entity instances or collections in "
-"a single <literal>SELECT</literal>, by specifying a list of primary keys or "
+"<emphasis>Batch fetching</emphasis>: an optimization strategy for select "
+"fetching. Hibernate retrieves a batch of entity instances or collections in "
+"a single <literal>SELECT</literal> by specifying a list of primary or "
 "foreign keys."
 msgstr ""
 "<emphasis>批量抓取(Batch fetching)</emphasis> - 对查询抓取的优化方案, 通过"
@@ -105,33 +105,33 @@
 
 #. Tag: para
 #: performance.xml:87
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Immediate fetching</emphasis> - an association, collection or "
-"attribute is fetched immediately, when the owner is loaded."
+"<emphasis>Immediate fetching</emphasis>: an association, collection or "
+"attribute is fetched immediately when the owner is loaded."
 msgstr ""
 "<emphasis>Immediate fetching,立即抓取</emphasis> - 当宿主被加载时,关联、集"
 "合或属性被立即抓取。"
 
 #. Tag: para
 #: performance.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
-"the application invokes an operation upon that collection. (This is the "
-"default for collections.)"
+"<emphasis>Lazy collection fetching</emphasis>: a collection is fetched when "
+"the application invokes an operation upon that collection. This is the "
+"default for collections."
 msgstr ""
 "<emphasis>Lazy collection fetching,延迟集合抓取</emphasis>- 直到应用程序对集"
 "合进行了一次操作时,集合才被抓取。(对集合而言这是默认行为。)"
 
 #. Tag: para
 #: performance.xml:100
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
-"elements of the collection are accessed from the database as needed. "
-"Hibernate tries not to fetch the whole collection into memory unless "
-"absolutely needed (suitable for very large collections)"
+"<emphasis>\"Extra-lazy\" collection fetching</emphasis>: individual elements "
+"of the collection are accessed from the database as needed. Hibernate tries "
+"not to fetch the whole collection into memory unless absolutely needed. It "
+"is suitable for large collections."
 msgstr ""
 "<emphasis>\"Extra-lazy\" collection fetching,\"Extra-lazy\"集合抓取</"
 "emphasis> -对集合类中的每个元素而言,都是直到需要时才去访问数据库。除非绝对必"
@@ -139,9 +139,9 @@
 
 #. Tag: para
 #: performance.xml:108
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
+"<emphasis>Proxy fetching</emphasis>: a single-valued association is fetched "
 "when a method other than the identifier getter is invoked upon the "
 "associated object."
 msgstr ""
@@ -150,14 +150,14 @@
 
 #. Tag: para
 #: performance.xml:115
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
+"<emphasis>\"No-proxy\" fetching</emphasis>: a single-valued association is "
 "fetched when the instance variable is accessed. Compared to proxy fetching, "
-"this approach is less lazy (the association is fetched even when only the "
-"identifier is accessed) but more transparent, since no proxy is visible to "
-"the application. This approach requires buildtime bytecode instrumentation "
-"and is rarely necessary."
+"this approach is less lazy; the association is fetched even when only the "
+"identifier is accessed. It is also more transparent, since no proxy is "
+"visible to the application. This approach requires buildtime bytecode "
+"instrumentation and is rarely necessary."
 msgstr ""
 "<emphasis>\"No-proxy\" fetching,非代理抓取</emphasis> - 对返回单值的关联而"
 "言,当实例变量被访问的时候进行抓取。与上面的代理抓取相比,这种方法没有那么“延"
@@ -167,9 +167,9 @@
 
 #. Tag: para
 #: performance.xml:125
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
+"<emphasis>Lazy attribute fetching</emphasis>: an attribute or single valued "
 "association is fetched when the instance variable is accessed. This approach "
 "requires buildtime bytecode instrumentation and is rarely necessary."
 msgstr ""
@@ -179,13 +179,14 @@
 
 #. Tag: para
 #: performance.xml:134
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
-"association fetched, and <emphasis>how</emphasis> is it fetched (what SQL is "
-"used). Don't confuse them! We use <literal>fetch</literal> to tune "
-"performance. We may use <literal>lazy</literal> to define a contract for "
-"what data is always available in any detached instance of a particular class."
+"association fetched and <emphasis>how</emphasis> is it fetched. It is "
+"important that you do not confuse them. We use <literal>fetch</literal> to "
+"tune performance. We can use <literal>lazy</literal> to define a contract "
+"for what data is always available in any detached instance of a particular "
+"class."
 msgstr ""
 "这里有两个正交的概念:关联<emphasis>何时</emphasis>被抓取,以及被<emphasis>如"
 "何</emphasis>抓取(会采用什么样的SQL语句)。不要混淆它们!我们使用<literal>抓"
@@ -200,23 +201,22 @@
 
 #. Tag: para
 #: performance.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
 "proxy fetching for single-valued associations. These defaults make sense for "
-"almost all associations in almost all applications."
+"most associations in the majority of applications."
 msgstr ""
 "默认情况下,Hibernate 3对集合使用延迟select抓取,对返回单值的关联使用延迟代理"
 "抓取。对几乎是所有的应用而言,其绝大多数的关联,这种策略都是有效的。"
 
 #. Tag: para
 #: performance.xml:151
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Note:</emphasis> if you set <literal>hibernate."
-"default_batch_fetch_size</literal>, Hibernate will use the batch fetch "
-"optimization for lazy fetching (this optimization may also be enabled at a "
-"more granular level)."
+"If you set <literal>hibernate.default_batch_fetch_size</literal>, Hibernate "
+"will use the batch fetch optimization for lazy fetching. This optimization "
+"can also be enabled at a more granular level."
 msgstr ""
 "<emphasis>注意:</emphasis>假若你设置了<literal>hibernate."
 "default_batch_fetch_size</literal>,Hibernate会对延迟加载采取批量抓取优化措施"
@@ -224,11 +224,10 @@
 
 #. Tag: para
 #: performance.xml:158
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"However, lazy fetching poses one problem that you must be aware of. Access "
-"to a lazy association outside of the context of an open Hibernate session "
-"will result in an exception. For example:"
+"Please be aware that access to a lazy association outside of the context of "
+"an open Hibernate session will result in an exception. For example:"
 msgstr ""
 "然而,你必须了解延迟抓取带来的一个问题。在一个打开的Hibernate session上下文之"
 "外调用延迟集合会导致一次意外。比如:"
@@ -252,13 +251,13 @@
 
 #. Tag: para
 #: performance.xml:166
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
 "<literal>Session</literal> was closed, the collection will not be able to "
 "load its state. <emphasis>Hibernate does not support lazy initialization for "
-"detached objects</emphasis>. The fix is to move the code that reads from the "
-"collection to just before the transaction is committed."
+"detached objects</emphasis>. This can be fixed by moving the code that reads "
+"from the collection to just before the transaction is committed."
 msgstr ""
 "在<literal>Session</literal>关闭后,permessions集合将是未实例化的、不再可用,"
 "因此无法正常载入其状态。 <emphasis>Hibernate对脱管对象不支持延迟实例化</"
@@ -267,14 +266,14 @@
 
 #. Tag: para
 #: performance.xml:174
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, we could use a non-lazy collection or association, by "
+"Alternatively, you can use a non-lazy collection or association, by "
 "specifying <literal>lazy=\"false\"</literal> for the association mapping. "
 "However, it is intended that lazy initialization be used for almost all "
 "collections and associations. If you define too many non-lazy associations "
-"in your object model, Hibernate will end up needing to fetch the entire "
-"database into memory in every transaction!"
+"in your object model, Hibernate will fetch the entire database into memory "
+"in every transaction."
 msgstr ""
 "除此之外,通过对关联映射指定<literal>lazy=\"false\"</literal>,我们也可以使用"
 "非延迟的集合或关联。但是, 对绝大部分集合来说,更推荐使用延迟方式抓取数据。如"
@@ -283,13 +282,13 @@
 
 #. Tag: para
 #: performance.xml:183
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"On the other hand, we often want to choose join fetching (which is non-lazy "
-"by nature) instead of select fetching in a particular transaction. We'll now "
-"see how to customize the fetching strategy. In Hibernate3, the mechanisms "
-"for choosing a fetch strategy are identical for single-valued associations "
-"and collections."
+"On the other hand, you can use join fetching, which is non-lazy by nature, "
+"instead of select fetching in a particular transaction. We will now explain "
+"how to customize the fetching strategy. In Hibernate3, the mechanisms for "
+"choosing a fetch strategy are identical for single-valued associations and "
+"collections."
 msgstr ""
 "但是,另一方面,在一些特殊的事务中,我们也经常需要使用到连接抓取(它本身上就"
 "是非延迟的),以代替查询抓取。 下面我们将会很快明白如何具体的定制Hibernate中"
@@ -364,10 +363,10 @@
 
 #. Tag: para
 #: performance.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"No matter what fetching strategy you use, the defined non-lazy graph is "
-"guaranteed to be loaded into memory. Note that this might result in several "
+"Irrespective of the fetching strategy you use, the defined non-lazy graph is "
+"guaranteed to be loaded into memory. This might, however, result in several "
 "immediate selects being used to execute a particular HQL query."
 msgstr ""
 "不管你使用哪种抓取策略,定义为非延迟的类图会被保证一定装载入内存。注意这可能"
@@ -375,10 +374,10 @@
 
 #. Tag: para
 #: performance.xml:238
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Usually, we don't use the mapping document to customize fetching. Instead, "
-"we keep the default behavior, and override it for a particular transaction, "
+"Usually, the mapping document is not used to customize fetching. Instead, we "
+"keep the default behavior, and override it for a particular transaction, "
 "using <literal>left join fetch</literal> in HQL. This tells Hibernate to "
 "fetch the association eagerly in the first select, using an outer join. In "
 "the <literal>Criteria</literal> query API, you would use "
@@ -392,11 +391,11 @@
 
 #. Tag: para
 #: performance.xml:247
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you ever feel like you wish you could change the fetching strategy used "
-"by <literal>get()</literal> or <literal>load()</literal>, simply use a "
-"<literal>Criteria</literal> query, for example:"
+"If you want to change the fetching strategy used by <literal>get()</literal> "
+"or <literal>load()</literal>, you can use a <literal>Criteria</literal> "
+"query. For example:"
 msgstr ""
 "也许你喜欢仅仅通过条件查询,就可以改变<literal>get()</literal> 或 "
 "<literal>load()</literal>语句中的数据抓取策略。例如:"
@@ -413,18 +412,18 @@
 
 #. Tag: para
 #: performance.xml:255
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
-"plan\".)"
+"This is Hibernate's equivalent of what some ORM solutions call a \"fetch plan"
+"\"."
 msgstr ""
 "(这就是其他ORM解决方案的“抓取计划(fetch plan)”在Hibernate中的等价物。)"
 
 #. Tag: para
 #: performance.xml:259
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A completely different way to avoid problems with N+1 selects is to use the "
+"A completely different approach to problems with N+1 selects is to use the "
 "second-level cache."
 msgstr "截然不同的一种避免N+1次查询的方法是,使用二级缓存。"
 
@@ -436,14 +435,14 @@
 
 #. Tag: para
 #: performance.xml:269
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
 "implementation of persistent collections. However, a different mechanism is "
 "needed for lazy behavior in single-ended associations. The target entity of "
 "the association must be proxied. Hibernate implements lazy initializing "
-"proxies for persistent objects using runtime bytecode enhancement (via the "
-"excellent CGLIB library)."
+"proxies for persistent objects using runtime bytecode enhancement which is "
+"accessed via the CGLIB library."
 msgstr ""
 "在Hinerbate中,对集合的延迟抓取的采用了自己的实现方法。但是,对于单端关联的延"
 "迟抓取,则需要采用 其他不同的机制。单端关联的目标实体必须使用代理,Hihernate"
@@ -451,9 +450,9 @@
 
 #. Tag: para
 #: performance.xml:277
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate3 generates proxies (at startup) for all persistent "
+"At startup, Hibernate3 generates proxies by default for all persistent "
 "classes and uses them to enable lazy fetching of <literal>many-to-one</"
 "literal> and <literal>one-to-one</literal> associations."
 msgstr ""
@@ -463,13 +462,13 @@
 
 #. Tag: para
 #: performance.xml:283
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
 "that class, with the <literal>proxy</literal> attribute. By default, "
-"Hibernate uses a subclass of the class. <emphasis>Note that the proxied "
-"class must implement a default constructor with at least package visibility. "
-"We recommend this constructor for all persistent classes!</emphasis>"
+"Hibernate uses a subclass of the class. <emphasis>The proxied class must "
+"implement a default constructor with at least package visibility. This "
+"constructor is recommended for all persistent classes</emphasis>."
 msgstr ""
 "在映射文件中,可以通过设置<literal>proxy</literal>属性为目标class声明一个接口"
 "供代理接口使用。 默认的,Hibernate将会使用该类的一个子类。 <emphasis>注意:被"
@@ -478,14 +477,14 @@
 
 #. Tag: para
 #: performance.xml:290
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are some gotchas to be aware of when extending this approach to "
-"polymorphic classes, eg."
+"There are potential problems to note when extending this approach to "
+"polymorphic classes.For example:"
 msgstr "在如此方式定义一个多态类的时候,有许多值得注意的常见性的问题,例如:"
 
 #. Tag: programlisting
-#: performance.xml:295
+#: performance.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -497,7 +496,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:297
+#: performance.xml:296
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -508,7 +507,7 @@
 "literal>, 即使它本身就是<literal>DomesticCat</literal>实例。"
 
 #. Tag: programlisting
-#: performance.xml:303
+#: performance.xml:302
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -521,13 +520,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:305
-#, no-c-format
-msgid "Secondly, it is possible to break proxy <literal>==</literal>."
+#: performance.xml:304
+#, fuzzy, no-c-format
+msgid "Secondly, it is possible to break proxy <literal>==</literal>:"
 msgstr "其次,代理的“<literal>==</literal>”可能不再成立。"
 
 #. Tag: programlisting
-#: performance.xml:309
+#: performance.xml:308
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -539,7 +538,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:311
+#: performance.xml:310
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -550,7 +549,7 @@
 "指向这两个不同的代理对象, 但实际上,其底层应该是同一个实例对象:"
 
 #. Tag: programlisting
-#: performance.xml:316
+#: performance.xml:315
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -558,20 +557,20 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:318
-#, no-c-format
+#: performance.xml:317
+#, fuzzy, no-c-format
 msgid ""
-"Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
+"Third, you cannot use a CGLIB proxy for a <literal>final</literal> class or "
 "a class with any <literal>final</literal> methods."
 msgstr "第三,你不能对“final类”或“具有final方法的类”使用CGLIB代理。"
 
 #. Tag: para
-#: performance.xml:323
-#, no-c-format
+#: performance.xml:322
+#, fuzzy, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
-"(eg. in initializers or default constructor), then those resources will also "
-"be acquired by the proxy. The proxy class is an actual subclass of the "
+"(e.g. in initializers or default constructor), then those resources will "
+"also be acquired by the proxy. The proxy class is an actual subclass of the "
 "persistent class."
 msgstr ""
 "最后,如果你的持久化对象在实例化时需要某些资源(例如,在实例化方法、默认构造"
@@ -579,20 +578,23 @@
 "类。"
 
 #. Tag: para
-#: performance.xml:329
-#, no-c-format
+#: performance.xml:328
+#, fuzzy, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
-"inheritance model. If you wish to avoid these problems your persistent "
-"classes must each implement an interface that declares its business methods. "
-"You should specify these interfaces in the mapping file. eg."
+"inheritance model. To avoid these problems your persistent classes must each "
+"implement an interface that declares its business methods. You should "
+"specify these interfaces in the mapping file where <literal>CatImpl</"
+"literal> implements the interface <literal>Cat</literal> and "
+"<literal>DomesticCatImpl</literal> implements the interface "
+"<literal>DomesticCat</literal>. For example:"
 msgstr ""
 "这些问题都源于Java的单根继承模型的天生限制。如果你希望避免这些问题,那么你的"
 "每个持久化类必须实现一个接口, 在此接口中已经声明了其业务方法。然后,你需要在"
 "映射文档中再指定这些接口。例如:"
 
 #. Tag: programlisting
-#: performance.xml:335
+#: performance.xml:336
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -604,24 +606,18 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:337
-#, no-c-format
+#: performance.xml:338
+#, fuzzy, no-c-format
 msgid ""
-"where <literal>CatImpl</literal> implements the interface <literal>Cat</"
-"literal> and <literal>DomesticCatImpl</literal> implements the interface "
-"<literal>DomesticCat</literal>. Then proxies for instances of <literal>Cat</"
-"literal> and <literal>DomesticCat</literal> may be returned by <literal>load"
-"()</literal> or <literal>iterate()</literal>. (Note that <literal>list()</"
-"literal> does not usually return proxies.)"
+"Then proxies for instances of <literal>Cat</literal> and "
+"<literal>DomesticCat</literal> can be returned by <literal>load()</literal> "
+"or <literal>iterate()</literal>."
 msgstr ""
-"这里<literal>CatImpl</literal>实现了<literal>Cat</literal>接口, "
-"<literal>DomesticCatImpl</literal>实现<literal>DomesticCat</literal>接口。 在"
-"<literal>load()</literal>、<literal>iterate()</literal>方法中就会返回 "
-"<literal>Cat</literal>和<literal>DomesticCat</literal>的代理对象。 (注意"
-"<literal>list()</literal>并不会返回代理对象。)"
+"首先,<literal>Cat</literal>实例永远不可以被强制转换为<literal>DomesticCat</"
+"literal>, 即使它本身就是<literal>DomesticCat</literal>实例。"
 
 #. Tag: programlisting
-#: performance.xml:345
+#: performance.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -630,8 +626,20 @@
 "Cat fritz = (Cat) iter.next();]]>"
 msgstr ""
 
+#. Tag: title
+#: performance.xml:346
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
 #: performance.xml:347
+#, fuzzy, no-c-format
+msgid "<literal>list()</literal> does not usually return proxies."
+msgstr "条件查询"
+
+#. Tag: para
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -642,40 +650,40 @@
 "<literal>Cat</literal>,而不是<literal>CatImpl</literal>。"
 
 #. Tag: para
-#: performance.xml:352
-#, no-c-format
+#: performance.xml:357
+#, fuzzy, no-c-format
 msgid ""
-"Certain operations do <emphasis>not</emphasis> require proxy initialization"
+"Certain operations do <emphasis>not</emphasis> require proxy initialization:"
 msgstr "但是,在有些方法中是<emphasis>不需要</emphasis>使用代理的。例如:"
 
 #. Tag: para
-#: performance.xml:358
-#, no-c-format
+#: performance.xml:363
+#, fuzzy, no-c-format
 msgid ""
-"<literal>equals()</literal>, if the persistent class does not override "
+"<literal>equals()</literal>: if the persistent class does not override "
 "<literal>equals()</literal>"
 msgstr ""
 "<literal>equals()</literal>方法,如果持久类没有重载<literal>equals()</"
 "literal>方法。"
 
 #. Tag: para
-#: performance.xml:364
-#, no-c-format
+#: performance.xml:369
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hashCode()</literal>, if the persistent class does not override "
+"<literal>hashCode()</literal>: if the persistent class does not override "
 "<literal>hashCode()</literal>"
 msgstr ""
 "<literal>hashCode()</literal>方法,如果持久类没有重载<literal>hashCode()</"
 "literal>方法。"
 
 #. Tag: para
-#: performance.xml:370
+#: performance.xml:375
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "标志符的getter方法。"
 
 #. Tag: para
-#: performance.xml:376
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -685,46 +693,46 @@
 "()</literal>方法的持久化类。"
 
 #. Tag: para
-#: performance.xml:381
-#, no-c-format
+#: performance.xml:386
+#, fuzzy, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
-"<literal>lazy=\"proxy\"</literal>, we can avoid the problems associated with "
-"typecasting. However, we will require buildtime bytecode instrumentation, "
-"and all operations will result in immediate proxy initialization."
+"<literal>lazy=\"proxy\"</literal>, you can avoid problems associated with "
+"typecasting. However, buildtime bytecode instrumentation is required, and "
+"all operations will result in immediate proxy initialization."
 msgstr ""
 "若选择<literal>lazy=\"no-proxy\"</literal>而非默认的<literal>lazy=\"proxy\"</"
 "literal>,我们可以避免类型转换带来的问题。然而,这样我们就需要编译期字节码增"
 "强,并且所有的操作都会导致立刻进行代理初始化。"
 
 #. Tag: title
-#: performance.xml:391
+#: performance.xml:396
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "实例化集合和代理(Initializing collections and proxies)"
 
 #. Tag: para
-#: performance.xml:393
-#, no-c-format
+#: performance.xml:398
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
 "if an uninitialized collection or proxy is accessed outside of the scope of "
-"the <literal>Session</literal>, ie. when the entity owning the collection or "
-"having the reference to the proxy is in the detached state."
+"the <literal>Session</literal>, i.e., when the entity owning the collection "
+"or having the reference to the proxy is in the detached state."
 msgstr ""
 "在<literal>Session</literal>范围之外访问未初始化的集合或代理,Hibernate将会抛"
 "出<literal>LazyInitializationException</literal>异常。 也就是说,在分离状态"
 "下,访问一个实体所拥有的集合,或者访问其指向代理的属性时,会引发此异常。"
 
 #. Tag: para
-#: performance.xml:399
-#, no-c-format
+#: performance.xml:404
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes we need to ensure that a proxy or collection is initialized before "
-"closing the <literal>Session</literal>. Of course, we can alway force "
-"initialization by calling <literal>cat.getSex()</literal> or <literal>cat."
-"getKittens().size()</literal>, for example. But that is confusing to readers "
-"of the code and is not convenient for generic code."
+"Sometimes a proxy or collection needs to be initialized before closing the "
+"<literal>Session</literal>. You can force initialization by calling "
+"<literal>cat.getSex()</literal> or <literal>cat.getKittens().size()</"
+"literal>, for example. However, this can be confusing to readers of the code "
+"and it is not convenient for generic code."
 msgstr ""
 "有时候我们需要保证某个代理或者集合在Session关闭前就已经被初始化了。 当然,我"
 "们可以通过强行调用<literal>cat.getSex()</literal>或者<literal>cat.getKittens"
@@ -732,11 +740,11 @@
 "也不符合通常的代码规范。"
 
 #. Tag: para
-#: performance.xml:406
-#, no-c-format
+#: performance.xml:411
+#, fuzzy, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
-"<literal>Hibernate.isInitialized()</literal> provide the application with a "
+"<literal>Hibernate.isInitialized()</literal>, provide the application with a "
 "convenient way of working with lazily initialized collections or proxies. "
 "<literal>Hibernate.initialize(cat)</literal> will force the initialization "
 "of a proxy, <literal>cat</literal>, as long as its <literal>Session</"
@@ -750,11 +758,11 @@
 "合具有同样的功能。"
 
 #. Tag: para
-#: performance.xml:415
-#, no-c-format
+#: performance.xml:420
+#, fuzzy, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
-"needed collections and proxies have been loaded. In some application "
+"required collections and proxies have been loaded. In some application "
 "architectures, particularly where the code that accesses data using "
 "Hibernate, and the code that uses it are in different application layers or "
 "different physical processes, it can be a problem to ensure that the "
@@ -768,11 +776,11 @@
 "题。有两种方法可以解决此问题:"
 
 #. Tag: para
-#: performance.xml:426
-#, no-c-format
+#: performance.xml:431
+#, fuzzy, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
-"<literal>Session</literal> only at the very end of a user request, once the "
+"<literal>Session</literal> only at the end of a user request, once the "
 "rendering of the view is complete (the <emphasis>Open Session in View</"
 "emphasis> pattern). Of course, this places heavy demands on the correctness "
 "of the exception handling of your application infrastructure. It is vitally "
@@ -789,21 +797,20 @@
 "的, 请参见Hibernate wiki上的\"Open Session in View\"模式,你可以找到示例。"
 
 #. Tag: para
-#: performance.xml:439
-#, no-c-format
+#: performance.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
-"\"prepare\" all collections that will be needed by the web tier before "
-"returning. This means that the business tier should load all the data and "
-"return all the data already initialized to the presentation/web tier that is "
-"required for a particular use case. Usually, the application calls "
-"<literal>Hibernate.initialize()</literal> for each collection that will be "
-"needed in the web tier (this call must occur before the session is closed) "
-"or retrieves the collection eagerly using a Hibernate query with a "
-"<literal>FETCH</literal> clause or a <literal>FetchMode.JOIN</literal> in "
-"<literal>Criteria</literal>. This is usually easier if you adopt the "
-"<emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</"
-"emphasis>."
+"\"prepare\" all collections that the web tier needs before returning. This "
+"means that the business tier should load all the data and return all the "
+"data already initialized to the presentation/web tier that is required for a "
+"particular use case. Usually, the application calls <literal>Hibernate."
+"initialize()</literal> for each collection that will be needed in the web "
+"tier (this call must occur before the session is closed) or retrieves the "
+"collection eagerly using a Hibernate query with a <literal>FETCH</literal> "
+"clause or a <literal>FetchMode.JOIN</literal> in <literal>Criteria</"
+"literal>. This is usually easier if you adopt the <emphasis>Command</"
+"emphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 "在一个拥有单独业务层的应用中,业务层必须在返回之前,为web层“准备”好其所需的数"
 "据集合。这就意味着 业务层应该载入所有表现层/web层所需的数据,并将这些已实例化"
@@ -815,14 +822,14 @@
 "那么这项任务将会变得简单的多。"
 
 #. Tag: para
-#: performance.xml:454
-#, no-c-format
+#: performance.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"You may also attach a previously loaded object to a new <literal>Session</"
+"You can also attach a previously loaded object to a new <literal>Session</"
 "literal> with <literal>merge()</literal> or <literal>lock()</literal> before "
-"accessing uninitialized collections (or other proxies). No, Hibernate does "
-"not, and certainly <emphasis>should</emphasis> not do this automatically, "
-"since it would introduce ad hoc transaction semantics!"
+"accessing uninitialized collections or other proxies. Hibernate does not, "
+"and certainly <emphasis>should</emphasis> not, do this automatically since "
+"it would introduce impromptu transaction semantics."
 msgstr ""
 "你也可以通过<literal>merge()</literal>或<literal>lock()</literal>方法,在访问"
 "未实例化的集合(或代理)之前, 为先前载入的对象绑定一个新的<literal>Session</"
@@ -830,17 +837,18 @@
 "务,因为这将引入一个特殊的事务语义。"
 
 #. Tag: para
-#: performance.xml:464
-#, no-c-format
+#: performance.xml:469
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes you don't want to initialize a large collection, but still need "
-"some information about it (like its size) or a subset of the data."
+"Sometimes you do not want to initialize a large collection, but still need "
+"some information about it, like its size, for example, or a subset of the "
+"data."
 msgstr ""
 "有时候,你并不需要完全实例化整个大的集合,仅需要了解它的部分信息(例如其大"
 "小)、或者集合的部分内容。"
 
 #. Tag: para
-#: performance.xml:469
+#: performance.xml:474
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -848,7 +856,7 @@
 msgstr "你可以使用集合过滤器得到其集合的大小,而不必实例化整个集合:"
 
 #. Tag: programlisting
-#: performance.xml:473
+#: performance.xml:478
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -856,7 +864,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:475
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -867,7 +875,7 @@
 "容,而无需实例化整个集合:"
 
 #. Tag: programlisting
-#: performance.xml:480
+#: performance.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -875,39 +883,38 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:485
+#: performance.xml:490
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "使用批量抓取(Using batch fetching)"
 
 #. Tag: para
-#: performance.xml:487
-#, no-c-format
+#: performance.xml:492
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate can make efficient use of batch fetching, that is, Hibernate can "
-"load several uninitialized proxies if one proxy is accessed (or collections. "
-"Batch fetching is an optimization of the lazy select fetching strategy. "
-"There are two ways you can tune batch fetching: on the class and the "
-"collection level."
+"Using batch fetching, Hibernate can load several uninitialized proxies if "
+"one proxy is accessed. Batch fetching is an optimization of the lazy select "
+"fetching strategy. There are two ways you can configure batch fetching: on "
+"the class level and the collection level."
 msgstr ""
 "Hibernate可以充分有效的使用批量抓取,也就是说,如果仅一个访问代理(或集合),"
 "那么Hibernate将不载入其他未实例化的代理。 批量抓取是延迟查询抓取的优化方案,"
 "你可以在两种批量抓取方案之间进行选择:在类级别和集合级别。"
 
 #. Tag: para
-#: performance.xml:493
-#, no-c-format
+#: performance.xml:498
+#, fuzzy, no-c-format
 msgid ""
-"Batch fetching for classes/entities is easier to understand. Imagine you "
-"have the following situation at runtime: You have 25 <literal>Cat</literal> "
-"instances loaded in a <literal>Session</literal>, each <literal>Cat</"
-"literal> has a reference to its <literal>owner</literal>, a <literal>Person</"
-"literal>. The <literal>Person</literal> class is mapped with a proxy, "
-"<literal>lazy=\"true\"</literal>. If you now iterate through all cats and "
-"call <literal>getOwner()</literal> on each, Hibernate will by default "
-"execute 25 <literal>SELECT</literal> statements, to retrieve the proxied "
-"owners. You can tune this behavior by specifying a <literal>batch-size</"
-"literal> in the mapping of <literal>Person</literal>:"
+"Batch fetching for classes/entities is easier to understand. Consider the "
+"following example: at runtime you have 25 <literal>Cat</literal> instances "
+"loaded in a <literal>Session</literal>, and each <literal>Cat</literal> has "
+"a reference to its <literal>owner</literal>, a <literal>Person</literal>. "
+"The <literal>Person</literal> class is mapped with a proxy, <literal>lazy="
+"\"true\"</literal>. If you now iterate through all cats and call "
+"<literal>getOwner()</literal> on each, Hibernate will, by default, execute "
+"25 <literal>SELECT</literal> statements to retrieve the proxied owners. You "
+"can tune this behavior by specifying a <literal>batch-size</literal> in the "
+"mapping of <literal>Person</literal>:"
 msgstr ""
 "类/实体级别的批量抓取很容易理解。假设你在运行时将需要面对下面的问题:你在一个"
 "<literal>Session</literal>中载入了25个 <literal>Cat</literal>实例,每个"
@@ -920,23 +927,23 @@
 "改变其行为:"
 
 #. Tag: programlisting
-#: performance.xml:503
+#: performance.xml:508
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:505
-#, no-c-format
+#: performance.xml:510
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will now execute only three queries, the pattern is 10, 10, 5."
+"Hibernate will now execute only three queries: the pattern is 10, 10, 5."
 msgstr "随之,Hibernate将只需要执行三次查询,分别为10、10、 5。"
 
 #. Tag: para
-#: performance.xml:509
+#: performance.xml:514
 #, fuzzy, no-c-format
 msgid ""
-"You may also enable batch fetching of collections. For example, if each "
+"You can also enable batch fetching of collections. For example, if each "
 "<literal>Person</literal> has a lazy collection of <literal>Cat</literal>s, "
 "and 10 persons are currently loaded in the <literal>Session</literal>, "
 "iterating through all persons will generate 10 <literal>SELECT</literal>s, "
@@ -952,7 +959,7 @@
 "取, 那么,Hibernate将可以预先抓取整个集合。请看例子:"
 
 #. Tag: programlisting
-#: performance.xml:518
+#: performance.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -963,7 +970,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:520
+#: performance.xml:525
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -977,13 +984,13 @@
 "数。"
 
 #. Tag: para
-#: performance.xml:526
-#, no-c-format
+#: performance.xml:531
+#, fuzzy, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
-"tree of items, ie. the typical bill-of-materials pattern. (Although a "
+"tree of items, i.e. the typical bill-of-materials pattern. However, a "
 "<emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasis> "
-"might be a better option for read-mostly trees.)"
+"might be a better option for read-mostly trees."
 msgstr ""
 "如果你的模型中有嵌套的树状结构,例如典型的帐单-原料结构(bill-of-materials "
 "pattern),集合的批量抓取是非常有用的。 (尽管在更多情况下对树进行读取时,"
@@ -991,40 +998,40 @@
 "path)</emphasis>(××) 是更好的解决方法。)"
 
 #. Tag: title
-#: performance.xml:535
+#: performance.xml:540
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "使用子查询抓取(Using subselect fetching)"
 
 #. Tag: para
-#: performance.xml:537
-#, no-c-format
+#: performance.xml:542
+#, fuzzy, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
-"loads all of them, re-running the original query in a subselect. This works "
-"in the same way as batch-fetching, without the piecemeal loading."
+"will load all of them, re-running the original query in a subselect. This "
+"works in the same way as batch-fetching but without the piecemeal loading."
 msgstr ""
 "假若一个延迟集合或单值代理需要抓取,Hibernate会使用一个subselect重新运行原来"
 "的查询,一次性读入所有的实例。这和批量抓取的实现方法是一样的,不会有破碎的加"
 "载。"
 
 #. Tag: title
-#: performance.xml:548
+#: performance.xml:553
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "使用延迟属性抓取(Using lazy property fetching)"
 
 #. Tag: para
-#: performance.xml:550
-#, no-c-format
+#: performance.xml:555
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
 "optimization technique is also known as <emphasis>fetch groups</emphasis>. "
-"Please note that this is mostly a marketing feature, as in practice, "
-"optimizing row reads is much more important than optimization of column "
-"reads. However, only loading some properties of a class might be useful in "
-"extreme cases, when legacy tables have hundreds of columns and the data "
-"model can not be improved."
+"Please note that this is mostly a marketing feature; optimizing row reads is "
+"much more important than optimization of column reads. However, only loading "
+"some properties of a class could be useful in extreme cases. For example, "
+"when legacy tables have hundreds of columns and the data model cannot be "
+"improved."
 msgstr ""
 "Hibernate3对单独的属性支持延迟抓取,这项优化技术也被称为<emphasis>组抓取"
 "(fetch groups)</emphasis>。 请注意,该技术更多的属于市场特性。在实际应用"
@@ -1032,7 +1039,7 @@
 "有用,例如在原有表中拥有几百列数据、数据模型无法改动的情况下。"
 
 #. Tag: para
-#: performance.xml:559
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1042,7 +1049,7 @@
 "入。"
 
 #. Tag: programlisting
-#: performance.xml:564
+#: performance.xml:569
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1058,25 +1065,25 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:566
-#, no-c-format
+#: performance.xml:571
+#, fuzzy, no-c-format
 msgid ""
-"Lazy property loading requires buildtime bytecode instrumentation! If your "
-"persistent classes are not enhanced, Hibernate will silently ignore lazy "
-"property settings and fall back to immediate fetching."
+"Lazy property loading requires buildtime bytecode instrumentation. If your "
+"persistent classes are not enhanced, Hibernate will ignore lazy property "
+"settings and return to immediate fetching."
 msgstr ""
 "属性的延迟载入要求在其代码构建时加入二进制指示指令(bytecode "
 "instrumentation),如果你的持久类代码中未含有这些指令, Hibernate将会忽略这些"
 "属性的延迟设置,仍然将其直接载入。"
 
 #. Tag: para
-#: performance.xml:572
+#: performance.xml:577
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr "你可以在Ant的Task中,进行如下定义,对持久类代码加入“二进制指令。”"
 
 #. Tag: programlisting
-#: performance.xml:576
+#: performance.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1096,44 +1103,44 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:578
+#: performance.xml:583
 #, fuzzy, no-c-format
 msgid ""
-"A different (better?) way to avoid unnecessary column reads, at least for "
-"read-only transactions is to use the projection features of HQL or Criteria "
-"queries. This avoids the need for buildtime bytecode processing and is "
-"certainly a preferred solution."
+"A different way of avoiding unnecessary column reads, at least for read-only "
+"transactions, is to use the projection features of HQL or Criteria queries. "
+"This avoids the need for buildtime bytecode processing and is certainly a "
+"preferred solution."
 msgstr ""
 "还有一种可以优化的方法,它使用HQL或条件查询的投影(projection)特性,可以避免"
 "读取非必要的列, 这一点至少对只读事务是非常有用的。它无需在代码构建时“二进制"
 "指令”处理,因此是一个更加值得选择的解决方法。"
 
 #. Tag: para
-#: performance.xml:585
-#, no-c-format
+#: performance.xml:590
+#, fuzzy, no-c-format
 msgid ""
-"You may force the usual eager fetching of properties using <literal>fetch "
+"You can force the usual eager fetching of properties using <literal>fetch "
 "all properties</literal> in HQL."
 msgstr ""
 "有时你需要在HQL中通过<literal>抓取所有属性</literal>,强行抓取所有内容。"
 
 #. Tag: title
-#: performance.xml:595
+#: performance.xml:600
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "二级缓存(The Second Level Cache)"
 
 #. Tag: para
-#: performance.xml:597
-#, no-c-format
+#: performance.xml:602
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
 "persistent data. It is possible to configure a cluster or JVM-level "
 "(<literal>SessionFactory</literal>-level) cache on a class-by-class and "
-"collection-by-collection basis. You may even plug in a clustered cache. Be "
-"careful. Caches are never aware of changes made to the persistent store by "
-"another application (though they may be configured to regularly expire "
-"cached data)."
+"collection-by-collection basis. You can even plug in a clustered cache. Be "
+"aware that caches are not aware of changes made to the persistent store by "
+"another application. They can, however, be configured to regularly expire "
+"cached data."
 msgstr ""
 "Hibernate的<literal>Session</literal>在事务级别进行持久化数据的缓存操作。 当"
 "然,也有可能分别为每个类(或集合),配置集群、或JVM级别"
@@ -1142,17 +1149,16 @@
 "(即使可以将缓存数据设定为定期失效)。"
 
 #. Tag: para
-#: performance.xml:605
-#, no-c-format
+#: performance.xml:610
+#, fuzzy, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
 "specifying the name of a class that implements <literal>org.hibernate.cache."
 "CacheProvider</literal> using the property <literal>hibernate.cache."
-"provider_class</literal>. Hibernate comes bundled with a number of built-in "
-"integrations with open-source cache providers (listed below); additionally, "
-"you could implement your own and plug it in as outlined above. Note that "
-"versions prior to 3.2 defaulted to use EhCache as the default cache "
-"provider; that is no longer the case as of 3.2."
+"provider_class</literal>. Hibernate is bundled with a number of built-in "
+"integrations with the open-source cache providers that are listed below. You "
+"can also implement your own and plug it in as outlined above. Note that "
+"versions prior to 3.2 use EhCache as the default cache provider."
 msgstr ""
 "通过在<literal>hibernate.cache.provider_class</literal>属性中指定"
 "<literal>org.hibernate.cache.CacheProvider</literal>的某个实现的类名,你可以选"
@@ -1161,180 +1167,180 @@
 "意,在3.2版本之前,默认使用EhCache 作为缓存实现,但从3.2起就不再这样了。"
 
 #. Tag: title
-#: performance.xml:616
+#: performance.xml:621
 #, no-c-format
 msgid "Cache Providers"
 msgstr "缓存策略提供商(Cache Providers)"
 
 #. Tag: entry
-#: performance.xml:625 performance.xml:813
+#: performance.xml:630 performance.xml:818
 #, no-c-format
 msgid "Cache"
 msgstr "Cache"
 
 #. Tag: entry
-#: performance.xml:626
+#: performance.xml:631
 #, no-c-format
 msgid "Provider class"
 msgstr "Provider class"
 
 #. Tag: entry
-#: performance.xml:627
+#: performance.xml:632
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
 #. Tag: entry
-#: performance.xml:628
+#: performance.xml:633
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "Cluster Safe"
 
 #. Tag: entry
-#: performance.xml:629
+#: performance.xml:634
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "Query Cache Supported"
 
 #. Tag: entry
-#: performance.xml:634 performance.xml:822
+#: performance.xml:639 performance.xml:827
 #, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr "Hashtable (not intended for production use)"
 
 #. Tag: literal
-#: performance.xml:635
+#: performance.xml:640
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:636
+#: performance.xml:641
 #, no-c-format
 msgid "memory"
 msgstr "memory"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:645 performance.xml:652
-#: performance.xml:823 performance.xml:824 performance.xml:825
-#: performance.xml:830 performance.xml:831 performance.xml:832
-#: performance.xml:837 performance.xml:838 performance.xml:839
-#: performance.xml:844 performance.xml:845 performance.xml:851
-#: performance.xml:854 performance.xml:858 performance.xml:861
+#: performance.xml:643 performance.xml:650 performance.xml:657
+#: performance.xml:828 performance.xml:829 performance.xml:830
+#: performance.xml:835 performance.xml:836 performance.xml:837
+#: performance.xml:842 performance.xml:843 performance.xml:844
+#: performance.xml:849 performance.xml:850 performance.xml:856
+#: performance.xml:859 performance.xml:863 performance.xml:866
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:641 performance.xml:829
+#: performance.xml:646 performance.xml:834
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:642
+#: performance.xml:647
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:643 performance.xml:650
+#: performance.xml:648 performance.xml:655
 #, no-c-format
 msgid "memory, disk"
 msgstr "memory, disk"
 
 #. Tag: entry
-#: performance.xml:648 performance.xml:836
+#: performance.xml:653 performance.xml:841
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:649
+#: performance.xml:654
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:655 performance.xml:843
+#: performance.xml:660 performance.xml:848
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:656
+#: performance.xml:661
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:657
+#: performance.xml:662
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "clustered (ip multicast)"
 
 #. Tag: entry
-#: performance.xml:658
+#: performance.xml:663
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "yes (clustered invalidation)"
 
 #. Tag: entry
-#: performance.xml:662 performance.xml:850
+#: performance.xml:667 performance.xml:855
 #, fuzzy, no-c-format
 msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:663
+#: performance.xml:668
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:664 performance.xml:671
+#: performance.xml:669 performance.xml:676
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "clustered (ip multicast), transactional"
 
 #. Tag: entry
-#: performance.xml:665
+#: performance.xml:670
 #, no-c-format
 msgid "yes (replication)"
 msgstr "yes (replication)"
 
 #. Tag: entry
-#: performance.xml:666 performance.xml:673
+#: performance.xml:671 performance.xml:678
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "yes (clock sync req.)"
 
 #. Tag: entry
-#: performance.xml:669 performance.xml:857
+#: performance.xml:674 performance.xml:862
 #, fuzzy, no-c-format
 msgid "JBoss Cache 2"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:670
+#: performance.xml:675
 #, fuzzy, no-c-format
-msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgid "org.hibernate.cache.jbc.JBossCacheRegionFactory"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:672
+#: performance.xml:677
 #, fuzzy, no-c-format
 msgid "yes (replication or invalidation)"
 msgstr "yes (clustered invalidation)"
 
 #. Tag: title
-#: performance.xml:680
+#: performance.xml:685
 #, no-c-format
 msgid "Cache mappings"
 msgstr "缓存映射(Cache mappings)"
 
 #. Tag: para
-#: performance.xml:682
+#: performance.xml:687
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1342,7 +1348,7 @@
 msgstr "类或者集合映射的“<literal>&lt;cache&gt;</literal>元素”可以有下列形式:"
 
 #. Tag: programlisting
-#: performance.xml:693
+#: performance.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1353,7 +1359,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:701
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1365,22 +1371,22 @@
 "literal>或 <literal>read-only</literal>。"
 
 #. Tag: para
-#: performance.xml:705
-#, no-c-format
+#: performance.xml:710
+#, fuzzy, no-c-format
 msgid ""
-"<literal>region</literal> (optional, defaults to the class or collection "
-"role name) specifies the name of the second level cache region"
+"<literal>region</literal> (optional: defaults to the class or collection "
+"role name): specifies the name of the second level cache region"
 msgstr ""
 "<literal>region</literal> (可选, 默认为类或者集合的名字(class or collection "
 "role name)) 指定第二级缓存的区域名(name of the second level cache region)"
 
 #. Tag: para
-#: performance.xml:712
-#, no-c-format
+#: performance.xml:717
+#, fuzzy, no-c-format
 msgid ""
-"<literal>include</literal> (optional, defaults to <literal>all</literal>) "
-"<literal>non-lazy</literal> specifies that properties of the entity mapped "
-"with <literal>lazy=\"true\"</literal> may not be cached when attribute-level "
+"<literal>include</literal> (optional: defaults to <literal>all</literal>) "
+"<literal>non-lazy</literal>: specifies that properties of the entity mapped "
+"with <literal>lazy=\"true\"</literal> cannot be cached when attribute-level "
 "lazy fetching is enabled"
 msgstr ""
 "<literal>include</literal> (可选,默认为 <literal>all</literal>) <literal>non-"
@@ -1388,18 +1394,18 @@
 "的实体的属性可能无法被缓存"
 
 #. Tag: para
-#: performance.xml:722
+#: performance.xml:727
 #, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferably?), you may specify <literal>&lt;class-cache&gt;</"
-"literal> and <literal>&lt;collection-cache&gt;</literal> elements in "
-"<literal>hibernate.cfg.xml</literal>."
+"Alternatively, you can specify <literal>&lt;class-cache&gt;</literal> and "
+"<literal>&lt;collection-cache&gt;</literal> elements in <literal>hibernate."
+"cfg.xml</literal>."
 msgstr ""
 "另外(首选?), 你可以在hibernate.cfg.xml中指定<literal>&lt;class-cache&gt;</"
 "literal>和 <literal>&lt;collection-cache&gt;</literal> 元素。"
 
 #. Tag: para
-#: performance.xml:727
+#: performance.xml:732
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1409,18 +1415,18 @@
 "concurrency strategy)</emphasis>。"
 
 #. Tag: title
-#: performance.xml:734
+#: performance.xml:739
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "策略:只读缓存(Strategy: read only)"
 
 #. Tag: para
-#: performance.xml:736
-#, no-c-format
+#: performance.xml:741
+#, fuzzy, no-c-format
 msgid ""
-"If your application needs to read but never modify instances of a persistent "
-"class, a <literal>read-only</literal> cache may be used. This is the "
-"simplest and best performing strategy. It's even perfectly safe for use in a "
+"If your application needs to read, but not modify, instances of a persistent "
+"class, a <literal>read-only</literal> cache can be used. This is the "
+"simplest and optimal performing strategy. It is even safe for use in a "
 "cluster."
 msgstr ""
 "如果你的应用程序只需读取一个持久化类的实例,而无需对其修改, 那么就可以对其进"
@@ -1428,7 +1434,7 @@
 "中,它也能完美地运作。"
 
 #. Tag: programlisting
-#: performance.xml:742
+#: performance.xml:747
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1438,26 +1444,26 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:748
+#: performance.xml:753
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "策略:读/写缓存(Strategy: read/write)"
 
 #. Tag: para
-#: performance.xml:750
-#, no-c-format
+#: performance.xml:755
+#, fuzzy, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
 "cache might be appropriate. This cache strategy should never be used if "
 "serializable transaction isolation level is required. If the cache is used "
 "in a JTA environment, you must specify the property <literal>hibernate."
-"transaction.manager_lookup_class</literal>, naming a strategy for obtaining "
-"the JTA <literal>TransactionManager</literal>. In other environments, you "
-"should ensure that the transaction is completed when <literal>Session.close()"
-"</literal> or <literal>Session.disconnect()</literal> is called. If you wish "
-"to use this strategy in a cluster, you should ensure that the underlying "
-"cache implementation supports locking. The built-in cache providers do "
-"<emphasis>not</emphasis>."
+"transaction.manager_lookup_class</literal> and naming a strategy for "
+"obtaining the JTA <literal>TransactionManager</literal>. In other "
+"environments, you should ensure that the transaction is completed when "
+"<literal>Session.close()</literal> or <literal>Session.disconnect()</"
+"literal> is called. If you want to use this strategy in a cluster, you "
+"should ensure that the underlying cache implementation supports locking. The "
+"built-in cache providers <emphasis>do not</emphasis> support locking."
 msgstr ""
 "如果应用程序需要更新数据,那么使用<literal>读/写缓存</literal> 比较合适。 如"
 "果应用程序要求“序列化事务”的隔离级别(serializable transaction isolation "
@@ -1470,7 +1476,7 @@
 "置的缓存策略并不支持锁定功能。"
 
 #. Tag: programlisting
-#: performance.xml:761
+#: performance.xml:766
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1484,18 +1490,18 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:766
+#: performance.xml:771
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "策略:非严格读/写缓存(Strategy: nonstrict read/write)"
 
 #. Tag: para
-#: performance.xml:768
-#, no-c-format
+#: performance.xml:773
+#, fuzzy, no-c-format
 msgid ""
-"If the application only occasionally needs to update data (ie. if it is "
+"If the application only occasionally needs to update data (i.e. if it is "
 "extremely unlikely that two transactions would try to update the same item "
-"simultaneously) and strict transaction isolation is not required, a "
+"simultaneously), and strict transaction isolation is not required, a "
 "<literal>nonstrict-read-write</literal> cache might be appropriate. If the "
 "cache is used in a JTA environment, you must specify <literal>hibernate."
 "transaction.manager_lookup_class</literal>. In other environments, you "
@@ -1510,18 +1516,18 @@
 "literal>调用前, 整个事务已经结束。"
 
 #. Tag: title
-#: performance.xml:780
+#: performance.xml:785
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "策略:事务缓存(transactional)"
 
 #. Tag: para
-#: performance.xml:782
-#, no-c-format
+#: performance.xml:787
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
 "fully transactional cache providers such as JBoss TreeCache. Such a cache "
-"may only be used in a JTA environment and you must specify "
+"can only be used in a JTA environment and you must specify "
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 "Hibernate的<literal>事务缓存</literal>策略提供了全事务的缓存支持, 例如对"
@@ -1529,14 +1535,14 @@
 "<literal>hibernate.transaction.manager_lookup_class</literal>属性。"
 
 #. Tag: title
-#: performance.xml:791
+#: performance.xml:796
 #, fuzzy, no-c-format
 msgid "Cache-provider/concurrency-strategy compatibility"
 msgstr ""
 "各种缓存提供商对缓存并发策略的支持情况(Cache Concurrency Strategy Support)"
 
 #. Tag: para
-#: performance.xml:794
+#: performance.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "None of the cache providers support all of the cache concurrency strategies."
@@ -1545,7 +1551,7 @@
 "其各自适用的并发策略。"
 
 #. Tag: para
-#: performance.xml:799
+#: performance.xml:804
 #, fuzzy, no-c-format
 msgid ""
 "The following table shows which providers are compatible with which "
@@ -1555,48 +1561,48 @@
 "其各自适用的并发策略。"
 
 #. Tag: title
-#: performance.xml:804
+#: performance.xml:809
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr ""
 "各种缓存提供商对缓存并发策略的支持情况(Cache Concurrency Strategy Support)"
 
 #. Tag: entry
-#: performance.xml:814
+#: performance.xml:819
 #, no-c-format
 msgid "read-only"
 msgstr "read-only"
 
 #. Tag: entry
-#: performance.xml:815
+#: performance.xml:820
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write"
 
 #. Tag: entry
-#: performance.xml:816
+#: performance.xml:821
 #, no-c-format
 msgid "read-write"
 msgstr "read-write"
 
 #. Tag: entry
-#: performance.xml:817
+#: performance.xml:822
 #, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
 #. Tag: title
-#: performance.xml:872
+#: performance.xml:877
 #, no-c-format
 msgid "Managing the caches"
 msgstr "管理缓存(Managing the caches)"
 
 #. Tag: para
-#: performance.xml:874
-#, no-c-format
+#: performance.xml:879
+#, fuzzy, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
-"literal> or <literal>saveOrUpdate()</literal> and whenever you retrieve an "
+"literal> or <literal>saveOrUpdate()</literal>, and whenever you retrieve an "
 "object using <literal>load()</literal>, <literal>get()</literal>, "
 "<literal>list()</literal>, <literal>iterate()</literal> or <literal>scroll()"
 "</literal>, that object is added to the internal cache of the "
@@ -1609,14 +1615,14 @@
 "时, 该对象都将被加入到<literal>Session</literal>的内部缓存中。"
 
 #. Tag: para
-#: performance.xml:881
-#, no-c-format
+#: performance.xml:886
+#, fuzzy, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
 "object will be synchronized with the database. If you do not want this "
-"synchronization to occur or if you are processing a huge number of objects "
+"synchronization to occur, or if you are processing a huge number of objects "
 "and need to manage memory efficiently, the <literal>evict()</literal> method "
-"may be used to remove the object and its collections from the first-level "
+"can be used to remove the object and its collections from the first-level "
 "cache."
 msgstr ""
 "当随后flush()方法被调用时,对象的状态会和数据库取得同步。 如果你不希望此同步"
@@ -1624,7 +1630,7 @@
 "<literal>evict()</literal> 方法,从一级缓存中去掉这些对象及其集合。"
 
 #. Tag: programlisting
-#: performance.xml:889
+#: performance.xml:894
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1637,7 +1643,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:891
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1647,17 +1653,17 @@
 "于当前session的缓存中。"
 
 #. Tag: para
-#: performance.xml:896
-#, no-c-format
+#: performance.xml:901
+#, fuzzy, no-c-format
 msgid ""
-"To completely evict all objects from the session cache, call "
-"<literal>Session.clear()</literal>"
+"To evict all objects from the session cache, call <literal>Session.clear()</"
+"literal>"
 msgstr ""
 "如若要把所有的对象从session缓存中彻底清除,则需要调用<literal>Session.clear()"
 "</literal>。"
 
 #. Tag: para
-#: performance.xml:900
+#: performance.xml:905
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1668,7 +1674,7 @@
 "缓存中实例、整个类、集合实例或者整个集合。"
 
 #. Tag: programlisting
-#: performance.xml:906
+#: performance.xml:911
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1680,57 +1686,57 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:908
-#, no-c-format
+#: performance.xml:913
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
-"with the second-level cache."
+"with the second-level cache:"
 msgstr ""
 "<literal>CacheMode</literal>参数用于控制具体的Session如何与二级缓存进行交互。"
 
 #. Tag: para
-#: performance.xml:915
-#, no-c-format
+#: performance.xml:920
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
-"second-level cache"
+"<literal>CacheMode.NORMAL</literal>: will read items from and write items to "
+"the second-level cache"
 msgstr "<literal>CacheMode.NORMAL</literal> - 从二级缓存中读、写数据。"
 
 #. Tag: para
-#: performance.xml:920
-#, no-c-format
+#: performance.xml:925
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.GET</literal> - read items from the second-level cache, "
-"but don't write to the second-level cache except when updating data"
+"<literal>CacheMode.GET</literal>: will read items from the second-level "
+"cache. Do not write to the second-level cache except when updating data"
 msgstr ""
 "<literal>CacheMode.GET</literal> - 从二级缓存中读取数据,仅在数据更新时对二级"
 "缓存写数据。"
 
 #. Tag: para
-#: performance.xml:926
-#, no-c-format
+#: performance.xml:931
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
-"but don't read from the second-level cache"
+"<literal>CacheMode.PUT</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache"
 msgstr ""
 "<literal>CacheMode.PUT</literal> - 仅向二级缓存写数据,但不从二级缓存中读数"
 "据。"
 
 #. Tag: para
-#: performance.xml:932
-#, no-c-format
+#: performance.xml:937
+#, fuzzy, no-c-format
 msgid ""
-"<literal>CacheMode.REFRESH</literal> - write items to the second-level "
-"cache, but don't read from the second-level cache, bypass the effect of "
-"<literal>hibernate.cache.use_minimal_puts</literal>, forcing a refresh of "
-"the second-level cache for all items read from the database"
+"<literal>CacheMode.REFRESH</literal>: will write items to the second-level "
+"cache. Do not read from the second-level cache. Bypass the effect of "
+"<literal>hibernate.cache.use_minimal_puts</literal> forcing a refresh of the "
+"second-level cache for all items read from the database"
 msgstr ""
 "<literal>CacheMode.REFRESH</literal> - 仅向二级缓存写数据,但不从二级缓存中读"
 "数据。通过 <literal>hibernate.cache.use_minimal_puts</literal>的设置,强制二"
 "级缓存从数据库中读取数据,刷新缓存内容。"
 
 #. Tag: para
-#: performance.xml:940
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1740,7 +1746,7 @@
 "(Statistics)</literal> API。"
 
 #. Tag: programlisting
-#: performance.xml:945
+#: performance.xml:950
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1749,17 +1755,17 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:947
-#, no-c-format
+#: performance.xml:952
+#, fuzzy, no-c-format
 msgid ""
-"You'll need to enable statistics, and, optionally, force Hibernate to keep "
-"the cache entries in a more human-understandable format:"
+"You will need to enable statistics and, optionally, force Hibernate to keep "
+"the cache entries in a more readable format:"
 msgstr ""
 "此时,你必须手工打开统计选项。可选的,你可以让Hibernate更人工可读的方式维护缓"
 "存内容。"
 
 #. Tag: programlisting
-#: performance.xml:952
+#: performance.xml:957
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1767,40 +1773,39 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:957
+#: performance.xml:962
 #, no-c-format
 msgid "The Query Cache"
 msgstr "查询缓存(The Query Cache)"
 
 #. Tag: para
-#: performance.xml:959
-#, no-c-format
+#: performance.xml:964
+#, fuzzy, no-c-format
 msgid ""
-"Query result sets may also be cached. This is only useful for queries that "
-"are run frequently with the same parameters. To use the query cache you must "
-"first enable it:"
+"Query result sets can also be cached. This is only useful for queries that "
+"are run frequently with the same parameters. You will first need to enable "
+"the query cache:"
 msgstr ""
 "查询的结果集也可以被缓存。只有当经常使用同样的参数进行查询时,这才会有些用"
 "处。 要使用查询缓存,首先你必须打开它:"
 
 #. Tag: programlisting
-#: performance.xml:964
+#: performance.xml:969
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:966
-#, no-c-format
+#: performance.xml:971
+#, fuzzy, no-c-format
 msgid ""
-"This setting causes the creation of two new cache regions - one holding "
-"cached query result sets (<literal>org.hibernate.cache.StandardQueryCache</"
-"literal>), the other holding timestamps of the most recent updates to "
-"queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</"
-"literal>). Note that the query cache does not cache the state of the actual "
-"entities in the result set; it caches only identifier values and results of "
-"value type. So the query cache should always be used in conjunction with the "
-"second-level cache."
+"This setting creates two new cache regions: one holding cached query result "
+"sets (<literal>org.hibernate.cache.StandardQueryCache</literal>), the other "
+"holding timestamps of the most recent updates to queryable tables "
+"(<literal>org.hibernate.cache.UpdateTimestampsCache</literal>). Note that "
+"the query cache does not cache the state of the actual entities in the "
+"result set; it caches only identifier values and results of value type. The "
+"query cache should always be used in conjunction with the second-level cache."
 msgstr ""
 "该设置将会创建两个缓存区域 - 一个用于保存查询结果集(<literal>org.hibernate."
 "cache.StandardQueryCache</literal>); 另一个则用于保存最近查询的一系列表的时"
@@ -1809,10 +1814,10 @@
 "识符属性的值、以及各值类型的结果。 所以查询缓存通常会和二级缓存一起使用。"
 
 #. Tag: para
-#: performance.xml:976
-#, no-c-format
+#: performance.xml:981
+#, fuzzy, no-c-format
 msgid ""
-"Most queries do not benefit from caching, so by default queries are not "
+"Most queries do not benefit from caching, so by default, queries are not "
 "cached. To enable caching, call <literal>Query.setCacheable(true)</literal>. "
 "This call allows the query to look for existing cache results or add its "
 "results to the cache when it is executed."
@@ -1822,18 +1827,18 @@
 "调用会让查询在执行过程中时先从缓存中查找结果, 并将自己的结果集放到缓存中去。"
 
 #. Tag: para
-#: performance.xml:983
-#, no-c-format
+#: performance.xml:988
+#, fuzzy, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
-"you may specify a named cache region for a particular query by calling "
+"you can specify a named cache region for a particular query by calling "
 "<literal>Query.setCacheRegion()</literal>."
 msgstr ""
 "如果你要对查询缓存的失效政策进行精确的控制,你必须调用<literal>Query."
 "setCacheRegion()</literal>方法, 为每个查询指定其命名的缓存区域。"
 
 #. Tag: programlisting
-#: performance.xml:989
+#: performance.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1846,7 +1851,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:996
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1864,54 +1869,52 @@
 "同样可以清除查询缓存区域。"
 
 #. Tag: title
-#: performance.xml:1003
+#: performance.xml:1008
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "理解集合性能(Understanding Collection performance)"
 
 #. Tag: para
-#: performance.xml:1005
+#: performance.xml:1010
 #, no-c-format
 msgid ""
-"We've already spent quite some time talking about collections. In this "
-"section we will highlight a couple more issues about how collections behave "
-"at runtime."
+"In the previous sections we have covered collections and their applications. "
+"In this section we explore some more issues in relation to collections at "
+"runtime."
 msgstr ""
-"前面我们已经对集合进行了足够的讨论。本段中,我们将着重讲述集合在运行时的事"
-"宜。"
 
 #. Tag: title
-#: performance.xml:1012
+#: performance.xml:1017
 #, no-c-format
 msgid "Taxonomy"
 msgstr "分类(Taxonomy)"
 
 #. Tag: para
-#: performance.xml:1014
+#: performance.xml:1019
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate定义了三种基本类型的集合:"
 
 #. Tag: para
-#: performance.xml:1018
+#: performance.xml:1023
 #, no-c-format
 msgid "collections of values"
 msgstr "值数据集合"
 
 #. Tag: para
-#: performance.xml:1021
-#, no-c-format
-msgid "one to many associations"
+#: performance.xml:1026
+#, fuzzy, no-c-format
+msgid "one-to-many associations"
 msgstr "一对多关联"
 
 #. Tag: para
-#: performance.xml:1024
-#, no-c-format
-msgid "many to many associations"
+#: performance.xml:1029
+#, fuzzy, no-c-format
+msgid "many-to-many associations"
 msgstr "多对多关联"
 
 #. Tag: para
-#: performance.xml:1028
+#: performance.xml:1033
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -1926,31 +1929,31 @@
 "删除集合行数据的主键的结构”。 因此得到了如下的分类:"
 
 #. Tag: para
-#: performance.xml:1039
+#: performance.xml:1044
 #, no-c-format
 msgid "indexed collections"
 msgstr "有序集合类"
 
 #. Tag: para
-#: performance.xml:1042
+#: performance.xml:1047
 #, no-c-format
 msgid "sets"
 msgstr "集合(sets)"
 
 #. Tag: para
-#: performance.xml:1045
+#: performance.xml:1050
 #, no-c-format
 msgid "bags"
 msgstr "包(bags)"
 
 #. Tag: para
-#: performance.xml:1049
-#, no-c-format
+#: performance.xml:1054
+#, fuzzy, no-c-format
 msgid ""
-"All indexed collections (maps, lists, arrays) have a primary key consisting "
-"of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</literal> "
-"columns. In this case collection updates are usually extremely efficient - "
-"the primary key may be efficiently indexed and a particular row may be "
+"All indexed collections (maps, lists, and arrays) have a primary key "
+"consisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</"
+"literal> columns. In this case, collection updates are extremely efficient. "
+"The primary key can be efficiently indexed and a particular row can be "
 "efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 "所有的有序集合类(maps, lists, arrays)都拥有一个由<literal>&lt;key&gt;</"
@@ -1959,18 +1962,18 @@
 "以迅速找到该行数据。"
 
 #. Tag: para
-#: performance.xml:1057
+#: performance.xml:1062
 #, fuzzy, no-c-format
 msgid ""
 "Sets have a primary key consisting of <literal>&lt;key&gt;</literal> and "
-"element columns. This may be less efficient for some types of collection "
-"element, particularly composite elements or large text or binary fields; the "
-"database may not be able to index a complex primary key as efficiently. On "
-"the other hand, for one to many or many to many associations, particularly "
-"in the case of synthetic identifiers, it is likely to be just as efficient. "
-"(Side-note: if you want <literal>SchemaExport</literal> to actually create "
-"the primary key of a <literal>&lt;set&gt;</literal> for you, you must "
-"declare all columns as <literal>not-null=\"true\"</literal>.)"
+"element columns. This can be less efficient for some types of collection "
+"element, particularly composite elements or large text or binary fields, as "
+"the database may not be able to index a complex primary key as efficiently. "
+"However, for one-to-many or many-to-many associations, particularly in the "
+"case of synthetic identifiers, it is likely to be just as efficient. If you "
+"want <literal>SchemaExport</literal> to actually create the primary key of a "
+"<literal>&lt;set&gt;</literal>, you must declare all columns as <literal>not-"
+"null=\"true\"</literal>."
 msgstr ""
 "集合(sets)的主键由<literal>&lt;key&gt;</literal>和其他元素字段构成。 对于有些"
 "元素类型来说,这很低效,特别是组合元素或者大文本、大二进制字段; 数据库可能无"
@@ -1980,24 +1983,24 @@
 "键, 你必须把所有的字段都声明为<literal>not-null=\"true\"</literal>。)"
 
 #. Tag: para
-#: performance.xml:1068
-#, no-c-format
+#: performance.xml:1073
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
-"are always very efficient to update. In fact, they are the best case."
+"are efficient to update. In fact, they are the best case."
 msgstr ""
 "<literal>&lt;idbag&gt;</literal>映射定义了代理键,因此它总是可以很高效的被更"
 "新。事实上, <literal>&lt;idbag&gt;</literal>拥有着最好的性能表现。"
 
 #. Tag: para
-#: performance.xml:1073
-#, no-c-format
+#: performance.xml:1078
+#, fuzzy, no-c-format
 msgid ""
-"Bags are the worst case. Since a bag permits duplicate element values and "
-"has no index column, no primary key may be defined. Hibernate has no way of "
-"distinguishing between duplicate rows. Hibernate resolves this problem by "
-"completely removing (in a single <literal>DELETE</literal>) and recreating "
-"the collection whenever it changes. This might be very inefficient."
+"Bags are the worst case since they permit duplicate element values and, as "
+"they have no index column, no primary key can be defined. Hibernate has no "
+"way of distinguishing between duplicate rows. Hibernate resolves this "
+"problem by completely removing in a single <literal>DELETE</literal> and "
+"recreating the collection whenever it changes. This can be inefficient."
 msgstr ""
 "Bag是最差的。因为bag允许重复的元素值,也没有索引字段,因此不可能定义主键。 "
 "Hibernate无法判断出重复的行。当这种集合被更改时,Hibernate将会先完整地移除 "
@@ -2005,47 +2008,47 @@
 "个集合。 因此Bag是非常低效的。"
 
 #. Tag: para
-#: performance.xml:1081
-#, no-c-format
+#: performance.xml:1086
+#, fuzzy, no-c-format
 msgid ""
-"Note that for a one-to-many association, the \"primary key\" may not be the "
-"physical primary key of the database table - but even in this case, the "
-"above classification is still useful. (It still reflects how Hibernate "
-"\"locates\" individual rows of the collection.)"
+"For a one-to-many association, the \"primary key\" may not be the physical "
+"primary key of the database table. Even in this case, the above "
+"classification is still useful. It reflects how Hibernate \"locates\" "
+"individual rows of the collection."
 msgstr ""
 "请注意:对于一对多关联来说,“主键”很可能并不是数据库表的物理主键。 但就算在此"
 "情况下,上面的分类仍然是有用的。(它仍然反映了Hibernate在集合的各数据行中是如"
 "何进行“定位”的。)"
 
 #. Tag: title
-#: performance.xml:1091
+#: performance.xml:1096
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr "Lists, maps 和sets用于更新效率最高"
 
 #. Tag: para
-#: performance.xml:1093
-#, no-c-format
+#: performance.xml:1098
+#, fuzzy, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
-"(usually) sets allow the most efficient operation in terms of adding, "
-"removing and updating elements."
+"sets allow the most efficient operation in terms of adding, removing and "
+"updating elements."
 msgstr ""
 "根据我们上面的讨论,显然有序集合类型和大多数set都可以在增加、删除、修改元素中"
 "拥有最好的性能。"
 
 #. Tag: para
-#: performance.xml:1099
-#, no-c-format
+#: performance.xml:1104
+#, fuzzy, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
-"sets for many to many associations or collections of values. Because of the "
-"structure of a <literal>Set</literal>, Hibernate doesn't ever "
-"<literal>UPDATE</literal> a row when an element is \"changed\". Changes to a "
-"<literal>Set</literal> always work via <literal>INSERT</literal> and "
-"<literal>DELETE</literal> (of individual rows). Once again, this "
-"consideration does not apply to one to many associations."
+"sets for many-to-many associations or collections of values. Because of the "
+"structure of a <literal>Set</literal>, Hibernate does not <literal>UPDATE</"
+"literal> a row when an element is \"changed\". Changes to a <literal>Set</"
+"literal> always work via <literal>INSERT</literal> and <literal>DELETE</"
+"literal> of individual rows. Once again, this consideration does not apply "
+"to one-to-many associations."
 msgstr ""
 "可论证的是对于多对多关联、值数据集合而言,有序集合类比集合(set)有一个好处。因"
 "为<literal>Set</literal>的内在结构, 如果“改变”了一个元素,Hibernate并不会"
@@ -2054,12 +2057,12 @@
 "时“改变”才有效。再次强调:这段讨论对“一对多关联”并不适用。"
 
 #. Tag: para
-#: performance.xml:1108
-#, no-c-format
+#: performance.xml:1113
+#, fuzzy, no-c-format
 msgid ""
-"After observing that arrays cannot be lazy, we would conclude that lists, "
+"After observing that arrays cannot be lazy, you can conclude that lists, "
 "maps and idbags are the most performant (non-inverse) collection types, with "
-"sets not far behind. Sets are expected to be the most common kind of "
+"sets not far behind. You can expect sets to be the most common kind of "
 "collection in Hibernate applications. This is because the \"set\" semantics "
 "are most natural in the relational model."
 msgstr ""
@@ -2068,38 +2071,37 @@
 "因为“set”的语义在关系模型中是最自然的。"
 
 #. Tag: para
-#: performance.xml:1116
-#, no-c-format
+#: performance.xml:1121
+#, fuzzy, no-c-format
 msgid ""
-"However, in well-designed Hibernate domain models, we usually see that most "
-"collections are in fact one-to-many associations with <literal>inverse=\"true"
-"\"</literal>. For these associations, the update is handled by the many-to-"
-"one end of the association, and so considerations of collection update "
-"performance simply do not apply."
+"However, in well-designed Hibernate domain models, most collections are in "
+"fact one-to-many associations with <literal>inverse=\"true\"</literal>. For "
+"these associations, the update is handled by the many-to-one end of the "
+"association, and so considerations of collection update performance simply "
+"do not apply."
 msgstr ""
 "但是,在设计良好的Hibernate领域模型中,我们通常可以看到更多的集合事实上是带有"
 "<literal>inverse=\"true\"</literal> 的一对多的关联。对于这些关联,更新操作将"
 "会在多对一的这一端进行处理。因此对于此类情况,无需考虑其集合的更新性能。"
 
 #. Tag: title
-#: performance.xml:1126
+#: performance.xml:1131
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr "Bag和list是反向集合类中效率最高的"
 
 #. Tag: para
-#: performance.xml:1128
-#, no-c-format
+#: performance.xml:1133
+#, fuzzy, no-c-format
 msgid ""
-"Just before you ditch bags forever, there is a particular case in which bags "
-"(and also lists) are much more performant than sets. For a collection with "
-"<literal>inverse=\"true\"</literal> (the standard bidirectional one-to-many "
-"relationship idiom, for example) we can add elements to a bag or list "
-"without needing to initialize (fetch) the bag elements! This is because "
+"There is a particular case, however, in which bags, and also lists, are much "
+"more performant than sets. For a collection with <literal>inverse=\"true\"</"
+"literal>, the standard bidirectional one-to-many relationship idiom, for "
+"example, we can add elements to a bag or list without needing to initialize "
+"(fetch) the bag elements. This is because, unlike a <literal>set</literal>, "
 "<literal>Collection.add()</literal> or <literal>Collection.addAll()</"
-"literal> must always return true for a bag or <literal>List</literal> "
-"(unlike a <literal>Set</literal>). This can make the following common code "
-"much faster."
+"literal> must always return true for a bag or <literal>List</literal>. This "
+"can make the following common code much faster:"
 msgstr ""
 "在把bag扔进水沟之前,你必须了解,在一种情况下,bag的性能(包括list)要比set高得"
 "多: 对于指明了<literal>inverse=\"true\"</literal>的集合类(比如说,标准的双"
@@ -2109,7 +2111,7 @@
 "于下面的相同代码来说,速度会快得多。"
 
 #. Tag: programlisting
-#: performance.xml:1138
+#: performance.xml:1143
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2120,40 +2122,39 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1143
+#: performance.xml:1148
 #, no-c-format
 msgid "One shot delete"
 msgstr "一次性删除(One shot delete)"
 
 #. Tag: para
-#: performance.xml:1145
-#, no-c-format
+#: performance.xml:1150
+#, fuzzy, no-c-format
 msgid ""
-"Occasionally, deleting collection elements one by one can be extremely "
-"inefficient. Hibernate isn't completely stupid, so it knows not to do that "
-"in the case of an newly-empty collection (if you called <literal>list.clear()"
-"</literal>, for example). In this case, Hibernate will issue a single "
-"<literal>DELETE</literal> and we are done!"
+"Deleting collection elements one by one can sometimes be extremely "
+"inefficient. Hibernate knows not to do that in the case of an newly-empty "
+"collection (if you called <literal>list.clear()</literal>, for example). In "
+"this case, Hibernate will issue a single <literal>DELETE</literal>."
 msgstr ""
 "偶尔的,逐个删除集合类中的元素是相当低效的。Hibernate并没那么笨, 如果你想要"
 "把整个集合都删除(比如说调用list.clear()),Hibernate只需要一个DELETE就搞定"
 "了。"
 
 #. Tag: para
-#: performance.xml:1152
-#, no-c-format
+#: performance.xml:1157
+#, fuzzy, no-c-format
 msgid ""
-"Suppose we add a single element to a collection of size twenty and then "
+"Suppose you added a single element to a collection of size twenty and then "
 "remove two elements. Hibernate will issue one <literal>INSERT</literal> "
-"statement and two <literal>DELETE</literal> statements (unless the "
-"collection is a bag). This is certainly desirable."
+"statement and two <literal>DELETE</literal> statements, unless the "
+"collection is a bag. This is certainly desirable."
 msgstr ""
 "假设我们在一个长度为20的集合类中新增加了一个元素,然后再删除两个。 Hibernate"
 "会安排一条<literal>INSERT</literal>语句和两条<literal>DELETE</literal>语句"
 "(除非集合类是一个bag)。 这当然是显而易见的。"
 
 #. Tag: para
-#: performance.xml:1158
+#: performance.xml:1163
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2162,60 +2163,59 @@
 "但是,假设我们删除了18个数据,只剩下2个,然后新增3个。则有两种处理方式:"
 
 #. Tag: para
-#: performance.xml:1165
+#: performance.xml:1170
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "逐一的删除这18个数据,再新增三个;"
 
 #. Tag: para
-#: performance.xml:1168
-#, no-c-format
+#: performance.xml:1173
+#, fuzzy, no-c-format
 msgid ""
-"remove the whole collection (in one SQL <literal>DELETE</literal>) and "
-"insert all five current elements (one by one)"
+"remove the whole collection in one SQL <literal>DELETE</literal> and insert "
+"all five current elements one by one"
 msgstr "删除整个集合类(只用一句DELETE语句),然后增加5个数据。"
 
 #. Tag: para
-#: performance.xml:1173
-#, no-c-format
+#: performance.xml:1178
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate isn't smart enough to know that the second option is probably "
-"quicker in this case. (And it would probably be undesirable for Hibernate to "
-"be that smart; such behaviour might confuse database triggers, etc.)"
+"Hibernate cannot know that the second option is probably quicker. It would "
+"probably be undesirable for Hibernate to be that intuitive as such behavior "
+"might confuse database triggers, etc."
 msgstr ""
 "Hibernate还没那么聪明,知道第二种选择可能会比较快。 (也许让Hibernate不这么聪"
 "明也是好事,否则可能会引发意外的“数据库触发器”之类的问题。)"
 
 #. Tag: para
-#: performance.xml:1179
-#, no-c-format
+#: performance.xml:1184
+#, fuzzy, no-c-format
 msgid ""
-"Fortunately, you can force this behaviour (ie. the second strategy) at any "
-"time by discarding (ie. dereferencing) the original collection and returning "
-"a newly instantiated collection with all the current elements. This can be "
-"very useful and powerful from time to time."
+"Fortunately, you can force this behavior (i.e. the second strategy) at any "
+"time by discarding (i.e. dereferencing) the original collection and "
+"returning a newly instantiated collection with all the current elements."
 msgstr ""
 "幸运的是,你可以强制使用第二种策略。你需要取消原来的整个集合类(解除其引"
 "用), 然后再返回一个新的实例化的集合类,只包含需要的元素。有些时候这是非常有"
 "用的。"
 
 #. Tag: para
-#: performance.xml:1185
-#, no-c-format
+#: performance.xml:1190
+#, fuzzy, no-c-format
 msgid ""
-"Of course, one-shot-delete does not apply to collections mapped "
-"<literal>inverse=\"true\"</literal>."
+"One-shot-delete does not apply to collections mapped <literal>inverse=\"true"
+"\"</literal>."
 msgstr ""
 "显然,一次性删除并不适用于被映射为<literal>inverse=\"true\"</literal>的集合。"
 
 #. Tag: title
-#: performance.xml:1194
+#: performance.xml:1199
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "监测性能(Monitoring performance)"
 
 #. Tag: para
-#: performance.xml:1196
+#: performance.xml:1201
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2227,13 +2227,13 @@
 "示意图,因此可以从 每个<literal>SessionFactory</literal>抓取其统计数据。"
 
 #. Tag: title
-#: performance.xml:1203
+#: performance.xml:1208
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "监测SessionFactory"
 
 #. Tag: para
-#: performance.xml:1205
+#: performance.xml:1210
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2245,11 +2245,11 @@
 "<literal>统计</literal>数据。"
 
 #. Tag: para
-#: performance.xml:1211
-#, no-c-format
+#: performance.xml:1216
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
-"<literal>StatisticsService</literal> MBean. You may enable a single MBean "
+"<literal>StatisticsService</literal> MBean. You can enable a single MBean "
 "for all your <literal>SessionFactory</literal> or one per factory. See the "
 "following code for minimalistic configuration examples:"
 msgstr ""
@@ -2259,7 +2259,7 @@
 "分配一个MBean。下面的代码即是其演示代码:"
 
 #. Tag: programlisting
-#: performance.xml:1218
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2275,7 +2275,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1221
+#: performance.xml:1226
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2289,29 +2289,16 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1223
-#, no-c-format
+#: performance.xml:1233
+#, fuzzy, no-c-format
 msgid ""
-"TODO: This doesn't make sense: In the first case, we retrieve and use the "
-"MBean directly. In the second one, we must give the JNDI name in which the "
-"session factory is held before using it. Use <literal>hibernateStatsBean."
-"setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
+"You can activate and deactivate the monitoring for a "
+"<literal>SessionFactory</literal>:"
 msgstr ""
-"TODO:仍需要说明的是:在第一个例子中,我们直接得到和使用MBean;而在第二个例子"
-"中,在使用MBean之前 我们则需要给出SessionFactory的JNDI名,使用"
-"<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
-"literal> 得到SessionFactory,然后将MBean保存于其中。"
-
-#. Tag: para
-#: performance.xml:1228
-#, no-c-format
-msgid ""
-"You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
-msgstr ""
 "你可以通过以下方法打开或关闭<literal>SessionFactory</literal>的监测功能:"
 
 #. Tag: para
-#: performance.xml:1233
+#: performance.xml:1238
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2321,7 +2308,7 @@
 "<literal>true</literal>或<literal>false</literal>;"
 
 #. Tag: para
-#: performance.xml:1240
+#: performance.xml:1245
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2332,7 +2319,7 @@
 "literal>"
 
 #. Tag: para
-#: performance.xml:1247
+#: performance.xml:1252
 #, fuzzy, no-c-format
 msgid ""
 "Statistics can be reset programmatically using the <literal>clear()</"
@@ -2343,26 +2330,26 @@
 "<literal>logSummary()</literal> 在日志中记录(info级别)其总结。"
 
 #. Tag: title
-#: performance.xml:1256
+#: performance.xml:1261
 #, no-c-format
 msgid "Metrics"
 msgstr "数据记录(Metrics)"
 
 #. Tag: para
-#: performance.xml:1258
-#, no-c-format
+#: performance.xml:1263
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate provides a number of metrics, from very basic to the specialized "
-"information only relevant in certain scenarios. All available counters are "
-"described in the <literal>Statistics</literal> interface API, in three "
-"categories:"
+"Hibernate provides a number of metrics, from basic information to more "
+"specialized information that is only relevant in certain scenarios. All "
+"available counters are described in the <literal>Statistics</literal> "
+"interface API, in three categories:"
 msgstr ""
 "Hibernate提供了一系列数据记录,其记录的内容包括从最基本的信息到与具体场景的特"
 "殊信息。所有的测量值都可以由 <literal>Statistics</literal>接口进行访问,主要"
 "分为三类:"
 
 #. Tag: para
-#: performance.xml:1265
+#: performance.xml:1270
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2372,15 +2359,15 @@
 "JDBC的连接数等;"
 
 #. Tag: para
-#: performance.xml:1271
-#, no-c-format
+#: performance.xml:1276
+#, fuzzy, no-c-format
 msgid ""
-"Metrics related to he entities, collections, queries, and caches as a whole "
-"(aka global metrics),"
+"Metrics related to the entities, collections, queries, and caches as a whole "
+"(aka global metrics)."
 msgstr "实体、集合、查询、缓存等内容的统一数据记录"
 
 #. Tag: para
-#: performance.xml:1277
+#: performance.xml:1282
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2388,22 +2375,22 @@
 msgstr "和具体实体、集合、查询、缓存相关的详细数据记录"
 
 #. Tag: para
-#: performance.xml:1284
+#: performance.xml:1289
 #, fuzzy, no-c-format
 msgid ""
 "For example, you can check the cache hit, miss, and put ratio of entities, "
-"collections and queries, and the average time a query needs. Beware that the "
-"number of milliseconds is subject to approximation in Java. Hibernate is "
-"tied to the JVM precision, on some platforms this might even only be "
-"accurate to 10 seconds."
+"collections and queries, and the average time a query needs. Be aware that "
+"the number of milliseconds is subject to approximation in Java. Hibernate is "
+"tied to the JVM precision and on some platforms this might only be accurate "
+"to 10 seconds."
 msgstr ""
 "例如:你可以检查缓存的命中成功次数,缓存的命中失败次数,实体、集合和查询的使"
 "用概率,查询的平均时间等。请注意 Java中时间的近似精度是毫秒。Hibernate的数据"
 "精度和具体的JVM有关,在有些平台上其精度甚至只能精确到10秒。"
 
 #. Tag: para
-#: performance.xml:1291
-#, no-c-format
+#: performance.xml:1296
+#, fuzzy, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
 "particular entity, collection, cache region, etc.). You can access the "
@@ -2412,7 +2399,7 @@
 "<literal>Statistics</literal>, <literal>EntityStatistics</literal>, "
 "<literal>CollectionStatistics</literal>, "
 "<literal>SecondLevelCacheStatistics</literal>, and <literal>QueryStatistics</"
-"literal> API Javadoc for more information. The following code shows a simple "
+"literal> API Javadoc for more information. The following code is a simple "
 "example:"
 msgstr ""
 "你可以直接使用getter方法得到全局数据记录(例如,和具体的实体、集合、缓存区无"
@@ -2423,7 +2410,7 @@
 "literal>的API文档以抓取更多信息。下面的代码则是个简单的例子:"
 
 #. Tag: programlisting
-#: performance.xml:1301
+#: performance.xml:1306
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2445,12 +2432,12 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1303
-#, no-c-format
+#: performance.xml:1308
+#, fuzzy, no-c-format
 msgid ""
-"To work on all entities, collections, queries and region caches, you can "
-"retrieve the list of names of entities, collections, queries and region "
-"caches with the following methods: <literal>getQueries()</literal>, "
+"You can work on all entities, collections, queries and region caches, by "
+"retrieving the list of names of entities, collections, queries and region "
+"caches using the following methods: <literal>getQueries()</literal>, "
 "<literal>getEntityNames()</literal>, <literal>getCollectionRoleNames()</"
 "literal>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
@@ -2459,5 +2446,39 @@
 "<literal>getEntityNames()</literal>、 <literal>getCollectionRoleNames()</"
 "literal>和 <literal>getSecondLevelCacheRegionNames()</literal>。"
 
+#~ msgid ""
+#~ "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
+#~ "literal> and <literal>DomesticCatImpl</literal> implements the interface "
+#~ "<literal>DomesticCat</literal>. Then proxies for instances of "
+#~ "<literal>Cat</literal> and <literal>DomesticCat</literal> may be returned "
+#~ "by <literal>load()</literal> or <literal>iterate()</literal>. (Note that "
+#~ "<literal>list()</literal> does not usually return proxies.)"
+#~ msgstr ""
+#~ "这里<literal>CatImpl</literal>实现了<literal>Cat</literal>接口, "
+#~ "<literal>DomesticCatImpl</literal>实现<literal>DomesticCat</literal>接"
+#~ "口。 在<literal>load()</literal>、<literal>iterate()</literal>方法中就会返"
+#~ "回 <literal>Cat</literal>和<literal>DomesticCat</literal>的代理对象。 (注"
+#~ "意<literal>list()</literal>并不会返回代理对象。)"
+
+#~ msgid ""
+#~ "We've already spent quite some time talking about collections. In this "
+#~ "section we will highlight a couple more issues about how collections "
+#~ "behave at runtime."
+#~ msgstr ""
+#~ "前面我们已经对集合进行了足够的讨论。本段中,我们将着重讲述集合在运行时的事"
+#~ "宜。"
+
+#~ msgid ""
+#~ "TODO: This doesn't make sense: In the first case, we retrieve and use the "
+#~ "MBean directly. In the second one, we must give the JNDI name in which "
+#~ "the session factory is held before using it. Use "
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal>"
+#~ msgstr ""
+#~ "TODO:仍需要说明的是:在第一个例子中,我们直接得到和使用MBean;而在第二个"
+#~ "例子中,在使用MBean之前 我们则需要给出SessionFactory的JNDI名,使用"
+#~ "<literal>hibernateStatsBean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</"
+#~ "literal> 得到SessionFactory,然后将MBean保存于其中。"
+
 #~ msgid "yes"
 #~ msgstr "yes"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/persistent_classes.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/persistent_classes.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/persistent_classes.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,13 @@
 
 #. Tag: para
 #: persistent_classes.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
 "of the business problem (e.g. Customer and Order in an E-commerce "
 "application). Not all instances of a persistent class are considered to be "
-"in the persistent state - an instance may instead be transient or detached."
+"in the persistent state. For example, an instance can instead be transient "
+"or detached."
 msgstr ""
 "在应用程序中,用来实现业务问题实体的(如,在电子商务应用程序中的Customer和"
 "Order) 类就是持久化类。不能认为所有的持久化类的实例都是持久的状态——一个实例"
@@ -31,13 +32,13 @@
 
 #. Tag: para
 #: persistent_classes.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
 "as the Plain Old Java Object (POJO) programming model. However, none of "
 "these rules are hard requirements. Indeed, Hibernate3 assumes very little "
-"about the nature of your persistent objects. You may express a domain model "
-"in other ways: using trees of <literal>Map</literal> instances, for example."
+"about the nature of your persistent objects. You can express a domain model "
+"in other ways (using trees of <literal>Map</literal> instances, for example)."
 msgstr ""
 "如果这些持久化类遵循一些简单的规则,Hibernate能够工作得更好,这些规则也被称"
 "作 简单传统Java对象(POJO:Plain Old Java Object)编程模型。但是这些规则并不是必"
@@ -52,8 +53,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:49
-#, no-c-format
-msgid "Most Java applications require a persistent class representing felines."
+#, fuzzy, no-c-format
+msgid ""
+"Most Java applications require a persistent class representing felines. For "
+"example:"
 msgstr "大多数Java程序需要用一个持久化类来表示猫科动物。"
 
 #. Tag: programlisting
@@ -143,8 +146,10 @@
 #. Tag: para
 #: persistent_classes.xml:55
 #, no-c-format
-msgid "There are four main rules to follow here:"
-msgstr "这里要遵循四条主要的规则:"
+msgid ""
+"The four main rules of persistent classes are explored in more detail in the "
+"following sections."
+msgstr ""
 
 #. Tag: title
 #: persistent_classes.xml:61
@@ -154,12 +159,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:63
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
-"must have a default constructor (which may be non-public) so that Hibernate "
-"can instantiate them using <literal>Constructor.newInstance()</literal>. We "
-"strongly recommend having a default constructor with at least "
+"must have a default constructor (which can be non-public) so that Hibernate "
+"can instantiate them using <literal>Constructor.newInstance()</literal>. It "
+"is recommended that you have a default constructor with at least "
 "<emphasis>package</emphasis> visibility for runtime proxy generation in "
 "Hibernate."
 msgstr ""
@@ -177,15 +182,15 @@
 
 #. Tag: para
 #: persistent_classes.xml:75
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
 "property maps to the primary key column of a database table. The property "
 "might have been called anything, and its type might have been any primitive "
 "type, any primitive \"wrapper\" type, <literal>java.lang.String</literal> or "
-"<literal>java.util.Date</literal>. (If your legacy database table has "
-"composite keys, you can even use a user-defined class with properties of "
-"these types - see the section on composite identifiers later.)"
+"<literal>java.util.Date</literal>. If your legacy database table has "
+"composite keys, you can use a user-defined class with properties of these "
+"types (see the section on composite identifiers later in the chapter.)"
 msgstr ""
 "<literal>Cat</literal>有一个属性叫做<literal>id</literal>。这个属性映射数据库"
 "表的主 键字段。这个属性可以叫任何名字,其类型可以是任何的原始类型、原始类型的"
@@ -206,9 +211,9 @@
 
 #. Tag: para
 #: persistent_classes.xml:89
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In fact, some functionality is available only to classes which declare an "
+"In fact, some functionality is available only to classes that declare an "
 "identifier property:"
 msgstr "实际上,一些功能只对那些声明了标识符属性的类起作用:"
 
@@ -236,11 +241,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We recommend you declare consistently-named identifier properties on "
-"persistent classes. We further recommend that you use a nullable (ie. non-"
-"primitive) type."
+"We recommend that you declare consistently-named identifier properties on "
+"persistent classes and that you use a nullable (i.e., non-primitive) type."
 msgstr ""
 "我们建议你对持久化类声明命名一致的标识属性。我们还建议你使用一 个可以为空(也"
 "就是说,不是原始类型)的类型。"
@@ -264,11 +268,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:126
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
-"interface with Hibernate, but you won't be able to use proxies for lazy "
-"association fetching - which will limit your options for performance tuning."
+"interface with Hibernate. You will not, however, be able to use proxies for "
+"lazy association fetching which will ultimately limit your options for "
+"performance tuning."
 msgstr ""
 "你可以用Hibernate持久化一个没有实现任何接口的<literal>final</literal>类,但是"
 "你 不能使用代理来延迟关联加载,这会限制你进行性能优化的选择。"
@@ -294,16 +299,15 @@
 
 #. Tag: para
 #: persistent_classes.xml:141
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
-"fields. Many other ORM tools directly persist instance variables. We believe "
-"it is better to provide an indirection between the relational schema and "
-"internal data structures of the class. By default, Hibernate persists "
-"JavaBeans style properties, and recognizes method names of the form "
-"<literal>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</"
-"literal>. You may switch to direct field access for particular properties, "
-"if needed."
+"fields. Many other ORM tools directly persist instance variables. It is "
+"better to provide an indirection between the relational schema and internal "
+"data structures of the class. By default, Hibernate persists JavaBeans style "
+"properties and recognizes method names of the form <literal>getFoo</"
+"literal>, <literal>isFoo</literal> and <literal>setFoo</literal>. If "
+"required, you can switch to direct field access for particular properties."
 msgstr ""
 "<literal>Cat</literal>为它的所有持久化字段声明了访问方法。很多其他ORM工具直接"
 "对 实例变量进行持久化。我们相信,在关系数据库schema和类的内部数据结构之间引入"
@@ -332,10 +336,10 @@
 
 #. Tag: para
 #: persistent_classes.xml:164
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
-"identifier property from the superclass, <literal>Cat</literal>."
+"identifier property from the superclass, <literal>Cat</literal>. For example:"
 msgstr ""
 "子类也必须遵守第一条和第二条规则。它从超类<literal>Cat</literal>继承了标识属"
 "性。"
@@ -367,20 +371,20 @@
 
 #. Tag: para
 #: persistent_classes.xml:175
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
-"</literal> methods if you"
+"</literal> methods if you:"
 msgstr ""
 "如果你有如下需求,你必须重载 <literal>equals()</literal> 和 <literal>hashCode"
 "()</literal>方法:"
 
 #. Tag: para
 #: persistent_classes.xml:181
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
-"(the recommended way to represent many-valued associations) <emphasis>and</"
+"(the recommended way to represent many-valued associations); <emphasis>and</"
 "emphasis>"
 msgstr ""
 "想把持久类的实例放入<literal>Set</literal>中(当表示多值关联时,推荐这么做)"
@@ -393,12 +397,12 @@
 
 #. Tag: para
 #: persistent_classes.xml:194
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
-"Java identity only inside a particular session scope. So as soon as we mix "
-"instances retrieved in different sessions, we must implement <literal>equals"
-"()</literal> and <literal>hashCode()</literal> if we wish to have meaningful "
+"Java identity only inside a particular session scope. When you mix instances "
+"retrieved in different sessions, you must implement <literal>equals()</"
+"literal> and <literal>hashCode()</literal> if you wish to have meaningful "
 "semantics for <literal>Set</literal>s."
 msgstr ""
 "Hibernate保证,仅在特定会话范围内,持久化标识(数据库的行)和Java标识是等价"
@@ -408,23 +412,22 @@
 
 #. Tag: para
 #: persistent_classes.xml:202
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
 "<literal>hashCode()</literal> by comparing the identifier value of both "
-"objects. If the value is the same, both must be the same database row, they "
-"are therefore equal (if both are added to a <literal>Set</literal>, we will "
-"only have one element in the <literal>Set</literal>). Unfortunately, we "
-"can't use that approach with generated identifiers! Hibernate will only "
-"assign identifier values to objects that are persistent, a newly created "
-"instance will not have any identifier value! Furthermore, if an instance is "
+"objects. If the value is the same, both must be the same database row, "
+"because they are equal. If both are added to a <literal>Set</literal>, you "
+"will only have one element in the <literal>Set</literal>). Unfortunately, "
+"you cannot use that approach with generated identifiers. Hibernate will only "
+"assign identifier values to objects that are persistent; a newly created "
+"instance will not have any identifier value. Furthermore, if an instance is "
 "unsaved and currently in a <literal>Set</literal>, saving it will assign an "
 "identifier value to the object. If <literal>equals()</literal> and "
 "<literal>hashCode()</literal> are based on the identifier value, the hash "
 "code would change, breaking the contract of the <literal>Set</literal>. See "
-"the Hibernate website for a full discussion of this problem. Note that this "
-"is not a Hibernate issue, but normal Java semantics of object identity and "
-"equality."
+"the Hibernate website for a full discussion of this problem. This is not a "
+"Hibernate issue, but normal Java semantics of object identity and equality."
 msgstr ""
 "实现<literal>equals()</literal>/<literal>hashCode()</literal>最显而易见的方法"
 "是比较两个对象 标识符的值。如果值相同,则两个对象对应于数据库的同一行,因此它"
@@ -439,13 +442,14 @@
 
 #. Tag: para
 #: persistent_classes.xml:216
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
-"</literal> using <emphasis>Business key equality</emphasis>. Business key "
-"equality means that the <literal>equals()</literal> method compares only the "
-"properties that form the business key, a key that would identify our "
-"instance in the real world (a <emphasis>natural</emphasis> candidate key):"
+"It is recommended that you implement <literal>equals()</literal> and "
+"<literal>hashCode()</literal> using <emphasis>Business key equality</"
+"emphasis>. Business key equality means that the <literal>equals()</literal> "
+"method compares only the properties that form the business key. It is a key "
+"that would identify our instance in the real world (a <emphasis>natural</"
+"emphasis> candidate key):"
 msgstr ""
 "我们建议使用<emphasis>业务键值相等(Business key equality)</emphasis>来实现"
 "<literal>equals()</literal> 和 <literal>hashCode()</literal>。业务键值相等的"
@@ -483,12 +487,11 @@
 
 #. Tag: para
 #: persistent_classes.xml:226
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that a business key does not have to be as solid as a database primary "
-"key candidate (see <xref linkend=\"transactions-basics-identity\"/>). "
-"Immutable or unique properties are usually good candidates for a business "
-"key."
+"A business key does not have to be as solid as a database primary key "
+"candidate (see <xref linkend=\"transactions-basics-identity\"/>). Immutable "
+"or unique properties are usually good candidates for a business key."
 msgstr ""
 "注意,业务键不必像数据库的主键那样固定不变(参见<xref linkend=\"transactions-"
 "basics-identity\"/>)。 对业务键而言,不可变或唯一的属性是不错的选择。"
@@ -499,23 +502,29 @@
 msgid "Dynamic models"
 msgstr "动态模型(Dynamic models)"
 
-#. Tag: emphasis
+#. Tag: title
 #: persistent_classes.xml:239
 #, no-c-format
+msgid "Note"
+msgstr ""
+
+#. Tag: emphasis
+#: persistent_classes.xml:241
+#, fuzzy, no-c-format
 msgid ""
-"Note that the following features are currently considered experimental and "
-"may change in the near future."
+"The following features are currently considered experimental and may change "
+"in the near future."
 msgstr "注意,以下特性在当前处于试验阶段,将来可能会有变化。"
 
 #. Tag: para
-#: persistent_classes.xml:243
-#, no-c-format
+#: persistent_classes.xml:246
+#, fuzzy, no-c-format
 msgid ""
-"Persistent entities don't necessarily have to be represented as POJO classes "
-"or as JavaBean objects at runtime. Hibernate also supports dynamic models "
-"(using <literal>Map</literal>s of <literal>Map</literal>s at runtime) and "
-"the representation of entities as DOM4J trees. With this approach, you don't "
-"write persistent classes, only mapping files."
+"Persistent entities do not necessarily have to be represented as POJO "
+"classes or as JavaBean objects at runtime. Hibernate also supports dynamic "
+"models (using <literal>Map</literal>s of <literal>Map</literal>s at runtime) "
+"and the representation of entities as DOM4J trees. With this approach, you "
+"do not write persistent classes, only mapping files."
 msgstr ""
 "运行期的持久化实体没有必要一定表示为像POJO类或JavaBean对象那样的形式。"
 "Hibernate也支持动态模型 (在运行期使用<literal>Map</literal>的<literal>Map</"
@@ -523,13 +532,13 @@
 "只写映射文件就行了。"
 
 #. Tag: para
-#: persistent_classes.xml:251
-#, no-c-format
+#: persistent_classes.xml:254
+#, fuzzy, no-c-format
 msgid ""
-"By default, Hibernate works in normal POJO mode. You may set a default "
+"By default, Hibernate works in normal POJO mode. You can set a default "
 "entity representation mode for a particular <literal>SessionFactory</"
 "literal> using the <literal>default_entity_mode</literal> configuration "
-"option (see <xref linkend=\"configuration-optional-properties\"/>."
+"option (see <xref linkend=\"configuration-optional-properties\"/>)."
 msgstr ""
 "Hibernate默认工作在普通POJO模式。你可以使用配置选项"
 "<literal>default_entity_mode</literal>, 对特定的<literal>SessionFactory</"
@@ -537,18 +546,18 @@
 "optional-properties\"/>。)"
 
 #. Tag: para
-#: persistent_classes.xml:258
-#, no-c-format
+#: persistent_classes.xml:261
+#, fuzzy, no-c-format
 msgid ""
-"The following examples demonstrates the representation using <literal>Map</"
-"literal>s. First, in the mapping file, an <literal>entity-name</literal> has "
-"to be declared instead of (or in addition to) a class name:"
+"The following examples demonstrate the representation using <literal>Map</"
+"literal>s. First, in the mapping file an <literal>entity-name</literal> has "
+"to be declared instead of, or in addition to, a class name:"
 msgstr ""
 "下面是用<literal>Map</literal>来表示的例子。首先,在映射文件中,要声明 "
 "<literal>entity-name</literal>来代替一个类名(或作为一种附属)。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:264
+#: persistent_classes.xml:267
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -587,22 +596,21 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:266
-#, no-c-format
+#: persistent_classes.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"Note that even though associations are declared using target class names, "
-"the target type of an associations may also be a dynamic entity instead of a "
-"POJO."
+"Even though associations are declared using target class names, the target "
+"type of associations can also be a dynamic entity instead of a POJO."
 msgstr ""
 "注意,虽然是用目标类名来声明关联的,但是关联的目标类型除了是POJO之外,也可以 "
 "是一个动态的实体。"
 
 #. Tag: para
-#: persistent_classes.xml:273
-#, no-c-format
+#: persistent_classes.xml:276
+#, fuzzy, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
-"the <literal>SessionFactory</literal>, we can at runtime work with "
+"the <literal>SessionFactory</literal>, you can, at runtime, work with "
 "<literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 "在使用<literal>dynamic-map</literal>为<literal>SessionFactory</literal> 设置"
@@ -610,7 +618,7 @@
 "literal>。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:279
+#: persistent_classes.xml:282
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -637,14 +645,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:281
-#, no-c-format
+#: persistent_classes.xml:284
+#, fuzzy, no-c-format
 msgid ""
-"The advantages of a dynamic mapping are quick turnaround time for "
-"prototyping without the need for entity class implementation. However, you "
-"lose compile-time type checking and will very likely deal with many "
-"exceptions at runtime. Thanks to the Hibernate mapping, the database schema "
-"can easily be normalized and sound, allowing to add a proper domain model "
+"One of the main advantages of dynamic mapping is quick turnaround time for "
+"prototyping, without the need for entity class implementation. However, you "
+"lose compile-time type checking and will likely deal with many exceptions at "
+"runtime. As a result of the Hibernate mapping, the database schema can "
+"easily be normalized and sound, allowing to add a proper domain model "
 "implementation on top later on."
 msgstr ""
 "动态映射的好处是,变化所需要的时间少了,因为原型不需要实现实体类。然而,你无"
@@ -653,7 +661,7 @@
 "的领域模型实现。"
 
 #. Tag: para
-#: persistent_classes.xml:289
+#: persistent_classes.xml:292
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -661,7 +669,7 @@
 msgstr "实体表示模式也能在每个<literal>Session</literal>的基础上设置:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:294
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -679,14 +687,14 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:297
-#, no-c-format
+#: persistent_classes.xml:300
+#, fuzzy, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
 "<literal>EntityMode</literal> is on the <literal>Session</literal> API, not "
 "the <literal>SessionFactory</literal>. That way, the new <literal>Session</"
 "literal> shares the underlying JDBC connection, transaction, and other "
-"context information. This means you don't have tocall <literal>flush()</"
+"context information. This means you do not have to call <literal>flush()</"
 "literal> and <literal>close()</literal> on the secondary <literal>Session</"
 "literal>, and also leave the transaction and connection handling to the "
 "primary unit of work."
@@ -699,7 +707,7 @@
 "的处理 交给原来的工作单元。"
 
 #. Tag: para
-#: persistent_classes.xml:307
+#: persistent_classes.xml:310
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -707,29 +715,24 @@
 msgstr "关于XML表示能力的更多信息可以在<xref linkend=\"xml\"/>中找到。"
 
 #. Tag: title
-#: persistent_classes.xml:315
+#: persistent_classes.xml:318
 #, no-c-format
 msgid "Tuplizers"
 msgstr "元组片断映射(Tuplizers)"
 
 #. Tag: para
-#: persistent_classes.xml:317
-#, no-c-format
+#: persistent_classes.xml:320
+#, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
-"responsible for managing a particular representation of a piece of data, "
+"responsible for managing a particular representation of a piece of data "
 "given that representation's <literal>org.hibernate.EntityMode</literal>. If "
 "a given piece of data is thought of as a data structure, then a tuplizer is "
-"the thing which knows how to create such a data structure and how to extract "
+"the thing that knows how to create such a data structure and how to extract "
 "values from and inject values into such a data structure. For example, for "
-"the POJO entity mode, the correpsonding tuplizer knows how create the POJO "
-"through its constructor and how to access the POJO properties using the "
-"defined property accessors. There are two high-level types of Tuplizers, "
-"represented by the <literal>org.hibernate.tuple.entity.EntityTuplizer</"
-"literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</"
-"literal> interfaces. <literal>EntityTuplizer</literal>s are responsible for "
-"managing the above mentioned contracts in regards to entities, while "
-"<literal>ComponentTuplizer</literal>s do the same for components."
+"the POJO entity mode, the corresponding tuplizer knows how create the POJO "
+"through its constructor. It also knows how to access the POJO properties "
+"using the defined property accessors."
 msgstr ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>,以及其子接口,负责根据给定的"
 "<literal>org.hibernate.EntityMode</literal>,来复现片断数据。如果给定的片断数"
@@ -742,17 +745,29 @@
 "面提到的实体的契约,而<literal>ComponentTuplizer</literal>则是针对组件的。"
 
 #. Tag: para
-#: persistent_classes.xml:332
+#: persistent_classes.xml:330
 #, no-c-format
 msgid ""
-"Users may also plug in their own tuplizers. Perhaps you require that a "
+"There are two high-level types of Tuplizers, represented by the <literal>org."
+"hibernate.tuple.entity.EntityTuplizer</literal> and <literal>org.hibernate."
+"tuple.component.ComponentTuplizer</literal> interfaces. "
+"<literal>EntityTuplizer</literal>s are responsible for managing the above "
+"mentioned contracts in regards to entities, while "
+"<literal>ComponentTuplizer</literal>s do the same for components."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:338
+#, fuzzy, no-c-format
+msgid ""
+"Users can also plug in their own tuplizers. Perhaps you require that a "
 "<literal>java.util.Map</literal> implementation other than <literal>java."
-"util.HashMap</literal> be used while in the dynamic-map entity-mode; or "
+"util.HashMap</literal> be used while in the dynamic-map entity-mode. Or "
 "perhaps you need to define a different proxy generation strategy than the "
 "one used by default. Both would be achieved by defining a custom tuplizer "
-"implementation. Tuplizers definitions are attached to the entity or "
-"component mapping they are meant to manage. Going back to the example of our "
-"customer entity:"
+"implementation. Tuplizer definitions are attached to the entity or component "
+"mapping they are meant to manage. Going back to the example of our customer "
+"entity:"
 msgstr ""
 "用户也可以插入其自定义的tuplizer。或许您需要一种不同于dynamic-map entity-mode"
 "中使用的<literal>java.util.HashMap</literal>的<literal>java.util.Map</"
@@ -761,7 +776,7 @@
 "到它们期望管理的entity或者component映射中。回到我们的customer entity例子:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:341
+#: persistent_classes.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -802,14 +817,192 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:347
+#: persistent_classes.xml:354
 #, no-c-format
-msgid "Extentsions"
+msgid "EntityNameResolvers"
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:348
+#: persistent_classes.xml:356
 #, no-c-format
 msgid ""
-"TODO: Document user-extension framework in the property and proxy packages"
-msgstr "TODO:property和proxy包里的用户扩展框架文档。"
+"The <interfacename>org.hibernate.EntityNameResolver</interfacename> "
+"interface is a contract for resolving the entity name of a given entity "
+"instance. The interface defines a single method "
+"<methodname>resolveEntityName</methodname> which is passed the entity "
+"instance and is expected to return the appropriate entity name (null is "
+"allowed and would indicate that the resolver does not know how to resolve "
+"the entity name of the given entity instance). Generally speaking, an "
+"<interfacename>org.hibernate.EntityNameResolver</interfacename> is going to "
+"be most useful in the case of dynamic models. One example might be using "
+"proxied interfaces as your domain model. The hibernate test suite has an "
+"example of this exact style of usage under the <package>org.hibernate.test."
+"dynamicentity.tuplizer2</package>. Here is some of the code from that "
+"package for illustration."
+msgstr ""
+
+#. Tag: programlisting
+#: persistent_classes.xml:368
+#, no-c-format
+msgid ""
+"/**\n"
+" * A very trivial JDK Proxy InvocationHandler implementation where we proxy "
+"an interface as\n"
+" * the domain model and simply store persistent state in an internal Map.  "
+"This is an extremely\n"
+" * trivial example meant only for illustration.\n"
+" */\n"
+"public final class DataProxyHandler implements InvocationHandler {\n"
+"        private String entityName;\n"
+"        private HashMap data = new HashMap();\n"
+"\n"
+"        public DataProxyHandler(String entityName, Serializable id) {\n"
+"                this.entityName = entityName;\n"
+"                data.put( \"Id\", id );\n"
+"        }\n"
+"\n"
+"        public Object invoke(Object proxy, Method method, Object[] args) "
+"throws Throwable {\n"
+"                String methodName = method.getName();\n"
+"                if ( methodName.startsWith( \"set\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        data.put( propertyName, args[0] );\n"
+"                }\n"
+"                else if ( methodName.startsWith( \"get\" ) ) {\n"
+"                        String propertyName = methodName.substring( 3 );\n"
+"                        return data.get( propertyName );\n"
+"                }\n"
+"                else if ( \"toString\".equals( methodName ) ) {\n"
+"                        return entityName + \"#\" + data.get( \"Id\" );\n"
+"                }\n"
+"                else if ( \"hashCode\".equals( methodName ) ) {\n"
+"                        return new Integer( this.hashCode() );\n"
+"                }\n"
+"                return null;\n"
+"        }\n"
+"\n"
+"        public String getEntityName() {\n"
+"                return entityName;\n"
+"        }\n"
+"\n"
+"        public HashMap getData() {\n"
+"                return data;\n"
+"        }\n"
+"}\n"
+"\n"
+"/**\n"
+" *\n"
+" */\n"
+"public class ProxyHelper {\n"
+"    public static String extractEntityName(Object object) {\n"
+"        // Our custom java.lang.reflect.Proxy instances actually bundle\n"
+"        // their appropriate entity name, so we simply extract it from "
+"there\n"
+"        // if this represents one of our proxies; otherwise, we return null\n"
+"        if ( Proxy.isProxyClass( object.getClass() ) ) {\n"
+"            InvocationHandler handler = Proxy.getInvocationHandler"
+"( object );\n"
+"            if ( DataProxyHandler.class.isAssignableFrom( handler.getClass"
+"() ) ) {\n"
+"                DataProxyHandler myHandler = ( DataProxyHandler ) handler;\n"
+"                return myHandler.getEntityName();\n"
+"            }\n"
+"        }\n"
+"        return null;\n"
+"    }\n"
+"\n"
+"    // various other utility methods ....\n"
+"\n"
+"}\n"
+"\n"
+"/**\n"
+" * The EntityNameResolver implementation.\n"
+" * IMPL NOTE : An EntityNameResolver really defines a strategy for how "
+"entity names should be\n"
+" * resolved.  Since this particular impl can handle resolution for all of "
+"our entities we want to\n"
+" * take advantage of the fact that SessionFactoryImpl keeps these in a Set "
+"so that we only ever\n"
+" * have one instance registered.  Why?  Well, when it comes time to resolve "
+"an entity name,\n"
+" * Hibernate must iterate over all the registered resolvers.  So keeping "
+"that number down\n"
+" * helps that process be as speedy as possible.  Hence the equals and "
+"hashCode impls\n"
+" */\n"
+"public class MyEntityNameResolver implements EntityNameResolver {\n"
+"    public static final MyEntityNameResolver INSTANCE = new "
+"MyEntityNameResolver();\n"
+"\n"
+"    public String resolveEntityName(Object entity) {\n"
+"        return ProxyHelper.extractEntityName( entity );\n"
+"    }\n"
+"\n"
+"    public boolean equals(Object obj) {\n"
+"        return getClass().equals( obj.getClass() );\n"
+"    }\n"
+"\n"
+"    public int hashCode() {\n"
+"        return getClass().hashCode();\n"
+"    }\n"
+"}\n"
+"\n"
+"public class MyEntityTuplizer extends PojoEntityTuplizer {\n"
+"        public MyEntityTuplizer(EntityMetamodel entityMetamodel, "
+"PersistentClass mappedEntity) {\n"
+"                super( entityMetamodel, mappedEntity );\n"
+"        }\n"
+"\n"
+"        public EntityNameResolver[] getEntityNameResolvers() {\n"
+"                return new EntityNameResolver[] { MyEntityNameResolver."
+"INSTANCE };\n"
+"        }\n"
+"\n"
+"    public String determineConcreteSubclassEntityName(Object entityInstance, "
+"SessionFactoryImplementor factory) {\n"
+"        String entityName = ProxyHelper.extractEntityName"
+"( entityInstance );\n"
+"        if ( entityName == null ) {\n"
+"            entityName = super.determineConcreteSubclassEntityName"
+"( entityInstance, factory );\n"
+"        }\n"
+"        return entityName;\n"
+"    }\n"
+"\n"
+"    ...\n"
+"}"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:370
+#, no-c-format
+msgid ""
+"In order to register an <interfacename>org.hibernate.EntityNameResolver</"
+"interfacename> users must either:"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:374
+#, no-c-format
+msgid ""
+"Implement a custom <link linkend=\"persistent-classes-tuplizers\">Tuplizer</"
+"link>, implementing the <methodname>getEntityNameResolvers</methodname> "
+"method."
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:380
+#, no-c-format
+msgid ""
+"Register it with the <classname>org.hibernate.impl.SessionFactoryImpl</"
+"classname> (which is the implementation class for <interfacename>org."
+"hibernate.SessionFactory</interfacename>) using the "
+"<methodname>registerEntityNameResolver</methodname> method."
+msgstr ""
+
+#~ msgid "There are four main rules to follow here:"
+#~ msgstr "这里要遵循四条主要的规则:"
+
+#~ msgid ""
+#~ "TODO: Document user-extension framework in the property and proxy packages"
+#~ msgstr "TODO:property和proxy包里的用户扩展框架文档。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/preface.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/preface.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/preface.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,19 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: preface.xml:21
+#: preface.xml:29
 #, no-c-format
 msgid "Preface"
 msgstr "前言"
 
 #. Tag: para
-#: preface.xml:23
-#, no-c-format
+#: preface.xml:31
+#, fuzzy, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
 "cumbersome and time consuming in today's enterprise environments. Hibernate "
-"is an object/relational mapping tool for Java environments. The term object/"
-"relational mapping (ORM) refers to the technique of mapping a data "
+"is an Object/Relational Mapping tool for Java environments. The term Object/"
+"Relational Mapping (ORM) refers to the technique of mapping a data "
 "representation from an object model to a relational data model with a SQL-"
 "based schema."
 msgstr ""
@@ -33,23 +33,23 @@
 "的对象映射到基于SQL的关系模型数据结构中去。"
 
 #. Tag: para
-#: preface.xml:31
-#, no-c-format
+#: preface.xml:39
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
 "tables (and from Java data types to SQL data types), but also provides data "
-"query and retrieval facilities and can significantly reduce development time "
-"otherwise spent with manual data handling in SQL and JDBC."
+"query and retrieval facilities. It can also significantly reduce development "
+"time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 "Hibernate不仅仅管理Java类到数据库表的映射(包括Java数据类型到SQL数据类型的映"
 "射),还提供数据查询和获取数据的方法,可以大幅度减少开发时人工使用SQL和JDBC处"
 "理数据的时间。"
 
 #. Tag: para
-#: preface.xml:38
-#, no-c-format
+#: preface.xml:46
+#, fuzzy, no-c-format
 msgid ""
-"Hibernates goal is to relieve the developer from 95 percent of common data "
+"Hibernate's goal is to relieve the developer from 95 percent of common data "
 "persistence related programming tasks. Hibernate may not be the best "
 "solution for data-centric applications that only use stored-procedures to "
 "implement the business logic in the database, it is most useful with object-"
@@ -66,7 +66,7 @@
 "表示形式转换到一系列的对象去。"
 
 #. Tag: para
-#: preface.xml:48
+#: preface.xml:56
 #, no-c-format
 msgid ""
 "If you are new to Hibernate and Object/Relational Mapping or even Java, "
@@ -76,7 +76,7 @@
 "按照下面的步骤来学习。"
 
 #. Tag: para
-#: preface.xml:55
+#: preface.xml:63
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"tutorial\"/> for a tutorial with step-by-step "
@@ -88,7 +88,7 @@
 "下找到。"
 
 #. Tag: para
-#: preface.xml:63
+#: preface.xml:71
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
@@ -96,15 +96,15 @@
 msgstr "阅读<xref linkend=\"architecture\"/>来理解Hibernate可以使用的环境。"
 
 #. Tag: para
-#: preface.xml:69
-#, no-c-format
+#: preface.xml:77
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at the <literal>eg/</literal> directory in the Hibernate "
-"distribution, it contains a simple standalone application. Copy your JDBC "
-"driver to the <literal>lib/</literal> directory and edit <literal>etc/"
-"hibernate.properties</literal>, specifying correct values for your database. "
-"From a command prompt in the distribution directory, type <literal>ant eg</"
-"literal> (using Ant), or under Windows, type <literal>build eg</literal>."
+"View the <literal>eg/</literal> directory in the Hibernate distribution. It "
+"contains a simple standalone application. Copy your JDBC driver to the "
+"<literal>lib/</literal> directory and edit <literal>etc/hibernate."
+"properties</literal>, specifying correct values for your database. From a "
+"command prompt in the distribution directory, type <literal>ant eg</literal> "
+"(using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 "查看Hibernate发行包中的<literal>eg/</literal>目录,里面有一个简单的独立运行的"
 "程序。把你的JDBC驱动拷贝到<literal>lib/</literal>目录下,修改一下"
@@ -113,33 +113,33 @@
 "在Windows操作系统中使用<literal>build eg</literal>。"
 
 #. Tag: para
-#: preface.xml:80
-#, no-c-format
+#: preface.xml:88
+#, fuzzy, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
-"Consider reading <emphasis>Java Persistence with Hibernate</emphasis> "
-"(http://www.manning.com/bauer2) if you need more help with application "
-"design or if you prefer a step-by-step tutorial. Also visit http://"
-"caveatemptor.hibernate.org and download the example application for Java "
-"Persistence with Hibernate."
+"Consider reading <biblioref linkend=\"biblio-JPwH\"></biblioref> if you need "
+"more help with application design, or if you prefer a step-by-step tutorial. "
+"Also visit <ulink url=\"http://caveatemptor.hibernate.org\"></ulink> and "
+"download the example application from <biblioref linkend=\"biblio-JPwH\"></"
+"biblioref>."
 msgstr "把这份参考文档作为你学习的主要信息来源。"
 
 #. Tag: para
-#: preface.xml:90
+#: preface.xml:98
 #, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr "在Hibernate 的网站上可以找到经常提问的问题与解答(FAQ)。"
 
 #. Tag: para
-#: preface.xml:95
-#, no-c-format
+#: preface.xml:103
+#, fuzzy, no-c-format
 msgid ""
-"Third party demos, examples, and tutorials are linked on the Hibernate "
-"website."
+"Links to third party demos, examples, and tutorials are maintained on the "
+"Hibernate website."
 msgstr "在Hibernate网站上还有第三方的演示、示例和教程的链接。"
 
 #. Tag: para
-#: preface.xml:101
+#: preface.xml:109
 #, no-c-format
 msgid ""
 "The Community Area on the Hibernate website is a good resource for design "
@@ -150,11 +150,11 @@
 "(Tomcat, JBoss AS, Struts, EJB,等等)的好地方。"
 
 #. Tag: para
-#: preface.xml:109
-#, no-c-format
+#: preface.xml:117
+#, fuzzy, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
-"We also provide a JIRA issue trackings system for bug reports and feature "
+"We also provide a JIRA issue tracking system for bug reports and feature "
 "requests. If you are interested in the development of Hibernate, join the "
 "developer mailing list. If you are interested in translating this "
 "documentation into your language, contact us on the developer mailing list."
@@ -165,7 +165,7 @@
 "版面,您可以在那里交流问题与经验。)"
 
 #. Tag: para
-#: preface.xml:117
+#: preface.xml:125
 #, no-c-format
 msgid ""
 "Commercial development support, production support, and training for "

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_criteria.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_criteria.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -79,8 +79,8 @@
 
 #. Tag: para
 #: query_criteria.xml:61
-#, no-c-format
-msgid "Restrictions may be grouped logically."
+#, fuzzy, no-c-format
+msgid "Restrictions can be grouped logically."
 msgstr "约束可以按逻辑分组。"
 
 #. Tag: programlisting
@@ -114,10 +114,10 @@
 
 #. Tag: para
 #: query_criteria.xml:69
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"There are quite a range of built-in criterion types (<literal>Restrictions</"
-"literal> subclasses), but one that is especially useful lets you specify SQL "
+"There are a range of built-in criterion types (<literal>Restrictions</"
+"literal> subclasses). One of the most useful allows you to specify SQL "
 "directly."
 msgstr ""
 "Hibernate提供了相当多的内置criterion类型(<literal>Restrictions</literal> 子"
@@ -143,11 +143,11 @@
 
 #. Tag: para
 #: query_criteria.xml:81
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An alternative approach to obtaining a criterion is to get it from a "
-"<literal>Property</literal> instance. You can create a <literal>Property</"
-"literal> by calling <literal>Property.forName()</literal>."
+"You can also obtain a criterion from a <literal>Property</literal> instance. "
+"You can create a <literal>Property</literal> by calling <literal>Property."
+"forName()</literal>:"
 msgstr ""
 "<literal>Property</literal>实例是获得一个条件的另外一种途径。你可以通过调用"
 "<literal>Property.forName()</literal> 创建一个<literal>Property</literal>。"
@@ -178,9 +178,9 @@
 
 #. Tag: para
 #: query_criteria.xml:94
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may order the results using <literal>org.hibernate.criterion.Order</"
+"You can order the results using <literal>org.hibernate.criterion.Order</"
 "literal>."
 msgstr ""
 "你可以使用<literal>org.hibernate.criterion.Order</literal>来为查询结果排序。"
@@ -219,11 +219,9 @@
 #: query_criteria.xml:107
 #, no-c-format
 msgid ""
-"You may easily specify constraints upon related entities by navigating "
-"associations using <literal>createCriteria()</literal>."
+"By navigating associations using <literal>createCriteria()</literal> you can "
+"specify constraints upon related entities:"
 msgstr ""
-"你可以使用<literal>createCriteria()</literal>非常容易的在互相关联的实体间建"
-"立 约束。"
 
 #. Tag: programlisting
 #: query_criteria.xml:112
@@ -238,10 +236,10 @@
 
 #. Tag: para
 #: query_criteria.xml:114
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"note that the second <literal>createCriteria()</literal> returns a new "
-"instance of <literal>Criteria</literal>, which refers to the elements of the "
+"The second <literal>createCriteria()</literal> returns a new instance of "
+"<literal>Criteria</literal> that refers to the elements of the "
 "<literal>kittens</literal> collection."
 msgstr ""
 "注意第二个 <literal>createCriteria()</literal>返回一个新的 "
@@ -250,8 +248,9 @@
 
 #. Tag: para
 #: query_criteria.xml:120
-#, no-c-format
-msgid "The following, alternate form is useful in certain circumstances."
+#, fuzzy, no-c-format
+msgid ""
+"There is also an alternate form that is useful in certain circumstances:"
 msgstr "接下来,替换形态在某些情况下也是很有用的。"
 
 #. Tag: programlisting
@@ -277,11 +276,11 @@
 
 #. Tag: para
 #: query_criteria.xml:131
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the kittens collections held by the <literal>Cat</literal> "
-"instances returned by the previous two queries are <emphasis>not</emphasis> "
-"pre-filtered by the criteria! If you wish to retrieve just the kittens that "
+"The kittens collections held by the <literal>Cat</literal> instances "
+"returned by the previous two queries are <emphasis>not</emphasis> pre-"
+"filtered by the criteria. If you want to retrieve just the kittens that "
 "match the criteria, you must use a <literal>ResultTransformer</literal>."
 msgstr ""
 "<literal>Cat</literal>实例所保存的之前两次查询所返回的kittens集合是 "
@@ -313,9 +312,9 @@
 
 #. Tag: para
 #: query_criteria.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may specify association fetching semantics at runtime using "
+"You can specify association fetching semantics at runtime using "
 "<literal>setFetchMode()</literal>."
 msgstr ""
 "你可以使用<literal>setFetchMode()</literal>在运行时定义动态关联抓取的语义。"
@@ -424,11 +423,11 @@
 
 #. Tag: para
 #: query_criteria.xml:190
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
-"factory for <literal>Projection</literal> instances. We apply a projection "
-"to a query by calling <literal>setProjection()</literal>."
+"factory for <literal>Projection</literal> instances. You can apply a "
+"projection to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 "<literal>org.hibernate.criterion.Projections</literal>是 "
 "<literal>Projection</literal> 的实例工厂。我们通过调用 <literal>setProjection"
@@ -472,11 +471,11 @@
 
 #. Tag: para
 #: query_criteria.xml:206
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An alias may optionally be assigned to a projection, so that the projected "
-"value may be referred to in restrictions or orderings. Here are two "
-"different ways to do this:"
+"An alias can be assigned to a projection so that the projected value can be "
+"referred to in restrictions or orderings. Here are two different ways to do "
+"this:"
 msgstr ""
 "你可以选择把一个别名指派给一个投影,这样可以使投影值被约束或排序所引用。下面"
 "是两种不同的实现方式:"
@@ -588,11 +587,11 @@
 
 #. Tag: para
 #: query_criteria.xml:239
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>DetachedCriteria</literal> class lets you create a query "
-"outside the scope of a session, and then later execute it using some "
-"arbitrary <literal>Session</literal>."
+"The <literal>DetachedCriteria</literal> class allows you to create a query "
+"outside the scope of a session and then execute it using an arbitrary "
+"<literal>Session</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal>类使你在一个session范围之外创建一个查询,"
 "并且可以使用任意的 <literal>Session</literal>来执行它。"
@@ -614,10 +613,10 @@
 
 #. Tag: para
 #: query_criteria.xml:246
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>DetachedCriteria</literal> may also be used to express a "
-"subquery. Criterion instances involving subqueries may be obtained via "
+"A <literal>DetachedCriteria</literal> can also be used to express a "
+"subquery. Criterion instances involving subqueries can be obtained via "
 "<literal>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 "<literal>DetachedCriteria</literal>也可以用以表示子查询。条件实例包含子查询可"
@@ -647,8 +646,8 @@
 
 #. Tag: para
 #: query_criteria.xml:256
-#, no-c-format
-msgid "Even correlated subqueries are possible:"
+#, fuzzy, no-c-format
+msgid "Correlated subqueries are also possible:"
 msgstr "甚至相互关联的子查询也是有可能的:"
 
 #. Tag: programlisting
@@ -672,11 +671,11 @@
 
 #. Tag: para
 #: query_criteria.xml:271
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For most queries, including criteria queries, the query cache is not very "
-"efficient, because query cache invalidation occurs too frequently. However, "
-"there is one special kind of query where we can optimize the cache "
+"For most queries, including criteria queries, the query cache is not "
+"efficient because query cache invalidation occurs too frequently. However, "
+"there is a special kind of query where you can optimize the cache "
 "invalidation algorithm: lookups by a constant natural key. In some "
 "applications, this kind of query occurs frequently. The criteria API "
 "provides special provision for this use case."
@@ -688,10 +687,10 @@
 
 #. Tag: para
 #: query_criteria.xml:279
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"First, you should map the natural key of your entity using <literal>&lt;"
-"natural-id&gt;</literal>, and enable use of the second-level cache."
+"First, map the natural key of your entity using <literal>&lt;natural-id&gt;</"
+"literal> and enable use of the second-level cache."
 msgstr ""
 "首先,你应该对你的entity使用<literal>&lt;natural-id&gt;</literal>来映射自然"
 "键,然后打开第二级缓存。"
@@ -715,30 +714,25 @@
 
 #. Tag: para
 #: query_criteria.xml:286
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that this functionality is not intended for use with entities with "
+"This functionality is not intended for use with entities with "
 "<emphasis>mutable</emphasis> natural keys."
 msgstr "注意,此功能对具有<emphasis>mutable</emphasis>自然键的entity并不适用。"
 
 #. Tag: para
 #: query_criteria.xml:291
-#, no-c-format
-msgid "Next, enable the Hibernate query cache."
-msgstr "然后,打开Hibernate 查询缓存。"
-
-#. Tag: para
-#: query_criteria.xml:295
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
-"the more efficient cache algorithm."
+"Once you have enabled the Hibernate query cache, the <literal>Restrictions."
+"naturalId()</literal> allows you to make use of the more efficient cache "
+"algorithm."
 msgstr ""
 "现在,我们可以用<literal>Restrictions.naturalId()</literal>来使用更加高效的缓"
 "存算法。"
 
 #. Tag: programlisting
-#: query_criteria.xml:300
+#: query_criteria.xml:297
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"
@@ -748,3 +742,13 @@
 "    ).setCacheable(true)\n"
 "    .uniqueResult();]]>"
 msgstr ""
+
+#~ msgid ""
+#~ "You may easily specify constraints upon related entities by navigating "
+#~ "associations using <literal>createCriteria()</literal>."
+#~ msgstr ""
+#~ "你可以使用<literal>createCriteria()</literal>非常容易的在互相关联的实体间"
+#~ "建立 约束。"
+
+#~ msgid "Next, enable the Hibernate query cache."
+#~ msgstr "然后,打开Hibernate 查询缓存。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,11 @@
 
 #. Tag: para
 #: query_hql.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate is equipped with an extremely powerful query language that (quite "
-"intentionally) looks very much like SQL. But don't be fooled by the syntax; "
-"HQL is fully object-oriented, understanding notions like inheritence, "
-"polymorphism and association."
+"Hibernate uses a powerful query language (HQL) that is similar in appearance "
+"to SQL. Compared with SQL, however, HQL is fully object-oriented and "
+"understands notions like inheritance, polymorphism and association."
 msgstr ""
 "Hibernate配备了一种非常强大的查询语言,这种语言看上去很像SQL。但是不要被语法"
 "结构 上的相似所迷惑,HQL是非常有意识的被设计为完全面向对象的查询,它可以理解"
@@ -37,13 +36,13 @@
 
 #. Tag: para
 #: query_hql.xml:40
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Queries are case-insensitive, except for names of Java classes and "
-"properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
-"literal> is the same as <literal>SELECT</literal> but <literal>org.hibernate."
-"eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and "
-"<literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
+"With the exception of names of Java classes and properties, queries are case-"
+"insensitive. So <literal>SeLeCT</literal> is the same as <literal>sELEct</"
+"literal> is the same as <literal>SELECT</literal>, but <literal>org."
+"hibernate.eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal>, "
+"and <literal>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 "除了Java类与属性的名称外,查询语句对大小写并不敏感。 所以 <literal>SeLeCT</"
 "literal> 与 <literal>sELEct</literal> 以及 <literal>SELECT</literal> 是相同"
@@ -53,11 +52,11 @@
 
 #. Tag: para
 #: query_hql.xml:51
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
-"uppercase keywords more readable, but we find this convention ugly when "
-"embedded in Java code."
+"uppercase keywords more readable, but this convention is unsuitable for "
+"queries embedded in Java code."
 msgstr ""
 "本手册中的HQL关键字将使用小写字母. 很多用户发现使用完全大写的关键字会使查询语"
 "句 的可读性更强, 但我们发现,当把查询语句嵌入到Java语句中的时候使用大写关键字"
@@ -83,11 +82,11 @@
 
 #. Tag: para
 #: query_hql.xml:67
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"which simply returns all instances of the class <literal>eg.Cat</literal>. "
-"We don't usually need to qualify the class name, since <literal>auto-import</"
-"literal> is the default. So we almost always just write:"
+"This returns all instances of the class <literal>eg.Cat</literal>. You do "
+"not usually need to qualify the class name, since <literal>auto-import</"
+"literal> is the default. For example:"
 msgstr ""
 "该子句简单的返回<literal>eg.Cat</literal>类的所有实例。 通常我们不需要使用类"
 "的全限定名, 因为 <literal>auto-import</literal>(自动引入) 是缺省的情况。 所"
@@ -103,12 +102,9 @@
 #: query_hql.xml:75
 #, no-c-format
 msgid ""
-"Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
-"since you will want to refer to the <literal>Cat</literal> in other parts of "
-"the query."
+"In order to refer to the <literal>Cat</literal> in other parts of the query, "
+"you will need to assign an <emphasis>alias</emphasis>. For example:"
 msgstr ""
-"大多数情况下, 你需要指定一个<emphasis>别名</emphasis>, 原因是你可能需要 在查"
-"询语句的其它部分引用到<literal>Cat</literal>"
 
 #. Tag: programlisting
 #: query_hql.xml:81 query_hql.xml:396
@@ -118,11 +114,11 @@
 
 #. Tag: para
 #: query_hql.xml:83
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
-"literal> instances, so we could use that alias later in the query. The "
-"<literal>as</literal> keyword is optional; we could also write:"
+"literal> instances, so you can use that alias later in the query. The "
+"<literal>as</literal> keyword is optional. You could also write:"
 msgstr ""
 "这个语句把别名<literal>cat</literal>指定给类<literal>Cat</literal> 的实例, 这"
 "样我们就可以在随后的查询中使用此别名了。 关键字<literal>as</literal> 是可选"
@@ -136,9 +132,9 @@
 
 #. Tag: para
 #: query_hql.xml:91
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Multiple classes may appear, resulting in a cartesian product or \"cross\" "
+"Multiple classes can appear, resulting in a cartesian product or \"cross\" "
 "join."
 msgstr ""
 "子句中可以同时出现多个类, 其查询结果是产生一个笛卡儿积或产生跨表的连接。"
@@ -157,10 +153,10 @@
 
 #. Tag: para
 #: query_hql.xml:98
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is considered good practice to name query aliases using an initial "
-"lowercase, consistent with Java naming standards for local variables (eg. "
+"It is good practice to name query aliases using an initial lowercase as this "
+"is consistent with Java naming standards for local variables (e.g. "
 "<literal>domesticCat</literal>)."
 msgstr ""
 "查询语句中别名的开头部分小写被认为是实践中的好习惯, 这样做与Java变量的命名标"
@@ -174,10 +170,10 @@
 
 #. Tag: para
 #: query_hql.xml:109
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We may also assign aliases to associated entities, or even to elements of a "
-"collection of values, using a <literal>join</literal>."
+"You can also assign aliases to associated entities or to elements of a "
+"collection of values using a <literal>join</literal>. For example:"
 msgstr ""
 "我们也可以为相关联的实体甚至是对一个集合中的全部元素指定一个别名, 这时要使用"
 "关键字<literal>join</literal>。"
@@ -205,8 +201,8 @@
 
 #. Tag: para
 #: query_hql.xml:120
-#, no-c-format
-msgid "The supported join types are borrowed from ANSI SQL"
+#, fuzzy, no-c-format
+msgid "The supported join types are borrowed from ANSI SQL:"
 msgstr "受支持的连接类型是从ANSI SQL中借鉴来的。"
 
 #. Tag: literal
@@ -271,14 +267,14 @@
 
 #. Tag: para
 #: query_hql.xml:161
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"In addition, a \"fetch\" join allows associations or collections of values "
-"to be initialized along with their parent objects, using a single select. "
-"This is particularly useful in the case of a collection. It effectively "
-"overrides the outer join and lazy declarations of the mapping file for "
-"associations and collections. See <xref linkend=\"performance-fetching\"/> "
-"for more information."
+"A \"fetch\" join allows associations or collections of values to be "
+"initialized along with their parent objects using a single select. This is "
+"particularly useful in the case of a collection. It effectively overrides "
+"the outer join and lazy declarations of the mapping file for associations "
+"and collections. See <xref linkend=\"performance-fetching\"/> for more "
+"information."
 msgstr ""
 "还有,一个\"fetch\"连接允许仅仅使用一个选择语句就将相关联的对象或一组值的集合"
 "随着他们的父对象的初始化而被初始化,这种方法在使用到集合的情况下尤其有用,对"
@@ -297,13 +293,13 @@
 
 #. Tag: para
 #: query_hql.xml:171
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
 "associated objects should not be used in the <literal>where</literal> clause "
-"(or any other clause). Also, the associated objects are not returned "
-"directly in the query results. Instead, they may be accessed via the parent "
-"object. The only reason we might need an alias is if we are recursively join "
+"(or any other clause). The associated objects are also not returned directly "
+"in the query results. Instead, they may be accessed via the parent object. "
+"The only reason you might need an alias is if you are recursively join "
 "fetching a further collection:"
 msgstr ""
 "一个fetch连接通常不需要被指定别名, 因为相关联的对象不应当被用在 "
@@ -322,22 +318,22 @@
 
 #. Tag: para
 #: query_hql.xml:181
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the <literal>fetch</literal> construct may not be used in queries "
-"called using <literal>iterate()</literal> (though <literal>scroll()</"
-"literal> can be used). Nor should <literal>fetch</literal> be used together "
-"with <literal>setMaxResults()</literal> or <literal>setFirstResult()</"
-"literal> as these operations are based on the result rows, which usually "
-"contain duplicates for eager collection fetching, hence, the number of rows "
-"is not what you'd expect. Nor may <literal>fetch</literal> be used together "
-"with an ad hoc <literal>with</literal> condition. It is possible to create a "
-"cartesian product by join fetching more than one collection in a query, so "
-"take care in this case. Join fetching multiple collection roles also "
-"sometimes gives unexpected results for bag mappings, so be careful about how "
-"you formulate your queries in this case. Finally, note that <literal>full "
-"join fetch</literal> and <literal>right join fetch</literal> are not "
-"meaningful."
+"The <literal>fetch</literal> construct cannot be used in queries called "
+"using <literal>iterate()</literal> (though <literal>scroll()</literal> can "
+"be used). <literal>Fetch</literal> should be used together with "
+"<literal>setMaxResults()</literal> or <literal>setFirstResult()</literal>, "
+"as these operations are based on the result rows which usually contain "
+"duplicates for eager collection fetching, hence, the number of rows is not "
+"what you would expect. <literal>Fetch</literal> should also not be used "
+"together with impromptu <literal>with</literal> condition. It is possible to "
+"create a cartesian product by join fetching more than one collection in a "
+"query, so take care in this case. Join fetching multiple collection roles "
+"can produce unexpected results for bag mappings, so user discretion is "
+"advised when formulating queries in this case. Finally, note that "
+"<literal>full join fetch</literal> and <literal>right join fetch</literal> "
+"are not meaningful."
 msgstr ""
 "假若使用<literal>iterate()</literal>来调用查询,请注意<literal>fetch</"
 "literal>构造是不能使用的(<literal>scroll()</literal> 可以使用)。"
@@ -352,11 +348,11 @@
 
 #. Tag: para
 #: query_hql.xml:196
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
 "instrumentation), it is possible to force Hibernate to fetch the lazy "
-"properties immediately (in the first query) using <literal>fetch all "
+"properties in the first query immediately using <literal>fetch all "
 "properties</literal>."
 msgstr ""
 "如果你使用属性级别的延迟获取(lazy fetching)(这是通过重新编写字节码实现"
@@ -395,11 +391,11 @@
 
 #. Tag: para
 #: query_hql.xml:214
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
-"literal> form where the join keyword is explicitly used in the from clause. "
-"This is the recommended form."
+"literal> form, that is, where the join keyword is explicitly used in the "
+"from clause. This is the recommended form."
 msgstr ""
 "上一节中给出的查询都是使用<literal>explicit(显式)</literal>形式的,其中form子"
 "句中明确给出了join关键字。这是建议使用的方式。"
@@ -425,26 +421,24 @@
 
 #. Tag: title
 #: query_hql.xml:230
-#, no-c-format
-msgid "Refering to identifier property"
+#, fuzzy, no-c-format
+msgid "Referring to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
 #: query_hql.xml:232
-#, no-c-format
-msgid ""
-"There are, generally speaking, 2 ways to refer to an entity's identifier "
-"property:"
+#, fuzzy, no-c-format
+msgid "There are 2 ways to refer to an entity's identifier property:"
 msgstr ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
 "property:"
 
 #. Tag: para
 #: query_hql.xml:237
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
-"reference the identifier property of an entity <emphasis>provided that "
+"reference the identifier property of an entity <emphasis>provided that the "
 "entity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -453,9 +447,9 @@
 
 #. Tag: para
 #: query_hql.xml:244
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If the entity defines a named identifier property, you may use that property "
+"If the entity defines a named identifier property, you can use that property "
 "name."
 msgstr ""
 "If the entity defines a named identifier property, you may use that property "
@@ -463,12 +457,12 @@
 
 #. Tag: para
 #: query_hql.xml:250
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
 "If the entity has a non-identifier property named id, the composite "
-"identifier property can only be referenced by its defined named; otherwise, "
-"the special <literal>id</literal> property can be used to rerference the "
+"identifier property can only be referenced by its defined named. Otherwise, "
+"the special <literal>id</literal> property can be used to reference the "
 "identifier property."
 msgstr ""
 "References to composite identifier properties follow the same naming rules. "
@@ -478,14 +472,14 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:257
+#: query_hql.xml:258
 #, fuzzy, no-c-format
 msgid ""
-"Note: this has changed significantly starting in version 3.2.2. In previous "
-"versions, <literal>id</literal> <emphasis>always</emphasis> referred to the "
-"identifier property no matter what its actual name. A ramification of that "
-"decision was that non-identifier properties named <literal>id</literal> "
-"could never be referenced in Hibernate queries."
+"Please note that, starting in version 3.2.2, this has changed significantly. "
+"In previous versions, <literal>id</literal> <emphasis>always</emphasis> "
+"referred to the identifier property regardless of its actual name. A "
+"ramification of that decision was that non-identifier properties named "
+"<literal>id</literal> could never be referenced in Hibernate queries."
 msgstr ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
 "versions, <literal>id</literal><emphasis>always</emphasis> referred to the "
@@ -494,23 +488,23 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:266
+#: query_hql.xml:269
 #, no-c-format
 msgid "The select clause"
 msgstr "select子句"
 
 #. Tag: para
-#: query_hql.xml:268
-#, no-c-format
+#: query_hql.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
-"return in the query result set. Consider:"
+"return in the query result set. Consider the following:"
 msgstr ""
 "<literal>select</literal> 子句选择将哪些对象与属性返 回到查询结果集中. 考虑如"
 "下情况:"
 
 #. Tag: programlisting
-#: query_hql.xml:273
+#: query_hql.xml:276
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -519,32 +513,32 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:275
-#, no-c-format
+#: query_hql.xml:278
+#, fuzzy, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
-"literal>s. Actually, you may express this query more compactly as:"
+"literal>s. You can express this query more compactly as:"
 msgstr ""
 "该语句将选择<literal>mate</literal>s of other <literal>Cat</literal>s。(其他"
 "猫的配偶) 实际上, 你可以更简洁的用以下的查询语句表达相同的含义:"
 
 #. Tag: programlisting
-#: query_hql.xml:280
+#: query_hql.xml:283
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:282
-#, no-c-format
+#: query_hql.xml:285
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return properties of any value type including properties of "
+"Queries can return properties of any value type including properties of "
 "component type:"
 msgstr ""
 "查询语句可以返回值为任何类型的属性,包括返回类型为某种组件(Component)的属性:"
 
 #. Tag: programlisting
-#: query_hql.xml:286
+#: query_hql.xml:289
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -552,23 +546,23 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:288
+#: query_hql.xml:291
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:290
-#, no-c-format
+#: query_hql.xml:293
+#, fuzzy, no-c-format
 msgid ""
-"Queries may return multiple objects and/or properties as an array of type "
-"<literal>Object[]</literal>,"
+"Queries can return multiple objects and/or properties as an array of type "
+"<literal>Object[]</literal>:"
 msgstr ""
 "查询语句可以返回多个对象和(或)属性,存放在 <literal>Object[]</literal>队列"
 "中,"
 
 #. Tag: programlisting
-#: query_hql.xml:295
+#: query_hql.xml:298
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -578,13 +572,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:297
-#, no-c-format
-msgid "or as a <literal>List</literal>,"
+#: query_hql.xml:300
+#, fuzzy, no-c-format
+msgid "Or as a <literal>List</literal>:"
 msgstr "或存放在一个<literal>List</literal>对象中,"
 
 #. Tag: programlisting
-#: query_hql.xml:301
+#: query_hql.xml:304
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -594,13 +588,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:303
-#, no-c-format
-msgid "or as an actual typesafe Java object,"
-msgstr "也可能直接返回一个实际的类型安全的Java对象,"
+#: query_hql.xml:306
+#, fuzzy, no-c-format
+msgid ""
+"Or - assuming that the class <literal>Family</literal> has an appropriate "
+"constructor - as an actual typesafe Java object:"
+msgstr "假设类<literal>Family</literal>有一个合适的构造函数."
 
 #. Tag: programlisting
-#: query_hql.xml:307
+#: query_hql.xml:310
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -610,18 +606,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:309
-#, no-c-format
-msgid ""
-"assuming that the class <literal>Family</literal> has an appropriate "
-"constructor."
-msgstr "假设类<literal>Family</literal>有一个合适的构造函数."
-
-#. Tag: para
 #: query_hql.xml:313
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may assign aliases to selected expressions using <literal>as</literal>:"
+"You can assign aliases to selected expressions using <literal>as</literal>:"
 msgstr "你可以使用关键字<literal>as</literal>给“被选择了的表达式”指派别名:"
 
 #. Tag: programlisting
@@ -667,9 +655,9 @@
 
 #. Tag: para
 #: query_hql.xml:334
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"HQL queries may even return the results of aggregate functions on properties:"
+"HQL queries can even return the results of aggregate functions on properties:"
 msgstr "HQL查询甚至可以返回作用于属性之上的聚集函数的计算结果:"
 
 #. Tag: programlisting
@@ -683,8 +671,8 @@
 
 #. Tag: para
 #: query_hql.xml:349
-#, no-c-format
-msgid "The supported aggregate functions are"
+#, fuzzy, no-c-format
+msgid "The supported aggregate functions are:"
 msgstr "受支持的聚集函数如下:"
 
 #. Tag: literal
@@ -707,9 +695,9 @@
 
 #. Tag: para
 #: query_hql.xml:371
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may use arithmetic operators, concatenation, and recognized SQL "
+"You can use arithmetic operators, concatenation, and recognized SQL "
 "functions in the select clause:"
 msgstr "你可以在选择子句中使用数学操作符、连接以及经过验证的SQL函数:"
 
@@ -732,9 +720,9 @@
 
 #. Tag: para
 #: query_hql.xml:380
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>distinct</literal> and <literal>all</literal> keywords may be "
+"The <literal>distinct</literal> and <literal>all</literal> keywords can be "
 "used and have the same semantics as in SQL."
 msgstr ""
 "关键字<literal>distinct</literal>与<literal>all</literal> 也可以使用,它们具"
@@ -763,10 +751,10 @@
 
 #. Tag: para
 #: query_hql.xml:398
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
-"like <literal>DomesticCat</literal>. Hibernate queries may name "
+"like <literal>DomesticCat</literal>. Hibernate queries can name "
 "<emphasis>any</emphasis> Java class or interface in the <literal>from</"
 "literal> clause. The query will return instances of all persistent classes "
 "that extend that class or implement the interface. The following query would "
@@ -799,12 +787,12 @@
 
 #. Tag: para
 #: query_hql.xml:415
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that these last two queries will require more than one SQL "
-"<literal>SELECT</literal>. This means that the <literal>order by</literal> "
-"clause does not correctly order the whole result set. (It also means you "
-"can't call these queries using <literal>Query.scroll()</literal>.)"
+"These last two queries will require more than one SQL <literal>SELECT</"
+"literal>. This means that the <literal>order by</literal> clause does not "
+"correctly order the whole result set. It also means you cannot call these "
+"queries using <literal>Query.scroll()</literal>."
 msgstr ""
 "注意,最后的两个查询将需要超过一个的SQL <literal>SELECT</literal>.这表明"
 "<literal>order by</literal>子句 没有对整个结果集进行正确的排序. (这也说明你不"
@@ -818,10 +806,10 @@
 
 #. Tag: para
 #: query_hql.xml:426
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>where</literal> clause allows you to narrow the list of "
-"instances returned. If no alias exists, you may refer to properties by name:"
+"The <literal>where</literal> clause allows you to refine the list of "
+"instances returned. If no alias exists, you can refer to properties by name:"
 msgstr ""
 "<literal>where</literal>子句允许你将返回的实例列表的范围缩小. 如果没有指定别"
 "名,你可以使用属性名来直接引用属性:"
@@ -846,13 +834,19 @@
 
 #. Tag: para
 #: query_hql.xml:439
-#, no-c-format
-msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
+#, fuzzy, no-c-format
+msgid "This returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "返回名为(属性name等于)'Fritz'的<literal>Cat</literal>类的实例。"
 
-#. Tag: programlisting
+#. Tag: para
 #: query_hql.xml:443
 #, no-c-format
+msgid "The following query:"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:446
+#, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
 "from Foo foo, Bar bar\n"
@@ -860,14 +854,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:445
-#, no-c-format
+#: query_hql.xml:448
+#, fuzzy, no-c-format
 msgid ""
-"will return all instances of <literal>Foo</literal> for which there exists "
-"an instance of <literal>bar</literal> with a <literal>date</literal> "
-"property equal to the <literal>startDate</literal> property of the "
-"<literal>Foo</literal>. Compound path expressions make the <literal>where</"
-"literal> clause extremely powerful. Consider:"
+"returns all instances of <literal>Foo</literal> with an instance of "
+"<literal>bar</literal> with a <literal>date</literal> property equal to the "
+"<literal>startDate</literal> property of the <literal>Foo</literal>. "
+"Compound path expressions make the <literal>where</literal> clause extremely "
+"powerful. Consider the following:"
 msgstr ""
 "将返回所有满足下面条件的<literal>Foo</literal>类的实例: 存在如下的"
 "<literal>bar</literal>的一个实例,其<literal>date</literal>属性等于 "
@@ -875,23 +869,22 @@
 "<literal>where</literal>子句非常的强大,考虑如下情况:"
 
 #. Tag: programlisting
-#: query_hql.xml:454
+#: query_hql.xml:457
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:456
-#, no-c-format
+#: query_hql.xml:459
+#, fuzzy, no-c-format
 msgid ""
-"This query translates to an SQL query with a table (inner) join. If you were "
-"to write something like"
+"This query translates to an SQL query with a table (inner) join. For example:"
 msgstr ""
 "该查询将被翻译成为一个含有表连接(内连接)的SQL查询。如果你打算写像这样的查询"
 "语句"
 
 #. Tag: programlisting
-#: query_hql.xml:461
+#: query_hql.xml:464
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -899,29 +892,28 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:463
-#, no-c-format
-msgid ""
-"you would end up with a query that would require four table joins in SQL."
+#: query_hql.xml:466
+#, fuzzy, no-c-format
+msgid "would result in a query that would require four table joins in SQL."
 msgstr "在SQL中,你为达此目的将需要进行一个四表连接的查询。"
 
 #. Tag: para
-#: query_hql.xml:467
-#, no-c-format
+#: query_hql.xml:470
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>=</literal> operator may be used to compare not only "
+"The <literal>=</literal> operator can be used to compare not only "
 "properties, but also instances:"
 msgstr ""
 "<literal>=</literal>运算符不仅可以被用来比较属性的值,也可以用来比较实例:"
 
 #. Tag: programlisting
-#: query_hql.xml:472
+#: query_hql.xml:475
 #, no-c-format
 msgid "<![CDATA[from Cat cat, Cat rival where cat.mate = rival.mate]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:474
+#: query_hql.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -930,10 +922,10 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:476
-#, no-c-format
+#: query_hql.xml:479
+#, fuzzy, no-c-format
 msgid ""
-"The special property (lowercase) <literal>id</literal> may be used to "
+"The special property (lowercase) <literal>id</literal> can be used to "
 "reference the unique identifier of an object. See <xref linkend=\"queryhql-"
 "identifier-property\"/> for more information."
 msgstr ""
@@ -941,7 +933,7 @@
 "也可以使用该对象的属性名。)"
 
 #. Tag: programlisting
-#: query_hql.xml:482
+#: query_hql.xml:485
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -950,27 +942,25 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:484
-#, no-c-format
-msgid "The second query is efficient. No table join is required!"
+#: query_hql.xml:487
+#, fuzzy, no-c-format
+msgid "The second query is efficient and does not require a table join."
 msgstr "第二个查询是有效的。此时不需要进行表连接!"
 
 #. Tag: para
-#: query_hql.xml:488
-#, no-c-format
+#: query_hql.xml:491
+#, fuzzy, no-c-format
 msgid ""
-"Properties of composite identifiers may also be used. Suppose "
-"<literal>Person</literal> has a composite identifier consisting of "
-"<literal>country</literal> and <literal>medicareNumber</literal>. Again, see "
-"<xref linkend=\"queryhql-identifier-property\"/> for more information "
-"regarding referencing identifier properties."
+"Properties of composite identifiers can also be used. Consider the following "
+"example where <literal>Person</literal> has composite identifiers consisting "
+"of <literal>country</literal> and <literal>medicareNumber</literal>:"
 msgstr ""
 "同样也可以使用复合标识符。比如<literal>Person</literal>类有一个复合标识符,它"
 "由<literal>country</literal>属性 与<literal>medicareNumber</literal>属性组"
 "成。"
 
 #. Tag: programlisting
-#: query_hql.xml:495
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -979,7 +969,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:497
+#: query_hql.xml:499
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -988,37 +978,45 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:499
-#, no-c-format
-msgid "Once again, the second query requires no table join."
+#: query_hql.xml:501
+#, fuzzy, no-c-format
+msgid "Once again, the second query does not require a table join."
 msgstr "第二个查询也不需要进行表连接。"
 
 #. Tag: para
-#: query_hql.xml:503
+#: query_hql.xml:505
 #, no-c-format
 msgid ""
-"Likewise, the special property <literal>class</literal> accesses the "
-"discriminator value of an instance in the case of polymorphic persistence. A "
-"Java class name embedded in the where clause will be translated to its "
-"discriminator value."
+"See <xref linkend=\"queryhql-identifier-property\"/> for more information "
+"regarding referencing identifier properties)"
 msgstr ""
+
+#. Tag: para
+#: query_hql.xml:510
+#, fuzzy, no-c-format
+msgid ""
+"The special property <literal>class</literal> accesses the discriminator "
+"value of an instance in the case of polymorphic persistence. A Java class "
+"name embedded in the where clause will be translated to its discriminator "
+"value."
+msgstr ""
 "同样的,特殊属性<literal>class</literal>在进行多态持久化的情况下被用来存取一"
 "个实例的鉴别值(discriminator value)。 一个嵌入到where子句中的Java类的名字将"
 "被转换为该类的鉴别值。"
 
 #. Tag: programlisting
-#: query_hql.xml:509
+#: query_hql.xml:516
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:511
+#: query_hql.xml:518
 #, fuzzy, no-c-format
 msgid ""
-"You may also use components or composite user types, or properties of said "
+"You can also use components or composite user types, or properties of said "
 "component types. See <xref linkend=\"queryhql-components\"/> for more "
-"details."
+"information."
 msgstr ""
 "你也可以声明一个属性的类型是组件或者复合用户类型(以及由组件构成的组件等"
 "等)。永远不要尝试使用以组件类型来结尾的路径表达式(path-expression) (与此"
@@ -1026,20 +1024,20 @@
 "literal>含有一个包含了组件的实体<literal>address</literal>"
 
 #. Tag: para
-#: query_hql.xml:516
-#, no-c-format
+#: query_hql.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
-"<literal>class</literal>, allowing us to express a join in the following way "
-"(where <literal>AuditLog.item</literal> is a property mapped with "
-"<literal>&lt;any&gt;</literal>)."
+"<literal>class</literal> that allows you to express a join in the following "
+"way (where <literal>AuditLog.item</literal> is a property mapped with "
+"<literal>&lt;any&gt;</literal>):"
 msgstr ""
 "一个“任意”类型有两个特殊的属性<literal>id</literal>和<literal>class</"
 "literal>, 来允许我们按照下面的方式表达一个连接(<literal>AuditLog.item</"
 "literal> 是一个属性,该属性被映射为<literal>&lt;any&gt;</literal>)。"
 
 #. Tag: programlisting
-#: query_hql.xml:522
+#: query_hql.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1047,60 +1045,60 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:524
-#, no-c-format
+#: query_hql.xml:531
+#, fuzzy, no-c-format
 msgid ""
-"Notice that <literal>log.item.class</literal> and <literal>payment.class</"
-"literal> would refer to the values of completely different database columns "
-"in the above query."
+"The <literal>log.item.class</literal> and <literal>payment.class</literal> "
+"would refer to the values of completely different database columns in the "
+"above query."
 msgstr ""
 "注意,在上面的查询与句中,<literal>log.item.class</literal> 和 "
 "<literal>payment.class</literal> 将涉及到完全不同的数据库中的列。"
 
 #. Tag: title
-#: query_hql.xml:532
+#: query_hql.xml:539
 #, no-c-format
 msgid "Expressions"
 msgstr "表达式"
 
 #. Tag: para
-#: query_hql.xml:534
-#, no-c-format
+#: query_hql.xml:541
+#, fuzzy, no-c-format
 msgid ""
-"Expressions allowed in the <literal>where</literal> clause include most of "
-"the kind of things you could write in SQL:"
+"Expressions used in the <literal>where</literal> clause include the "
+"following:"
 msgstr ""
 "在<literal>where</literal>子句中允许使用的表达式包括 大多数你可以在SQL使用的"
 "表达式种类:"
 
 #. Tag: para
-#: query_hql.xml:541
-#, no-c-format
-msgid "mathematical operators <literal>+, -, *, /</literal>"
+#: query_hql.xml:548
+#, fuzzy, no-c-format
+msgid "mathematical operators: <literal>+, -, *, /</literal>"
 msgstr "数学运算符<literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:546
-#, no-c-format
+#: query_hql.xml:553
+#, fuzzy, no-c-format
 msgid ""
-"binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
+"binary comparison operators: <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
 "literal>"
 msgstr "二进制比较运算符<literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
 
 #. Tag: para
-#: query_hql.xml:551
+#: query_hql.xml:558
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "逻辑运算符<literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:556
-#, no-c-format
-msgid "Parentheses <literal>( )</literal>, indicating grouping"
+#: query_hql.xml:563
+#, fuzzy, no-c-format
+msgid "Parentheses <literal>( )</literal> that indicates grouping"
 msgstr "Parentheses <literal>( )</literal>, indicating grouping"
 
 #. Tag: para
-#: query_hql.xml:561
+#: query_hql.xml:568
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1114,7 +1112,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:581
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1124,7 +1122,7 @@
 "和 \"搜索\" case, <literal>case when ... then ... else ... end</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:587
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1133,29 +1131,29 @@
 "字符串连接符<literal>...||...</literal> or <literal>concat(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
-#, no-c-format
+#: query_hql.xml:592
+#, fuzzy, no-c-format
 msgid ""
-"<literal>current_date()</literal>, <literal>current_time()</literal>, "
+"<literal>current_date()</literal>, <literal>current_time()</literal>, and "
 "<literal>current_timestamp()</literal>"
 msgstr ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:591
-#, no-c-format
+#: query_hql.xml:598
+#, fuzzy, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
-"<literal>year(...)</literal>,"
+"and <literal>year(...)</literal>"
 msgstr ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
 "(...)</literal>, <literal>day(...)</literal>, <literal>month(...)</literal>, "
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:598
+#: query_hql.xml:605
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1166,13 +1164,13 @@
 "(), length(), locate(), abs(), sqrt(), bit_length(), mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:604
+#: query_hql.xml:611
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> 和 <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:609
+#: query_hql.xml:616
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1180,7 +1178,7 @@
 msgstr "<literal>str()</literal> 把数字或者时间值转换为可读的字符串"
 
 #. Tag: para
-#: query_hql.xml:615
+#: query_hql.xml:622
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1193,7 +1191,7 @@
 "literal> 和 <literal>extract()</literal> 被底层数据库支持"
 
 #. Tag: para
-#: query_hql.xml:623
+#: query_hql.xml:630
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1201,13 +1199,13 @@
 msgstr "HQL <literal>index()</literal> 函数,作用于join的有序集合的别名。"
 
 #. Tag: para
-#: query_hql.xml:629
-#, no-c-format
+#: query_hql.xml:636
+#, fuzzy, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
 "minelement(), maxelement(), minindex(), maxindex()</literal>, along with the "
 "special <literal>elements()</literal> and <literal>indices</literal> "
-"functions which may be quantified using <literal>some, all, exists, any, in</"
+"functions that can be quantified using <literal>some, all, exists, any, in</"
 "literal>."
 msgstr ""
 "HQL函数,把集合作为参数:<literal>size(), minelement(), maxelement(), minindex"
@@ -1216,34 +1214,34 @@
 "exists, any, in</literal>。"
 
 #. Tag: para
-#: query_hql.xml:637
-#, no-c-format
+#: query_hql.xml:644
+#, fuzzy, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
-"<literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>sin()</"
+"<literal>trunc()</literal>, <literal>rtrim()</literal>, and <literal>sin()</"
 "literal>"
 msgstr ""
 "任何数据库支持的SQL标量函数,比如<literal>sign()</literal>, <literal>trunc()"
 "</literal>, <literal>rtrim()</literal>, <literal>sin()</literal>"
 
 #. Tag: para
-#: query_hql.xml:643
+#: query_hql.xml:650
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "JDBC风格的参数传入 <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:648
-#, no-c-format
+#: query_hql.xml:655
+#, fuzzy, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
-"<literal>:x1</literal>"
+"and <literal>:x1</literal>"
 msgstr ""
 "命名参数<literal>:name</literal>, <literal>:start_date</literal>, <literal>:"
 "x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:653
+#: query_hql.xml:660
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1253,7 +1251,7 @@
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:659
+#: query_hql.xml:666
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1263,40 +1261,40 @@
 "TABBY</literal>"
 
 #. Tag: para
-#: query_hql.xml:665
-#, no-c-format
+#: query_hql.xml:672
+#, fuzzy, no-c-format
 msgid ""
-"<literal>in</literal> and <literal>between</literal> may be used as follows:"
+"<literal>in</literal> and <literal>between</literal> can be used as follows:"
 msgstr ""
 "关键字<literal>in</literal>与<literal>between</literal>可按如下方法使用:"
 
 #. Tag: programlisting
-#: query_hql.xml:669
+#: query_hql.xml:676
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:671
+#: query_hql.xml:678
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:673
-#, no-c-format
-msgid "and the negated forms may be written"
+#: query_hql.xml:680
+#, fuzzy, no-c-format
+msgid "The negated forms can be written as follows:"
 msgstr "而且否定的格式也可以如下书写:"
 
 #. Tag: programlisting
-#: query_hql.xml:677
+#: query_hql.xml:684
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B']]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:679
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1304,27 +1302,27 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:681
-#, no-c-format
+#: query_hql.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
+"Similarly, <literal>is null</literal> and <literal>is not null</literal> can "
 "be used to test for null values."
 msgstr ""
 "同样, 子句<literal>is null</literal>与<literal>is not null</literal>可以被用"
 "来测试空值(null)."
 
 #. Tag: para
-#: query_hql.xml:686
-#, no-c-format
+#: query_hql.xml:693
+#, fuzzy, no-c-format
 msgid ""
-"Booleans may be easily used in expressions by declaring HQL query "
+"Booleans can be easily used in expressions by declaring HQL query "
 "substitutions in Hibernate configuration:"
 msgstr ""
 "在Hibernate配置文件中声明HQL“查询替代(query substitutions)”之后, 布尔表达"
 "式(Booleans)可以在其他表达式中轻松的使用:"
 
 #. Tag: programlisting
-#: query_hql.xml:691
+#: query_hql.xml:698
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1332,7 +1330,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:693
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1344,42 +1342,42 @@
 "literal>:"
 
 #. Tag: programlisting
-#: query_hql.xml:698
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:700
-#, no-c-format
+#: query_hql.xml:707
+#, fuzzy, no-c-format
 msgid ""
-"You may test the size of a collection with the special property "
-"<literal>size</literal>, or the special <literal>size()</literal> function."
+"You can test the size of a collection with the special property "
+"<literal>size</literal> or the special <literal>size()</literal> function."
 msgstr ""
 "你可以用特殊属性<literal>size</literal>, 或是特殊函数<literal>size()</"
 "literal>测试一个集合的大小。"
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:712
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:714
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:709
-#, no-c-format
+#: query_hql.xml:716
+#, fuzzy, no-c-format
 msgid ""
-"For indexed collections, you may refer to the minimum and maximum indices "
+"For indexed collections, you can refer to the minimum and maximum indices "
 "using <literal>minindex</literal> and <literal>maxindex</literal> functions. "
-"Similarly, you may refer to the minimum and maximum elements of a collection "
+"Similarly, you can refer to the minimum and maximum elements of a collection "
 "of basic type using the <literal>minelement</literal> and "
-"<literal>maxelement</literal> functions."
+"<literal>maxelement</literal> functions. For example:"
 msgstr ""
 "对于索引了(有序)的集合,你可以使用<literal>minindex</literal> 与 "
 "<literal>maxindex</literal>函数来引用到最小与最大的索引序数。 同理,你可以使"
@@ -1387,39 +1385,39 @@
 "一个基本数据类型的集合中最小与最大的元素。"
 
 #. Tag: programlisting
-#: query_hql.xml:717
+#: query_hql.xml:724
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:719
+#: query_hql.xml:726
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:721
+#: query_hql.xml:728
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:723
-#, no-c-format
+#: query_hql.xml:730
+#, fuzzy, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
 "supported when passed the element or index set of a collection "
 "(<literal>elements</literal> and <literal>indices</literal> functions) or "
-"the result of a subquery (see below)."
+"the result of a subquery (see below):"
 msgstr ""
 "在传递一个集合的索引集或者是元素集(<literal>elements</literal>与"
 "<literal>indices</literal> 函数) 或者传递一个子查询的结果的时候,可以使用SQL"
 "函数<literal>any, some, all, exists, in</literal>"
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:736
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1427,7 +1425,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:738
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1435,31 +1433,31 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:740
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:735
+#: query_hql.xml:742
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:737
+#: query_hql.xml:744
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:739
-#, no-c-format
+#: query_hql.xml:746
+#, fuzzy, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
 "literal>, <literal>indices</literal>, <literal>minindex</literal>, "
 "<literal>maxindex</literal>, <literal>minelement</literal>, "
-"<literal>maxelement</literal> - may only be used in the where clause in "
+"<literal>maxelement</literal> - can only be used in the where clause in "
 "Hibernate3."
 msgstr ""
 "注意,在Hibernate3种,这些结构变量- <literal>size</literal>, "
@@ -1468,23 +1466,23 @@
 "<literal>maxelement</literal> - 只能在where子句中使用。"
 
 #. Tag: para
-#: query_hql.xml:746
-#, no-c-format
+#: query_hql.xml:753
+#, fuzzy, no-c-format
 msgid ""
-"Elements of indexed collections (arrays, lists, maps) may be referred to by "
-"index (in a where clause only):"
+"Elements of indexed collections (arrays, lists, and maps) can be referred to "
+"by index in a where clause only:"
 msgstr ""
 "一个被索引过的(有序的)集合的元素(arrays, lists, maps)可以在其他索引中被引用"
 "(只能在where子句中):"
 
 #. Tag: programlisting
-#: query_hql.xml:751
+#: query_hql.xml:758
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:753
+#: query_hql.xml:760
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1493,7 +1491,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:755
+#: query_hql.xml:762
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1502,7 +1500,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:757
+#: query_hql.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1510,15 +1508,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:759
-#, no-c-format
+#: query_hql.xml:766
+#, fuzzy, no-c-format
 msgid ""
-"The expression inside <literal>[]</literal> may even be an arithmetic "
-"expression."
+"The expression inside <literal>[]</literal> can even be an arithmetic "
+"expression:"
 msgstr "在<literal>[]</literal>中的表达式甚至可以是一个算数表达式。"
 
 #. Tag: programlisting
-#: query_hql.xml:763
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1526,17 +1524,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:765
-#, no-c-format
+#: query_hql.xml:772
+#, fuzzy, no-c-format
 msgid ""
-"HQL also provides the built-in <literal>index()</literal> function, for "
+"HQL also provides the built-in <literal>index()</literal> function for "
 "elements of a one-to-many association or collection of values."
 msgstr ""
 "对于一个一对多的关联(one-to-many association)或是值的集合中的元素, HQL也提"
 "供内建的<literal>index()</literal>函数,"
 
 #. Tag: programlisting
-#: query_hql.xml:770
+#: query_hql.xml:777
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1545,29 +1543,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:772
-#, no-c-format
-msgid "Scalar SQL functions supported by the underlying database may be used"
+#: query_hql.xml:779
+#, fuzzy, no-c-format
+msgid "Scalar SQL functions supported by the underlying database can be used:"
 msgstr "如果底层数据库支持标量的SQL函数,它们也可以被使用"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:783
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
-#, no-c-format
+#: query_hql.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"If you are not yet convinced by all this, think how much longer and less "
-"readable the following query would be in SQL:"
+"Consider how much longer and less readable the following query would be in "
+"SQL:"
 msgstr ""
 "如果你还不能对所有的这些深信不疑,想想下面的查询。如果使用SQL,语句长度会增长"
 "多少,可读性会下降多少:"
 
 #. Tag: programlisting
-#: query_hql.xml:783
+#: query_hql.xml:790
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1580,13 +1578,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:785
+#: query_hql.xml:792
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>提示:</emphasis> 会像如下的语句"
 
 #. Tag: programlisting
-#: query_hql.xml:789
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1610,23 +1608,23 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:794
+#: query_hql.xml:801
 #, no-c-format
 msgid "The order by clause"
 msgstr "order by子句"
 
 #. Tag: para
-#: query_hql.xml:796
-#, no-c-format
+#: query_hql.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"The list returned by a query may be ordered by any property of a returned "
+"The list returned by a query can be ordered by any property of a returned "
 "class or components:"
 msgstr ""
 "查询返回的列表(list)可以按照一个返回的类或组件(components)中的任何属性"
 "(property)进行排序:"
 
 #. Tag: programlisting
-#: query_hql.xml:800
+#: query_hql.xml:807
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1634,7 +1632,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:802
+#: query_hql.xml:809
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1644,23 +1642,23 @@
 "序进行排序."
 
 #. Tag: title
-#: query_hql.xml:809
+#: query_hql.xml:816
 #, no-c-format
 msgid "The group by clause"
 msgstr "group by子句"
 
 #. Tag: para
-#: query_hql.xml:811
-#, no-c-format
+#: query_hql.xml:818
+#, fuzzy, no-c-format
 msgid ""
-"A query that returns aggregate values may be grouped by any property of a "
+"A query that returns aggregate values can be grouped by any property of a "
 "returned class or components:"
 msgstr ""
 "一个返回聚集值(aggregate values)的查询可以按照一个返回的类或组件(components)"
 "中的任何属性(property)进行分组:"
 
 #. Tag: programlisting
-#: query_hql.xml:815
+#: query_hql.xml:822
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1669,7 +1667,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:817
+#: query_hql.xml:824
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1678,13 +1676,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:819
+#: query_hql.xml:826
 #, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr "<literal>having</literal>子句在这里也允许使用."
 
 #. Tag: programlisting
-#: query_hql.xml:823
+#: query_hql.xml:830
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1694,18 +1692,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:825
-#, no-c-format
+#: query_hql.xml:832
+#, fuzzy, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
-"literal> and <literal>order by</literal> clauses, if supported by the "
-"underlying database (eg. not in MySQL)."
+"literal> and <literal>order by</literal> clauses if they are supported by "
+"the underlying database (i.e., not in MySQL)."
 msgstr ""
 "如果底层的数据库支持的话(例如不能在MySQL中使用),SQL的一般函数与聚集函数也可"
 "以出现 在<literal>having</literal>与<literal>order by</literal> 子句中。"
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:838
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1717,15 +1715,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:833
-#, no-c-format
+#: query_hql.xml:840
+#, fuzzy, no-c-format
 msgid ""
-"Note that neither the <literal>group by</literal> clause nor the "
-"<literal>order by</literal> clause may contain arithmetic expressions. Also "
-"note that Hibernate currently does not expand a grouped entity, so you can't "
-"write <literal>group by cat</literal> if all properties of <literal>cat</"
-"literal> are non-aggregated. You have to list all non-aggregated properties "
-"explicitly."
+"Neither the <literal>group by</literal> clause nor the <literal>order by</"
+"literal> clause can contain arithmetic expressions. Hibernate also does not "
+"currently expand a grouped entity, so you cannot write <literal>group by "
+"cat</literal> if all properties of <literal>cat</literal> are non-"
+"aggregated. You have to list all non-aggregated properties explicitly."
 msgstr ""
 "注意<literal>group by</literal>子句与 <literal>order by</literal>子句中都不能"
 "包含算术表达式(arithmetic expressions). 也要注意Hibernate目前不会扩展group"
@@ -1733,13 +1730,13 @@
 "的所有属性都不是聚集的(non-aggregated)。你必须明确的列出所有的非聚集属性。"
 
 #. Tag: title
-#: query_hql.xml:845
+#: query_hql.xml:852
 #, no-c-format
 msgid "Subqueries"
 msgstr "子查询"
 
 #. Tag: para
-#: query_hql.xml:847
+#: query_hql.xml:854
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1752,7 +1749,7 @@
 "询中的别名的子查询)也是允许的。"
 
 #. Tag: programlisting
-#: query_hql.xml:853
+#: query_hql.xml:860
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1762,7 +1759,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:855
+#: query_hql.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1772,7 +1769,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:857
+#: query_hql.xml:864
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1782,7 +1779,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:859
+#: query_hql.xml:866
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1792,7 +1789,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:861
+#: query_hql.xml:868
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1800,51 +1797,52 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:863
-#, no-c-format
-msgid "Note that HQL subqueries may occur only in the select or where clauses."
+#: query_hql.xml:870
+#, fuzzy, no-c-format
+msgid "Note that HQL subqueries can occur only in the select or where clauses."
 msgstr "注意,HQL自查询只可以在select或者where子句中出现。"
 
 #. Tag: para
-#: query_hql.xml:867
-#, no-c-format
+#: query_hql.xml:874
+#, fuzzy, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
-"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
+"literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more information."
 msgstr ""
 "Note that subqueries can also utilize <literal>row value constructor</"
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:875
+#: query_hql.xml:882
 #, no-c-format
 msgid "HQL examples"
 msgstr "HQL示例"
 
 #. Tag: para
-#: query_hql.xml:877
-#, no-c-format
+#: query_hql.xml:884
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
-"the query language is one of Hibernate's main selling points. Here are some "
-"example queries very similar to queries that I used on a recent project. "
-"Note that most queries you will write are much simpler than these!"
+"the query language is one of Hibernate's main strengths. The following "
+"example queries are similar to queries that have been used on recent "
+"projects. Please note that most queries you will write will be much simpler "
+"than the following examples."
 msgstr ""
 "Hibernate查询可以非常的强大与复杂。实际上,Hibernate的一个主要卖点就是查询语"
 "句的威力。这里有一些例子,它们与我在最近的 一个项目中使用的查询非常相似。注意"
 "你能用到的大多数查询比这些要简单的多!"
 
 #. Tag: para
-#: query_hql.xml:883
-#, no-c-format
+#: query_hql.xml:890
+#, fuzzy, no-c-format
 msgid ""
-"The following query returns the order id, number of items and total value of "
-"the order for all unpaid orders for a particular customer and given minimum "
-"total value, ordering the results by total value. In determining the prices, "
-"it uses the current catalog. The resulting SQL query, against the "
-"<literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODUCT</"
-"literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> tables has "
-"four inner joins and an (uncorrelated) subselect."
+"The following query returns the order id, number of items, the given minimum "
+"total value and the total value of the order for all unpaid orders for a "
+"particular customer. The results are ordered by total value. In determining "
+"the prices, it uses the current catalog. The resulting SQL query, against "
+"the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, "
+"<literal>PRODUCT</literal>, <literal>CATALOG</literal> and <literal>PRICE</"
+"literal> tables has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 "下面的查询对于某个特定的客户的所有未支付的账单,在给定给最小总价值的情况下,"
 "返回订单的id,条目的数量和总价值, 返回值按照总价值的结果进行排序。为了决定价"
@@ -1853,7 +1851,7 @@
 "<literal>CATALOG</literal> 和<literal>PRICE</literal> 库表。"
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1877,7 +1875,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1887,7 +1885,7 @@
 "看起来更像这个:"
 
 #. Tag: programlisting
-#: query_hql.xml:899
+#: query_hql.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1906,7 +1904,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:901
+#: query_hql.xml:908
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -1923,7 +1921,7 @@
 "literal> 以及 <literal>PAYMENT_STATUS_CHANGE</literal>。"
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1944,17 +1942,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:911
-#, no-c-format
+#: query_hql.xml:918
+#, fuzzy, no-c-format
 msgid ""
-"If I would have mapped the <literal>statusChanges</literal> collection as a "
-"list, instead of a set, the query would have been much simpler to write."
+"If the <literal>statusChanges</literal> collection was mapped as a list, "
+"instead of a set, the query would have been much simpler to write."
 msgstr ""
 "如果我把<literal>statusChanges</literal>实例集映射为一个列表(list)而不是一"
 "个集合(set), 书写查询语句将更加简单."
 
 #. Tag: programlisting
-#: query_hql.xml:916
+#: query_hql.xml:923
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1968,7 +1966,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:918
+#: query_hql.xml:925
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -1987,7 +1985,7 @@
 "询。"
 
 #. Tag: programlisting
-#: query_hql.xml:927
+#: query_hql.xml:934
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2000,14 +1998,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:929
+#: query_hql.xml:936
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
 msgstr "对于一些数据库,我们需要弃用(相关的)子选择。"
 
 #. Tag: programlisting
-#: query_hql.xml:933
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2021,38 +2019,37 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:938
+#: query_hql.xml:945
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "批量的UPDATE和DELETE"
 
 #. Tag: para
-#: query_hql.xml:940
-#, no-c-format
+#: query_hql.xml:947
+#, fuzzy, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
 "<literal>insert ... select ...</literal> statements. See <xref linkend="
-"\"batch-direct\"/> for details."
+"\"batch-direct\"/> for more information."
 msgstr ""
 "HQL现在支持 <literal>update</literal>, <literal>delete</literal> 和 "
 "<literal>insert ... select ...</literal>语句. 查阅 <xref linkend=\"batch-"
 "direct\"/> 以获得更多信息。"
 
 #. Tag: title
-#: query_hql.xml:948
+#: query_hql.xml:955
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "小技巧 &amp; 小窍门"
 
 #. Tag: para
-#: query_hql.xml:950
-#, no-c-format
-msgid ""
-"You can count the number of query results without actually returning them:"
+#: query_hql.xml:957
+#, fuzzy, no-c-format
+msgid "You can count the number of query results without returning them:"
 msgstr "你可以统计查询结果的数目而不必实际的返回他们:"
 
 #. Tag: programlisting
-#: query_hql.xml:954
+#: query_hql.xml:961
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2060,13 +2057,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:956
+#: query_hql.xml:963
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr "若想根据一个集合的大小来进行排序,可以使用如下的语句:"
 
 #. Tag: programlisting
-#: query_hql.xml:960
+#: query_hql.xml:967
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2077,7 +2074,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:962
+#: query_hql.xml:969
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2087,19 +2084,19 @@
 "(selection size)指定一个条件:"
 
 #. Tag: programlisting
-#: query_hql.xml:967
+#: query_hql.xml:974
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:969
-#, no-c-format
-msgid "If your database doesn't support subselects, use the following query:"
+#: query_hql.xml:976
+#, fuzzy, no-c-format
+msgid "If your database does not support subselects, use the following query:"
 msgstr "如果你的数据库不支持子选择语句,使用下面的查询:"
 
 #. Tag: programlisting
-#: query_hql.xml:973
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2110,17 +2107,17 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:975
-#, no-c-format
+#: query_hql.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"As this solution can't return a <literal>User</literal> with zero messages "
+"As this solution cannot return a <literal>User</literal> with zero messages "
 "because of the inner join, the following form is also useful:"
 msgstr ""
 "因为内连接(inner join)的原因,这个解决方案不能返回含有零个信息的"
 "<literal>User</literal> 类的实例, 所以这种情况下使用下面的格式将是有帮助的:"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2131,13 +2128,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:982
+#: query_hql.xml:990
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr "JavaBean的属性可以被绑定到一个命名查询(named query)的参数上:"
 
 #. Tag: programlisting
-#: query_hql.xml:986
+#: query_hql.xml:994
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2147,7 +2144,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:988
+#: query_hql.xml:996
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2157,7 +2154,7 @@
 "(Collections)是可以分页的:"
 
 #. Tag: programlisting
-#: query_hql.xml:992
+#: query_hql.xml:1000
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2168,14 +2165,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:994
-#, no-c-format
-msgid "Collection elements may be ordered or grouped using a query filter:"
+#: query_hql.xml:1002
+#, fuzzy, no-c-format
+msgid "Collection elements can be ordered or grouped using a query filter:"
 msgstr ""
 "通过使用查询过滤器(query filter)可以将集合(Collection)的原素分组或排序:"
 
 #. Tag: programlisting
-#: query_hql.xml:998
+#: query_hql.xml:1006
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2185,13 +2182,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1000
+#: query_hql.xml:1008
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "不用通过初始化,你就可以知道一个集合(Collection)的大小:"
 
 #. Tag: programlisting
-#: query_hql.xml:1004
+#: query_hql.xml:1012
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2199,34 +2196,34 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1009
+#: query_hql.xml:1017
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:1011
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
-"Components might be used in just about every way that simple value types can "
-"be used in HQL queries. They can appear in the <literal>select</literal> "
-"clause:"
+"Components can be used similarly to the simple value types that are used in "
+"HQL queries. They can appear in the <literal>select</literal> clause as "
+"follows:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1016 query_hql.xml:1062
+#: query_hql.xml:1024 query_hql.xml:1070
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1017
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1019
+#: query_hql.xml:1027
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2234,37 +2231,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1024
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1033
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1035
 #, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clause:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1031
+#: query_hql.xml:1039
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1040
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2272,24 +2269,24 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1040
+#: query_hql.xml:1048
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1042
+#: query_hql.xml:1050
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
-"syntax (sometimes called <literal>tuple</literal> syntax), even though the "
-"underlying database may not support that notion. Here we are generally "
-"referring to multi-valued comparisons, typically associated with components. "
-"Consider an entity Person which defines a name component:"
+"syntax, sometimes referred to AS <literal>tuple</literal> syntax, even "
+"though the underlying database may not support that notion. Here, we are "
+"generally referring to multi-valued comparisons, typically associated with "
+"components. Consider an entity Person which defines a name component:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1049
+#: query_hql.xml:1057
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2297,21 +2294,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1051
+#: query_hql.xml:1059
 #, no-c-format
 msgid ""
-"That's valid syntax, although a little verbose. It be nice to make this a "
-"bit more concise and use <literal>row value constructor</literal> syntax:"
+"That is valid syntax although it is a little verbose. You can make this more "
+"concise by using <literal>row value constructor</literal> syntax:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1056
+#: query_hql.xml:1064
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1058
+#: query_hql.xml:1066
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2319,16 +2316,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1064
+#: query_hql.xml:1072
 #, no-c-format
 msgid ""
-"Another time using <literal>row value constructor</literal> syntax can be "
-"beneficial is when using subqueries needing to compare against multiple "
-"values:"
+"Using <literal>row value constructor</literal> syntax can also be beneficial "
+"when using subqueries that need to compare against multiple values:"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1069
+#: query_hql.xml:1077
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2338,10 +2334,21 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1071
+#: query_hql.xml:1079
 #, no-c-format
 msgid ""
-"One thing to consider when deciding if you want to use this syntax is that "
+"One thing to consider when deciding if you want to use this syntax, is that "
 "the query will be dependent upon the ordering of the component sub-"
 "properties in the metadata."
 msgstr ""
+
+#~ msgid ""
+#~ "Most of the time, you will need to assign an <emphasis>alias</emphasis>, "
+#~ "since you will want to refer to the <literal>Cat</literal> in other parts "
+#~ "of the query."
+#~ msgstr ""
+#~ "大多数情况下, 你需要指定一个<emphasis>别名</emphasis>, 原因是你可能需要 在"
+#~ "查询语句的其它部分引用到<literal>Cat</literal>"
+
+#~ msgid "or as an actual typesafe Java object,"
+#~ msgstr "也可能直接返回一个实际的类型安全的Java对象,"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,17 +11,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_sql.xml:5
+#: query_sql.xml:29
 #, no-c-format
 msgid "Native SQL"
 msgstr "Native SQL查询"
 
 #. Tag: para
-#: query_sql.xml:7
-#, no-c-format
+#: query_sql.xml:31
+#, fuzzy, no-c-format
 msgid ""
-"You may also express queries in the native SQL dialect of your database. "
-"This is useful if you want to utilize database specific features such as "
+"You can also express queries in the native SQL dialect of your database. "
+"This is useful if you want to utilize database-specific features such as "
 "query hints or the <literal>CONNECT</literal> keyword in Oracle. It also "
 "provides a clean migration path from a direct SQL/JDBC based application to "
 "Hibernate."
@@ -32,48 +32,48 @@
 "Hibernate应用的道路上的障碍。"
 
 #. Tag: para
-#: query_sql.xml:13
-#, no-c-format
+#: query_sql.xml:37
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate3 allows you to specify handwritten SQL (including stored "
-"procedures) for all create, update, delete, and load operations."
+"Hibernate3 allows you to specify handwritten SQL, including stored "
+"procedures, for all create, update, delete, and load operations."
 msgstr ""
 "Hibernate3允许你使用手写的sql来完成所有的create,update,delete,和load操作(包"
 "括存储过程)"
 
 #. Tag: title
-#: query_sql.xml:17
+#: query_sql.xml:41
 #, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "使用<literal>SQLQuery</literal>"
 
 #. Tag: para
-#: query_sql.xml:19
-#, no-c-format
+#: query_sql.xml:43
+#, fuzzy, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
 "literal> interface, which is obtained by calling <literal>Session."
-"createSQLQuery()</literal>. The following describes how to use this API for "
-"querying."
+"createSQLQuery()</literal>. The following sections describe how to use this "
+"API for querying."
 msgstr ""
 "对原生SQL查询执行的控制是通过<literal>SQLQuery</literal>接口进行的,通过执行"
 "<literal>Session.createSQLQuery()</literal>获取这个接口。下面来描述如何使用这"
 "个API进行查询。"
 
 #. Tag: title
-#: query_sql.xml:25
+#: query_sql.xml:49
 #, no-c-format
 msgid "Scalar queries"
 msgstr "标量查询(Scalar queries)"
 
 #. Tag: para
-#: query_sql.xml:27
+#: query_sql.xml:51
 #, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr "最基本的SQL查询就是获得一个标量(数值)的列表。"
 
 #. Tag: programlisting
-#: query_sql.xml:30
+#: query_sql.xml:54
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
@@ -82,29 +82,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:32
-#, no-c-format
+#: query_sql.xml:56
+#, fuzzy, no-c-format
 msgid ""
-"These will both return a List of Object arrays (Object[]) with scalar values "
-"for each column in the CATS table. Hibernate will use ResultSetMetadata to "
+"These will return a List of Object arrays (Object[]) with scalar values for "
+"each column in the CATS table. Hibernate will use ResultSetMetadata to "
 "deduce the actual order and types of the returned scalar values."
 msgstr ""
 "它们都将返回一个Object数组(Object[])组成的List,数组每个元素都是CATS表的一个"
 "字段值。Hibernate会使用ResultSetMetadata来判定返回的标量值的实际顺序和类型。"
 
 #. Tag: para
-#: query_sql.xml:37
-#, no-c-format
+#: query_sql.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
-"simply to be more explicit in what is returned one can use <literal>addScalar"
-"()</literal>."
+"To avoid the overhead of using <literal>ResultSetMetadata</literal>, or "
+"simply to be more explicit in what is returned, one can use "
+"<literal>addScalar()</literal>:"
 msgstr ""
 "如果要避免过多的使用<literal>ResultSetMetadata</literal>,或者只是为了更加明确"
 "的指名返回值,可以使用<literal>addScalar()</literal>。"
 
 #. Tag: programlisting
-#: query_sql.xml:41
+#: query_sql.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -115,7 +115,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:43 query_sql.xml:89 query_sql.xml:170 query_sql.xml:321
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:198 query_sql.xml:349
 #, fuzzy, no-c-format
 msgid "This query specified:"
 msgstr ""
@@ -129,23 +129,23 @@
 "这个查询指定:"
 
 #. Tag: para
-#: query_sql.xml:47 query_sql.xml:93 query_sql.xml:325
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:353
 #, no-c-format
 msgid "the SQL query string"
 msgstr "SQL查询字符串"
 
 #. Tag: para
-#: query_sql.xml:51
+#: query_sql.xml:75
 #, no-c-format
 msgid "the columns and types to return"
 msgstr "要返回的字段和类型"
 
 #. Tag: para
-#: query_sql.xml:55
-#, no-c-format
+#: query_sql.xml:79
+#, fuzzy, no-c-format
 msgid ""
-"This will still return Object arrays, but now it will not use "
-"<literal>ResultSetMetdata</literal> but will instead explicitly get the ID, "
+"This will return Object arrays, but now it will not use "
+"<literal>ResultSetMetadata</literal> but will instead explicitly get the ID, "
 "NAME and BIRTHDATE column as respectively a Long, String and a Short from "
 "the underlying resultset. This also means that only these three columns will "
 "be returned, even though the query is using <literal>*</literal> and could "
@@ -157,7 +157,7 @@
 "三个字段,也仅仅会返回这三个字段。"
 
 #. Tag: para
-#: query_sql.xml:63
+#: query_sql.xml:87
 #, no-c-format
 msgid ""
 "It is possible to leave out the type information for all or some of the "
@@ -165,7 +165,7 @@
 msgstr "对全部或者部分的标量值不设置类型信息也是可以的。"
 
 #. Tag: programlisting
-#: query_sql.xml:66
+#: query_sql.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -176,23 +176,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:68
-#, no-c-format
+#: query_sql.xml:92
+#, fuzzy, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
-"<literal>ResultSetMetaData</literal> is used to decide the type of NAME and "
-"BIRTHDATE where as the type of ID is explicitly specified."
+"<literal>ResultSetMetaData</literal> is used to determine the type of NAME "
+"and BIRTHDATE, where as the type of ID is explicitly specified."
 msgstr ""
 "基本上这和前面一个查询相同,只是此时使用<literal>ResultSetMetaData</literal>来"
 "决定NAME和BIRTHDATE的类型,而ID的类型是明确指出的。"
 
 #. Tag: para
-#: query_sql.xml:72
-#, no-c-format
+#: query_sql.xml:96
+#, fuzzy, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
 "Hibernate types is controlled by the Dialect. If a specific type is not "
-"mapped or does not result in the expected type it is possible to customize "
+"mapped, or does not result in the expected type, it is possible to customize "
 "it via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 "关于从ResultSetMetaData返回的java.sql.Types是如何映射到Hibernate类型,是由方"
@@ -200,13 +200,13 @@
 "以通过Dialet的<literal>registerHibernateType</literal>调用自行定义。"
 
 #. Tag: title
-#: query_sql.xml:80
+#: query_sql.xml:104
 #, no-c-format
 msgid "Entity queries"
 msgstr "实体查询(Entity queries)"
 
 #. Tag: para
-#: query_sql.xml:82
+#: query_sql.xml:106
 #, no-c-format
 msgid ""
 "The above queries were all about returning scalar values, basically "
@@ -218,7 +218,7 @@
 "过<literal>addEntity()</literal>让原生查询返回实体对象。"
 
 #. Tag: programlisting
-#: query_sql.xml:87
+#: query_sql.xml:111
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.class);\n"
@@ -228,13 +228,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:97
+#: query_sql.xml:121
 #, no-c-format
 msgid "the entity returned by the query"
 msgstr "要返回的实体"
 
 #. Tag: para
-#: query_sql.xml:101
+#: query_sql.xml:125
 #, no-c-format
 msgid ""
 "Assuming that Cat is mapped as a class with the columns ID, NAME and "
@@ -245,7 +245,7 @@
 "List,每个元素都是一个Cat实体。"
 
 #. Tag: para
-#: query_sql.xml:105
+#: query_sql.xml:129
 #, no-c-format
 msgid ""
 "If the entity is mapped with a <literal>many-to-one</literal> to another "
@@ -261,7 +261,7 @@
 "具有指向<literal>Dog</literal>的<literal>many-to-one</literal>的例子:"
 
 #. Tag: programlisting
-#: query_sql.xml:113
+#: query_sql.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID FROM CATS"
@@ -270,19 +270,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:115
+#: query_sql.xml:139
 #, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr "这样cat.getDog()就能正常运作。"
 
 #. Tag: title
-#: query_sql.xml:119
+#: query_sql.xml:143
 #, no-c-format
 msgid "Handling associations and collections"
 msgstr "处理关联和集合类(Handling associations and collections)"
 
 #. Tag: para
-#: query_sql.xml:121
+#: query_sql.xml:145
 #, no-c-format
 msgid ""
 "It is possible to eagerly join in the <literal>Dog</literal> to avoid the "
@@ -295,7 +295,7 @@
 "将关联或集合连接进来。"
 
 #. Tag: programlisting
-#: query_sql.xml:126
+#: query_sql.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID, D_ID, "
@@ -306,15 +306,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:128
-#, no-c-format
+#: query_sql.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"In this example the returned <literal>Cat</literal>'s will have their "
+"In this example, the returned <literal>Cat</literal>'s will have their "
 "<literal>dog</literal> property fully initialized without any extra "
-"roundtrip to the database. Notice that we added a alias name (\"cat\") to be "
-"able to specify the target property path of the join. It is possible to do "
-"the same eager joining for collections, e.g. if the <literal>Cat</literal> "
-"had a one-to-many to <literal>Dog</literal> instead."
+"roundtrip to the database. Notice that you added an alias name (\"cat\") to "
+"be able to specify the target property path of the join. It is possible to "
+"do the same eager joining for collections, e.g. if the <literal>Cat</"
+"literal> had a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 "上面这个例子中,返回的<literal>Cat</literal>对象,其<literal>dog</literal>属"
 "性被完全初始化了,不再需要数据库的额外操作。注意,我们加了一个别名(\"cat\"),"
@@ -322,7 +322,7 @@
 "<literal>Cat</literal>有一个指向<literal>Dog</literal>的一对多关联。"
 
 #. Tag: programlisting
-#: query_sql.xml:136
+#: query_sql.xml:160
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_NAME, "
@@ -332,39 +332,39 @@
 "]]>"
 msgstr ""
 
-#. Tag: p
-#: query_sql.xml:138
-#, no-c-format
+#. Tag: para
+#: query_sql.xml:162
+#, fuzzy, no-c-format
 msgid ""
-"At this stage we are reaching the limits of what is possible with native "
-"queries without starting to enhance the sql queries to make them usable in "
-"Hibernate; the problems starts to arise when returning multiple entities of "
-"the same type or when the default alias/column names are not enough."
+"At this stage you are reaching the limits of what is possible with native "
+"queries, without starting to enhance the sql queries to make them usable in "
+"Hibernate. Problems can arise when returning multiple entities of the same "
+"type or when the default alias/column names are not enough."
 msgstr ""
 "到此为止,我们碰到了天花板:若不对SQL查询进行增强,这些已经是在Hibernate中使"
 "用原生SQL查询所能做到的最大可能了。下面的问题即将出现:返回多个同样类型的实体"
 "怎么办?或者默认的别名/字段不够又怎么办?"
 
 #. Tag: title
-#: query_sql.xml:146
+#: query_sql.xml:170
 #, no-c-format
 msgid "Returning multiple entities"
 msgstr "返回多个实体(Returning multiple entities)"
 
 #. Tag: para
-#: query_sql.xml:148
-#, no-c-format
+#: query_sql.xml:172
+#, fuzzy, no-c-format
 msgid ""
-"Until now the result set column names are assumed to be the same as the "
+"Until now, the result set column names are assumed to be the same as the "
 "column names specified in the mapping document. This can be problematic for "
-"SQL queries which join multiple tables, since the same column names may "
+"SQL queries that join multiple tables, since the same column names can "
 "appear in more than one table."
 msgstr ""
 "到目前为止,结果集字段名被假定为和映射文件中指定的的字段名是一致的。假若SQL查"
 "询连接了多个表,同一个字段名可能在多个表中出现多次,这就会造成问题。"
 
 #. Tag: para
-#: query_sql.xml:153
+#: query_sql.xml:177
 #, no-c-format
 msgid ""
 "Column alias injection is needed in the following query (which most likely "
@@ -372,7 +372,7 @@
 msgstr "下面的查询中需要使用字段别名注射(这个例子本身会失败):"
 
 #. Tag: programlisting
-#: query_sql.xml:156
+#: query_sql.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m WHERE c."
@@ -383,15 +383,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:158
-#, no-c-format
+#: query_sql.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"The intention for this query is to return two Cat instances per row, a cat "
-"and its mother. This will fail since there is a conflict of names since they "
-"are mapped to the same column names and on some databases the returned "
-"column aliases will most likely be on the form \"c.ID\", \"c.NAME\", etc. "
-"which are not equal to the columns specificed in the mappings (\"ID\" and "
-"\"NAME\")."
+"The query was intended to return two Cat instances per row: a cat and its "
+"mother. The query will, however, fail because there is a conflict of names; "
+"the instances are mapped to the same column names. Also, on some databases "
+"the returned column aliases will most likely be on the form \"c.ID\", \"c."
+"NAME\", etc. which are not equal to the columns specified in the mappings "
+"(\"ID\" and \"NAME\")."
 msgstr ""
 "这个查询的本意是希望每行返回两个Cat实例,一个是cat,另一个是它的妈妈。但是因为"
 "它们的字段名被映射为相同的,而且在某些数据库中,返回的字段别名是“c.ID”,\"c."
@@ -399,13 +399,13 @@
 "会造成失败。"
 
 #. Tag: para
-#: query_sql.xml:165
+#: query_sql.xml:193
 #, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr "下面的形式可以解决字段名重复:"
 
 #. Tag: programlisting
-#: query_sql.xml:168
+#: query_sql.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -416,7 +416,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:174
+#: query_sql.xml:202
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -424,23 +424,22 @@
 msgstr "SQL查询语句,其中包含占位附来让Hibernate注射字段别名"
 
 #. Tag: para
-#: query_sql.xml:179
+#: query_sql.xml:207
 #, no-c-format
 msgid "the entities returned by the query"
 msgstr "查询返回的实体"
 
 #. Tag: para
-#: query_sql.xml:183
-#, no-c-format
+#: query_sql.xml:211
+#, fuzzy, no-c-format
 msgid ""
 "The {cat.*} and {mother.*} notation used above is a shorthand for \"all "
-"properties\". Alternatively, you may list the columns explicity, but even in "
-"this case we let Hibernate inject the SQL column aliases for each property. "
-"The placeholder for a column alias is just the property name qualified by "
-"the table alias. In the following example, we retrieve Cats and their "
-"mothers from a different table (cat_log) to the one declared in the mapping "
-"metadata. Notice that we may even use the property aliases in the where "
-"clause if we like."
+"properties\". Alternatively, you can list the columns explicitly, but even "
+"in this case Hibernate injects the SQL column aliases for each property. The "
+"placeholder for a column alias is just the property name qualified by the "
+"table alias. In the following example, you retrieve Cats and their mothers "
+"from a different table (cat_log) to the one declared in the mapping "
+"metadata. You can even use the property aliases in the where clause."
 msgstr ""
 "上面使用的{cat.*}和{mother.*}标记是作为“所有属性”的简写形式出现的。当然你也可"
 "以明确地罗列出字段名,但在这个例子里面我们让Hibernate来为每个属性注射SQL字段"
@@ -449,7 +448,7 @@
 "意,我们甚至可以在where子句中使用属性别名。"
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -464,250 +463,251 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:195
+#: query_sql.xml:223
 #, no-c-format
 msgid "Alias and property references"
 msgstr "别名和属性引用(Alias and property references)"
 
 #. Tag: para
-#: query_sql.xml:197
-#, no-c-format
+#: query_sql.xml:225
+#, fuzzy, no-c-format
 msgid ""
-"For most cases the above alias injection is needed, but for queries relating "
-"to more complex mappings like composite properties, inheritance "
-"discriminators, collections etc. there are some specific aliases to use to "
-"allow Hibernate to inject the proper aliases."
+"In most cases the above alias injection is needed. For queries relating to "
+"more complex mappings, like composite properties, inheritance "
+"discriminators, collections etc., you can use specific aliases that allow "
+"Hibernate to inject the proper aliases."
 msgstr ""
 "大多数情况下,都需要上面的属性注射,但在使用更加复杂的映射,比如复合属性、通"
 "过标识符构造继承树,以及集合类等等情况下,也有一些特别的别名,来允许Hibernate"
 "注射合适的别名。"
 
 #. Tag: para
-#: query_sql.xml:202
-#, no-c-format
+#: query_sql.xml:230
+#, fuzzy, no-c-format
 msgid ""
-"The following table shows the different possibilities of using the alias "
-"injection. Note: the alias names in the result are examples, each alias will "
-"have a unique and probably different name when used."
+"The following table shows the different ways you can use the alias "
+"injection. Please note that the alias names in the result are simply "
+"examples; each alias will have a unique and probably different name when "
+"used."
 msgstr ""
 "下表列出了使用别名注射参数的不同可能性。注意:下面结果中的别名只是示例,实用"
 "时每个别名需要唯一并且不同的名字。"
 
 #. Tag: title
-#: query_sql.xml:208
+#: query_sql.xml:236
 #, no-c-format
 msgid "Alias injection names"
 msgstr "别名注射(alias injection names)"
 
 #. Tag: entry
-#: query_sql.xml:219
+#: query_sql.xml:247
 #, no-c-format
 msgid "Description"
 msgstr "描述"
 
 #. Tag: entry
-#: query_sql.xml:221
+#: query_sql.xml:249
 #, no-c-format
 msgid "Syntax"
 msgstr "语法"
 
 #. Tag: entry
-#: query_sql.xml:223
+#: query_sql.xml:251
 #, no-c-format
 msgid "Example"
 msgstr "示例"
 
 #. Tag: entry
-#: query_sql.xml:229
+#: query_sql.xml:257
 #, no-c-format
 msgid "A simple property"
 msgstr "简单属性"
 
 #. Tag: literal
-#: query_sql.xml:231
+#: query_sql.xml:259
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
 #. Tag: literal
-#: query_sql.xml:233
+#: query_sql.xml:261
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:237
+#: query_sql.xml:265
 #, no-c-format
 msgid "A composite property"
 msgstr "复合属性"
 
 #. Tag: literal
-#: query_sql.xml:239
+#: query_sql.xml:267
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:241
+#: query_sql.xml:269
 #, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 
 #. Tag: entry
-#: query_sql.xml:246
+#: query_sql.xml:274
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "实体辨别器(Discriminator of an entity)"
 
 #. Tag: literal
-#: query_sql.xml:248
+#: query_sql.xml:276
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:250
+#: query_sql.xml:278
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:254
+#: query_sql.xml:282
 #, no-c-format
 msgid "All properties of an entity"
 msgstr "实体的所有属性"
 
 #. Tag: literal
-#: query_sql.xml:256 query_sql.xml:304
+#: query_sql.xml:284 query_sql.xml:332
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:258
+#: query_sql.xml:286
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:262
+#: query_sql.xml:290
 #, no-c-format
 msgid "A collection key"
 msgstr "集合键(collection key)"
 
 #. Tag: literal
-#: query_sql.xml:264
+#: query_sql.xml:292
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:266
+#: query_sql.xml:294
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:298
 #, no-c-format
 msgid "The id of an collection"
 msgstr "集合id"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:300
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:302
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:306
 #, no-c-format
 msgid "The element of an collection"
 msgstr "集合元素"
 
 #. Tag: literal
-#: query_sql.xml:280
+#: query_sql.xml:308
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:310
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:286
-#, no-c-format
-msgid "roperty of the element in the collection"
+#: query_sql.xml:314
+#, fuzzy, no-c-format
+msgid "property of the element in the collection"
 msgstr "集合元素的属性"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:316
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:318
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:322
 #, no-c-format
 msgid "All properties of the element in the collection"
 msgstr "集合元素的所有属性"
 
 #. Tag: literal
-#: query_sql.xml:296
+#: query_sql.xml:324
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:326
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:330
 #, no-c-format
 msgid "All properties of the the collection"
 msgstr "集合的所有属性"
 
 #. Tag: literal
-#: query_sql.xml:306
+#: query_sql.xml:334
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:315
+#: query_sql.xml:343
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "返回非受管实体(Returning non-managed entities)"
 
 #. Tag: para
-#: query_sql.xml:317
-#, no-c-format
+#: query_sql.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"It is possible to apply a ResultTransformer to native sql queries. Allowing "
-"it to e.g. return non-managed entities."
+"It is possible to apply a ResultTransformer to native SQL queries, allowing "
+"it to return non-managed entities."
 msgstr ""
 "可以对原生sql 查询使用ResultTransformer。这会返回不受Hibernate管理的实体。"
 
 #. Tag: programlisting
-#: query_sql.xml:319
+#: query_sql.xml:347
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -715,13 +715,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:329
+#: query_sql.xml:357
 #, no-c-format
 msgid "a result transformer"
 msgstr "结果转换器(result transformer)"
 
 #. Tag: para
-#: query_sql.xml:333
+#: query_sql.xml:361
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -732,36 +732,36 @@
 "BIRTHDAY的值注射入对应的属性或者字段。"
 
 #. Tag: title
-#: query_sql.xml:340
+#: query_sql.xml:368
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "处理继承(Handling inheritance)"
 
 #. Tag: para
-#: query_sql.xml:342
-#, no-c-format
+#: query_sql.xml:370
+#, fuzzy, no-c-format
 msgid ""
-"Native sql queries which query for entities that is mapped as part of an "
-"inheritance must include all properties for the baseclass and all it "
+"Native SQL queries which query for entities that are mapped as part of an "
+"inheritance must include all properties for the baseclass and all its "
 "subclasses."
 msgstr ""
 "原生SQL查询假若其查询结果实体是继承树中的一部分,它必须包含基类和所有子类的所"
 "有属性。"
 
 #. Tag: title
-#: query_sql.xml:348
+#: query_sql.xml:376
 #, no-c-format
 msgid "Parameters"
 msgstr "参数(Parameters)"
 
 #. Tag: para
-#: query_sql.xml:350
-#, no-c-format
-msgid "Native sql queries support positional as well as named parameters:"
+#: query_sql.xml:378
+#, fuzzy, no-c-format
+msgid "Native SQL queries support positional as well as named parameters:"
 msgstr "原生查询支持位置参数和命名参数:"
 
 #. Tag: programlisting
-#: query_sql.xml:353
+#: query_sql.xml:381
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -774,17 +774,17 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:361
+#: query_sql.xml:389
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "命名SQL查询"
 
 #. Tag: para
-#: query_sql.xml:363
-#, no-c-format
+#: query_sql.xml:391
+#, fuzzy, no-c-format
 msgid ""
-"Named SQL queries may be defined in the mapping document and called in "
-"exactly the same way as a named HQL query. In this case, we do "
+"Named SQL queries can be defined in the mapping document and called in "
+"exactly the same way as a named HQL query. In this case, you do "
 "<emphasis>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 "可以在映射文档中定义查询的名字,然后就可以象调用一个命名的HQL查询一样直接调用"
@@ -792,7 +792,7 @@
 "<literal>addEntity()</literal>方法."
 
 #. Tag: programlisting
-#: query_sql.xml:368
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -806,7 +806,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:370
+#: query_sql.xml:398
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -816,18 +816,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:372
-#, no-c-format
+#: query_sql.xml:400
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
-"collection&gt;</literal> elements are used to join associations and define "
-"queries which initialize collections, respectively."
+"The <literal>&lt;return-join&gt;</literal> element is use to join "
+"associations and the <literal>&lt;load-collection&gt;</literal> element is "
+"used to define queries which initialize collections,"
 msgstr ""
 "<literal>&lt;return-join&gt;</literal>和 <literal>&lt;load-collection&gt;</"
 "literal> 元素是用来连接关联以及将查询定义为预先初始化各个集合的。"
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:404
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -848,7 +848,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:379
+#: query_sql.xml:406
 #, no-c-format
 msgid ""
 "A named SQL query may return a scalar value. You must declare the column "
@@ -859,7 +859,7 @@
 "literal>元素来指定字段的别名和 Hibernate类型"
 
 #. Tag: programlisting
-#: query_sql.xml:383
+#: query_sql.xml:410
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -872,12 +872,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:385
-#, no-c-format
+#: query_sql.xml:412
+#, fuzzy, no-c-format
 msgid ""
-"You can externalize the resultset mapping informations in a <literal>&lt;"
-"resultset&gt;</literal> element to either reuse them accross several named "
-"queries or through the <literal>setResultSetMapping()</literal> API."
+"You can externalize the resultset mapping information in a <literal>&lt;"
+"resultset&gt;</literal> element which will allow you to either reuse them "
+"across several named queries or through the <literal>setResultSetMapping()</"
+"literal> API."
 msgstr ""
 "你可以把结果集映射的信息放在外部的<literal>&lt;resultset&gt;</literal>元素"
 "中,这样就可以在多个命名查询间,或者通过<literal>setResultSetMapping()</"
@@ -887,7 +888,7 @@
 "<literal>setResultSetMapping()</literal> API.)"
 
 #. Tag: programlisting
-#: query_sql.xml:390
+#: query_sql.xml:417
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -911,15 +912,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:392
-#, no-c-format
+#: query_sql.xml:419
+#, fuzzy, no-c-format
 msgid ""
-"You can alternatively use the resultset mapping information in your hbm "
+"You can, alternatively, use the resultset mapping information in your hbm "
 "files directly in java code."
 msgstr "另外,你可以在java代码中直接使用hbm文件中的结果集定义信息。"
 
 #. Tag: programlisting
-#: query_sql.xml:395
+#: query_sql.xml:422
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -931,25 +932,25 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:398
+#: query_sql.xml:425
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr "使用return-property来明确地指定字段/别名"
 
 #. Tag: para
-#: query_sql.xml:401
-#, no-c-format
+#: query_sql.xml:428
+#, fuzzy, no-c-format
 msgid ""
-"With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
-"Hibernate what column aliases to use, instead of using the <literal>{}</"
-"literal>-syntax to let Hibernate inject its own aliases."
+"You can explicitly tell Hibernate what column aliases to use with "
+"<literal>&lt;return-property&gt;</literal>, instead of using the <literal>{}"
+"</literal>-syntax to let Hibernate inject its own aliases.For example:"
 msgstr ""
 "使用<literal>&lt;return-property&gt;</literal>你可以明确的告诉Hibernate使用哪"
 "些字段别名,这取代了使用<literal>{}</literal>-语法 来让Hibernate注入它自己的别"
 "名."
 
 #. Tag: programlisting
-#: query_sql.xml:406
+#: query_sql.xml:433
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -967,18 +968,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:408
-#, no-c-format
+#: query_sql.xml:435
+#, fuzzy, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
-"This solves a limitation with the <literal>{}</literal>-syntax which can not "
+"This solves a limitation with the <literal>{}</literal>-syntax which cannot "
 "allow fine grained control of multi-column properties."
 msgstr ""
 "<literal>&lt;return-property&gt;</literal>也可用于多个字段,它解决了使用"
 "<literal>{}</literal>-语法不能细粒度控制多个字段的限制"
 
 #. Tag: programlisting
-#: query_sql.xml:413
+#: query_sql.xml:440
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -999,18 +1000,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:415
-#, no-c-format
+#: query_sql.xml:442
+#, fuzzy, no-c-format
 msgid ""
-"Notice that in this example we used <literal>&lt;return-property&gt;</"
-"literal> in combination with the <literal>{}</literal>-syntax for injection. "
-"Allowing users to choose how they want to refer column and properties."
+"In this example <literal>&lt;return-property&gt;</literal> was used in "
+"combination with the <literal>{}</literal>-syntax for injection. This allows "
+"users to choose how they want to refer column and properties."
 msgstr ""
 "注意在这个例子中,我们使用了<literal>&lt;return-property&gt;</literal>结合"
 "<literal>{}</literal>的注入语法. 允许用户来选择如何引用字段以及属性."
 
 #. Tag: para
-#: query_sql.xml:420
+#: query_sql.xml:447
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1020,27 +1021,27 @@
 "discriminator&gt;</literal> 来指定识别器字段"
 
 #. Tag: title
-#: query_sql.xml:426
+#: query_sql.xml:453
 #, no-c-format
 msgid "Using stored procedures for querying"
 msgstr "使用存储过程来查询"
 
 #. Tag: para
-#: query_sql.xml:428
-#, no-c-format
+#: query_sql.xml:455
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate 3 introduces support for queries via stored procedures and "
-"functions. Most of the following documentation is equivalent for both. The "
-"stored procedure/function must return a resultset as the first out-parameter "
-"to be able to work with Hibernate. An example of such a stored function in "
-"Oracle 9 and higher is as follows:"
+"Hibernate3 provides support for queries via stored procedures and functions. "
+"Most of the following documentation is equivalent for both. The stored "
+"procedure/function must return a resultset as the first out-parameter to be "
+"able to work with Hibernate. An example of such a stored function in Oracle "
+"9 and higher is as follows:"
 msgstr ""
 "Hibernate 3引入了对存储过程查询(stored procedure)和函数(function)的支持.以下"
 "的说明中,这二者一般都适用。 存储过程/函数必须返回一个结果集,作为Hibernate能"
 "够使用的第一个外部参数. 下面是一个Oracle9和更高版本的存储过程例子."
 
 #. Tag: programlisting
-#: query_sql.xml:434
+#: query_sql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1058,13 +1059,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:436
+#: query_sql.xml:463
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr "在Hibernate里要要使用这个查询,你需要通过命名查询来映射它."
 
 #. Tag: programlisting
-#: query_sql.xml:439
+#: query_sql.xml:466
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1085,29 +1086,29 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:441
-#, no-c-format
+#: query_sql.xml:468
+#, fuzzy, no-c-format
 msgid ""
-"Notice stored procedures currently only return scalars and entities. "
-"<literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&gt;</"
-"literal> are not supported."
+"Stored procedures currently only return scalars and entities. <literal>&lt;"
+"return-join&gt;</literal> and <literal>&lt;load-collection&gt;</literal> are "
+"not supported."
 msgstr ""
 "注意存储过程当前仅仅返回标量和实体.现在不支持<literal>&lt;return-join&gt;</"
 "literal>和<literal>&lt;load-collection&gt;</literal>"
 
 #. Tag: title
-#: query_sql.xml:446
+#: query_sql.xml:473
 #, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr "使用存储过程的规则和限制"
 
 #. Tag: para
-#: query_sql.xml:448
-#, no-c-format
+#: query_sql.xml:475
+#, fuzzy, no-c-format
 msgid ""
-"To use stored procedures with Hibernate the procedures/functions have to "
-"follow some rules. If they do not follow those rules they are not usable "
-"with Hibernate. If you still want to use these procedures you have to "
+"You cannot use stored procedures with Hibernate unless you follow some "
+"procedure/function rules. If they do not follow those rules they are not "
+"usable with Hibernate. If you still want to use these procedures you have to "
 "execute them via <literal>session.connection()</literal>. The rules are "
 "different for each database, since database vendors have different stored "
 "procedure semantics/syntax."
@@ -1118,20 +1119,20 @@
 "储过程语法和语义."
 
 #. Tag: para
-#: query_sql.xml:455
-#, no-c-format
+#: query_sql.xml:482
+#, fuzzy, no-c-format
 msgid ""
-"Stored procedure queries can't be paged with <literal>setFirstResult()/"
+"Stored procedure queries cannot be paged with <literal>setFirstResult()/"
 "setMaxResults()</literal>."
 msgstr ""
 "对存储过程进行的查询无法使用<literal>setFirstResult()/setMaxResults()</"
 "literal>进行分页。"
 
 #. Tag: para
-#: query_sql.xml:458
-#, no-c-format
+#: query_sql.xml:485
+#, fuzzy, no-c-format
 msgid ""
-"Recommended call form is standard SQL92: <literal>{ ? = call functionName"
+"The recommended call form is standard SQL92: <literal>{ ? = call functionName"
 "(&lt;parameters&gt;) }</literal> or <literal>{ ? = call procedureName(&lt;"
 "parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
@@ -1140,20 +1141,20 @@
 "parameters&gt;}</literal>.原生调用语法不被支持。"
 
 #. Tag: para
-#: query_sql.xml:463
+#: query_sql.xml:490
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "对于Oracle有如下规则:"
 
 #. Tag: para
-#: query_sql.xml:467
-#, no-c-format
+#: query_sql.xml:494
+#, fuzzy, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
 "be an <literal>OUT</literal> that returns a result set. This is done by "
 "using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In Oracle "
-"you need to define a <literal>REF CURSOR</literal> type, see Oracle "
-"literature."
+"you need to define a <literal>REF CURSOR</literal> type. See Oracle "
+"literature for further information."
 msgstr ""
 "函数必须返回一个结果集。存储过程的第一个参数必须是<literal>OUT</literal>,它"
 "返回一个结果集。这是通过Oracle 9或10的<literal>SYS_REFCURSOR</literal>类型来"
@@ -1161,25 +1162,25 @@
 "的手册。"
 
 #. Tag: para
-#: query_sql.xml:476
+#: query_sql.xml:503
 #, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr "对于Sybase或者MS SQL server有如下规则:"
 
 #. Tag: para
-#: query_sql.xml:480
-#, no-c-format
+#: query_sql.xml:507
+#, fuzzy, no-c-format
 msgid ""
-"The procedure must return a result set. Note that since these servers can/"
-"will return multiple result sets and update counts, Hibernate will iterate "
-"the results and take the first result that is a result set as its return "
-"value. Everything else will be discarded."
+"The procedure must return a result set. Note that since these servers can "
+"return multiple result sets and update counts, Hibernate will iterate the "
+"results and take the first result that is a result set as its return value. "
+"Everything else will be discarded."
 msgstr ""
 "存储过程必须返回一个结果集。.注意这些servers可能返回多个结果集以及更新的数目."
 "Hibernate将取出第一条结果集作为它的返回值, 其他将被丢弃。"
 
 #. Tag: para
-#: query_sql.xml:488
+#: query_sql.xml:515
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1189,13 +1190,13 @@
 "高,但这不是必需的。"
 
 #. Tag: title
-#: query_sql.xml:498
+#: query_sql.xml:525
 #, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr "定制SQL用来create,update和delete"
 
 #. Tag: para
-#: query_sql.xml:500
+#: query_sql.xml:527
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1212,7 +1213,7 @@
 "literal>重载了 这些语句。"
 
 #. Tag: programlisting
-#: query_sql.xml:508
+#: query_sql.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1228,18 +1229,18 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:510
-#, no-c-format
+#: query_sql.xml:537
+#, fuzzy, no-c-format
 msgid ""
-"The SQL is directly executed in your database, so you are free to use any "
-"dialect you like. This will of course reduce the portability of your mapping "
-"if you use database specific SQL."
+"The SQL is directly executed in your database, so you can use any dialect "
+"you like. This will reduce the portability of your mapping if you use "
+"database specific SQL."
 msgstr ""
 "这些SQL直接在你的数据库里执行,所以你可以自由的使用你喜欢的任意语法。但如果你"
 "使用数据库特定的语法, 这当然会降低你映射的可移植性。"
 
 #. Tag: para
-#: query_sql.xml:514
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1247,7 +1248,7 @@
 msgstr "如果设定<literal>callable</literal>,则能够支持存储过程了。"
 
 #. Tag: programlisting
-#: query_sql.xml:517
+#: query_sql.xml:544
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1263,23 +1264,23 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:519
-#, no-c-format
+#: query_sql.xml:546
+#, fuzzy, no-c-format
 msgid ""
-"The order of the positional parameters are currently vital, as they must be "
-"in the same sequence as Hibernate expects them."
+"The order of the positional parameters is vital, as they must be in the same "
+"sequence as Hibernate expects them."
 msgstr "参数的位置顺序是非常重要的,他们必须和Hibernate所期待的顺序相同。"
 
 #. Tag: para
-#: query_sql.xml:522
-#, no-c-format
+#: query_sql.xml:549
+#, fuzzy, no-c-format
 msgid ""
-"You can see the expected order by enabling debug logging for the "
+"You can view the expected order by enabling debug logging for the "
 "<literal>org.hibernate.persister.entity</literal> level. With this level "
-"enabled Hibernate will print out the static SQL that is used to create, "
-"update, delete etc. entities. (To see the expected sequence, remember to not "
-"include your custom SQL in the mapping files as that will override the "
-"Hibernate generated static sql.)"
+"enabled, Hibernate will print out the static SQL that is used to create, "
+"update, delete etc. entities. To view the expected sequence, do not include "
+"your custom SQL in the mapping files, as this will override the Hibernate "
+"generated static SQL."
 msgstr ""
 "你能够通过设定日志调试级别为<literal>org.hiberante.persister.entity</"
 "literal>,来查看Hibernate所期待的顺序。在这个级别下, Hibernate将会打印出"
@@ -1287,21 +1288,20 @@
 "包含在映射文件里, 因为他们会重载Hibernate生成的静态SQL。)"
 
 #. Tag: para
-#: query_sql.xml:529
-#, no-c-format
+#: query_sql.xml:556
+#, fuzzy, no-c-format
 msgid ""
-"The stored procedures are in most cases (read: better do it than not) "
-"required to return the number of rows inserted/updated/deleted, as Hibernate "
-"has some runtime checks for the success of the statement. Hibernate always "
-"registers the first statement parameter as a numeric output parameter for "
-"the CUD operations:"
+"The stored procedures are in most cases required to return the number of "
+"rows inserted, updated and deleted, as Hibernate has some runtime checks for "
+"the success of the statement. Hibernate always registers the first statement "
+"parameter as a numeric output parameter for the CUD operations:"
 msgstr ""
 "在大多数情况下(最好这么做),存储过程需要返回插入/更新/删除的行数,因为"
 "Hibernate对语句的成功执行有些运行时的检查。 Hibernate常会把进行CUD操作的语句"
 "的第一个参数注册为一个数值型输出参数。"
 
 #. Tag: programlisting
-#: query_sql.xml:535
+#: query_sql.xml:562
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1321,19 +1321,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:539
+#: query_sql.xml:566
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "定制装载SQL"
 
 #. Tag: para
-#: query_sql.xml:541
-#, no-c-format
-msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
+#: query_sql.xml:568
+#, fuzzy, no-c-format
+msgid "You can also declare your own SQL (or HQL) queries for entity loading:"
 msgstr "你可能需要声明你自己的SQL(或HQL)来装载实体"
 
 #. Tag: programlisting
-#: query_sql.xml:544
+#: query_sql.xml:571
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1346,15 +1346,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
-#, no-c-format
+#: query_sql.xml:573
+#, fuzzy, no-c-format
 msgid ""
-"This is just a named query declaration, as discussed earlier. You may "
+"This is just a named query declaration, as discussed earlier. You can "
 "reference this named query in a class mapping:"
 msgstr "这只是一个前面讨论过的命名查询声明,你可以在类映射里引用这个命名查询。"
 
 #. Tag: programlisting
-#: query_sql.xml:549
+#: query_sql.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1367,19 +1367,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:551
+#: query_sql.xml:578
 #, no-c-format
 msgid "This even works with stored procedures."
 msgstr "这也可以用于存储过程"
 
 #. Tag: para
-#: query_sql.xml:553
-#, no-c-format
-msgid "You may even define a query for collection loading:"
+#: query_sql.xml:580
+#, fuzzy, no-c-format
+msgid "You can even define a query for collection loading:"
 msgstr "你甚至可以定一个用于集合装载的查询:"
 
 #. Tag: programlisting
-#: query_sql.xml:555
+#: query_sql.xml:582
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1390,7 +1390,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:557
+#: query_sql.xml:584
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1403,15 +1403,15 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:559
-#, no-c-format
+#: query_sql.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You could even define an entity loader that loads a collection by join "
+"You can also define an entity loader that loads a collection by join "
 "fetching:"
 msgstr "你甚至还可以定义一个实体装载器,它通过连接抓取装载一个集合:"
 
 #. Tag: programlisting
-#: query_sql.xml:562
+#: query_sql.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/session_api.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/session_api.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,14 +18,14 @@
 
 #. Tag: para
 #: session_api.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
 "the developer from the details of the underlying database management system, "
 "but also offers <emphasis>state management</emphasis> of objects. This is, "
 "contrary to the management of SQL <literal>statements</literal> in common "
-"JDBC/SQL persistence layers, a very natural object-oriented view of "
-"persistence in Java applications."
+"JDBC/SQL persistence layers, a natural object-oriented view of persistence "
+"in Java applications."
 msgstr ""
 "Hibernate是完整的对象/关系映射解决方案,它提供了对象<emphasis>状态管理(state "
 "management)</emphasis>的功能,使开发者不再需要理会底层数据库系统的细节。 也就"
@@ -60,14 +60,14 @@
 
 #. Tag: para
 #: session_api.xml:56
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
 "instantiated using the <literal>new</literal> operator, and it is not "
 "associated with a Hibernate <literal>Session</literal>. It has no persistent "
 "representation in the database and no identifier value has been assigned. "
 "Transient instances will be destroyed by the garbage collector if the "
-"application doesn't hold a reference anymore. Use the Hibernate "
+"application does not hold a reference anymore. Use the Hibernate "
 "<literal>Session</literal> to make an object persistent (and let Hibernate "
 "take care of the SQL statements that need to be executed for this "
 "transition)."
@@ -81,14 +81,14 @@
 
 #. Tag: para
 #: session_api.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
 "in the database and an identifier value. It might just have been saved or "
 "loaded, however, it is by definition in the scope of a <literal>Session</"
 "literal>. Hibernate will detect any changes made to an object in persistent "
 "state and synchronize the state with the database when the unit of work "
-"completes. Developers don't execute manual <literal>UPDATE</literal> "
+"completes. Developers do not execute manual <literal>UPDATE</literal> "
 "statements, or <literal>DELETE</literal> statements when an object should be "
 "made transient."
 msgstr ""
@@ -103,7 +103,7 @@
 
 #. Tag: para
 #: session_api.xml:79
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
 "been persistent, but its <literal>Session</literal> has been closed. The "
@@ -112,8 +112,8 @@
 "to a new <literal>Session</literal> at a later point in time, making it (and "
 "all the modifications) persistent again. This feature enables a programming "
 "model for long running units of work that require user think-time. We call "
-"them <emphasis>application transactions</emphasis>, i.e. a unit of work from "
-"the point of view of the user."
+"them <emphasis>application transactions</emphasis>, i.e., a unit of work "
+"from the point of view of the user."
 msgstr ""
 "<emphasis>脱管(Detached)</emphasis> - 与持久(Persistent)对象关联的"
 "<literal>Session</literal>被关闭后,对象就变为脱管(Detached)的。 对脱管"
@@ -126,9 +126,9 @@
 
 #. Tag: para
 #: session_api.xml:93
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We'll now discuss the states and state transitions (and the Hibernate "
+"We will now discuss the states and state transitions (and the Hibernate "
 "methods that trigger a transition) in more detail."
 msgstr ""
 "接下来我们来细致的讨论下状态(states)及状态间的转换(state transitions)(以及触"
@@ -165,14 +165,14 @@
 
 #. Tag: para
 #: session_api.xml:112
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
 "generated and assigned to the <literal>cat</literal> when <literal>save()</"
 "literal> is called. If <literal>Cat</literal> has an <literal>assigned</"
 "literal> identifier, or a composite key, the identifier should be assigned "
 "to the <literal>cat</literal> instance before calling <literal>save()</"
-"literal>. You may also use <literal>persist()</literal> instead of "
+"literal>. You can also use <literal>persist()</literal> instead of "
 "<literal>save()</literal>, with the semantics defined in the EJB3 early "
 "draft."
 msgstr ""
@@ -186,10 +186,10 @@
 
 #. Tag: para
 #: session_api.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
-"it doesn't guarantee that the identifier value will be assigned to the "
+"it does not guarantee that the identifier value will be assigned to the "
 "persistent instance immediately, the assignment might happen at flush time. "
 "<literal>persist()</literal> also guarantees that it will not execute an "
 "<literal>INSERT</literal> statement if it is called outside of transaction "
@@ -222,9 +222,9 @@
 
 #. Tag: para
 #: session_api.xml:145
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively, you may assign the identifier using an overloaded version of "
+"Alternatively, you can assign the identifier using an overloaded version of "
 "<literal>save()</literal>."
 msgstr "此外,你可以用一个重载版本的<literal>save()</literal>方法。"
 
@@ -243,11 +243,11 @@
 
 #. Tag: para
 #: session_api.xml:152
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
 "<literal>kittens</literal> collection in the previous example), these "
-"objects may be made persistent in any order you like unless you have a "
+"objects can be made persistent in any order you like unless you have a "
 "<literal>NOT NULL</literal> constraint upon a foreign key column. There is "
 "never a risk of violating foreign key constraints. However, you might "
 "violate a <literal>NOT NULL</literal> constraint if you <literal>save()</"
@@ -262,12 +262,12 @@
 
 #. Tag: para
 #: session_api.xml:162
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Usually you don't bother with this detail, as you'll very likely use "
+"Usually you do not bother with this detail, as you will normally use "
 "Hibernate's <emphasis>transitive persistence</emphasis> feature to save the "
 "associated objects automatically. Then, even <literal>NOT NULL</literal> "
-"constraint violations don't occur - Hibernate will take care of everything. "
+"constraint violations do not occur - Hibernate will take care of everything. "
 "Transitive persistence is discussed later in this chapter."
 msgstr ""
 "通常你不会为这些细节烦心,因为你很可能会使用Hibernate的 <emphasis>传播性持久"
@@ -283,12 +283,12 @@
 
 #. Tag: para
 #: session_api.xml:175
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>load()</literal> methods of <literal>Session</literal> gives "
-"you a way to retrieve a persistent instance if you already know its "
-"identifier. <literal>load()</literal> takes a class object and will load the "
-"state into a newly instantiated instance of that class, in persistent state."
+"The <literal>load()</literal> methods of <literal>Session</literal> provide "
+"a way of retrieving a persistent instance if you know its identifier. "
+"<literal>load()</literal> takes a class object and loads the state into a "
+"newly instantiated instance of that class in a persistent state."
 msgstr ""
 "如果你知道某个实例的持久化标识(identifier),你就可以使用<literal>Session</"
 "literal>的<literal>load()</literal>方法 来获取它。 <literal>load()</literal>"
@@ -330,16 +330,16 @@
 
 #. Tag: para
 #: session_api.xml:192
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>load()</literal> will throw an unrecoverable exception if "
-"there is no matching database row. If the class is mapped with a proxy, "
-"<literal>load()</literal> just returns an uninitialized proxy and does not "
-"actually hit the database until you invoke a method of the proxy. This "
-"behaviour is very useful if you wish to create an association to an object "
-"without actually loading it from the database. It also allows multiple "
-"instances to be loaded as a batch if <literal>batch-size</literal> is "
-"defined for the class mapping."
+"Be aware that <literal>load()</literal> will throw an unrecoverable "
+"exception if there is no matching database row. If the class is mapped with "
+"a proxy, <literal>load()</literal> just returns an uninitialized proxy and "
+"does not actually hit the database until you invoke a method of the proxy. "
+"This is useful if you wish to create an association to an object without "
+"actually loading it from the database. It also allows multiple instances to "
+"be loaded as a batch if <literal>batch-size</literal> is defined for the "
+"class mapping."
 msgstr ""
 "请注意如果没有匹配的数据库记录,<literal>load()</literal>方法可能抛出无法恢复"
 "的异常(unrecoverable exception)。 如果类的映射使用了代理(proxy),"
@@ -352,10 +352,10 @@
 
 #. Tag: para
 #: session_api.xml:203
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
-"<literal>get()</literal> method, which hits the database immediately and "
+"<literal>get()</literal> method which hits the database immediately and "
 "returns null if there is no matching row."
 msgstr ""
 "如果你不确定是否有匹配的行存在,应该使用<literal>get()</literal>方法,它会立"
@@ -375,9 +375,9 @@
 
 #. Tag: para
 #: session_api.xml:211
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
+"You can even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
 "literal>, using a <literal>LockMode</literal>. See the API documentation for "
 "more information."
 msgstr ""
@@ -392,12 +392,12 @@
 
 #. Tag: para
 #: session_api.xml:218
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that any associated instances or contained collections are "
-"<emphasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you "
-"decide to specify <literal>lock</literal> or <literal>all</literal> as a "
-"cascade style for the association."
+"Any associated instances or contained collections will <emphasis>not</"
+"emphasis> be selected <literal>FOR UPDATE</literal>, unless you decide to "
+"specify <literal>lock</literal> or <literal>all</literal> as a cascade style "
+"for the association."
 msgstr ""
 "注意,任何关联的对象或者包含的集合都<emphasis>不会</emphasis>被以"
 "<literal>FOR UPDATE</literal>方式返回, 除非你指定了<literal>lock</literal>或"
@@ -425,12 +425,12 @@
 
 #. Tag: para
 #: session_api.xml:233
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"An important question usually appears at this point: How much does Hibernate "
-"load from the database and how many SQL <literal>SELECT</literal>s will it "
-"use? This depends on the <emphasis>fetching strategy</emphasis> and is "
-"explained in <xref linkend=\"performance-fetching\"/>."
+"How much does Hibernate load from the database and how many SQL "
+"<literal>SELECT</literal>s will it use? This depends on the "
+"<emphasis>fetching strategy</emphasis>. This is explained in <xref linkend="
+"\"performance-fetching\"/>."
 msgstr ""
 "此处通常会出现一个重要问题: Hibernate会从数据库中装载多少东西?会执行多少条相"
 "应的SQL<literal>SELECT</literal>语句? 这取决于<emphasis>抓取策略(fetching "
@@ -444,12 +444,12 @@
 
 #. Tag: para
 #: session_api.xml:245
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you don't know the identifiers of the objects you are looking for, you "
+"If you do not know the identifiers of the objects you are looking for, you "
 "need a query. Hibernate supports an easy-to-use but powerful object oriented "
 "query language (HQL). For programmatic query creation, Hibernate supports a "
-"sophisticated Criteria and Example query feature (QBC and QBE). You may also "
+"sophisticated Criteria and Example query feature (QBC and QBE). You can also "
 "express your query in the native SQL of your database, with optional support "
 "from Hibernate for result set conversion into objects."
 msgstr ""
@@ -512,16 +512,16 @@
 
 #. Tag: para
 #: session_api.xml:266
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A query is usually executed by invoking <literal>list()</literal>, the "
+"A query is usually executed by invoking <literal>list()</literal>. The "
 "result of the query will be loaded completely into a collection in memory. "
-"Entity instances retrieved by a query are in persistent state. The "
+"Entity instances retrieved by a query are in a persistent state. The "
 "<literal>uniqueResult()</literal> method offers a shortcut if you know your "
-"query will only return a single object. Note that queries that make use of "
-"eager fetching of collections usually return duplicates of the root objects "
-"(but with their collections initialized). You can filter these duplicates "
-"simply through a <literal>Set</literal>."
+"query will only return a single object. Queries that make use of eager "
+"fetching of collections usually return duplicates of the root objects, but "
+"with their collections initialized. You can filter these duplicates through "
+"a <literal>Set</literal>."
 msgstr ""
 "一个查询通常在调用<literal>list()</literal>时被执行,执行结果会完全装载进内存"
 "中的一个集合(collection)。 查询返回的对象处于持久(persistent)状态。如果你知道"
@@ -537,13 +537,13 @@
 
 #. Tag: para
 #: session_api.xml:280
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
-"the query using the <literal>iterate()</literal> method. This will only "
-"usually be the case if you expect that the actual entity instances returned "
-"by the query will already be in the session or second-level cache. If they "
-"are not already cached, <literal>iterate()</literal> will be slower than "
+"the query using the <literal>iterate()</literal> method. This will usually "
+"be the case if you expect that the actual entity instances returned by the "
+"query will already be in the session or second-level cache. If they are not "
+"already cached, <literal>iterate()</literal> will be slower than "
 "<literal>list()</literal> and might require many database hits for a simple "
 "query, usually <emphasis>1</emphasis> for the initial select which only "
 "returns identifiers, and <emphasis>n</emphasis> additional selects to "
@@ -583,10 +583,10 @@
 
 #. Tag: para
 #: session_api.xml:298
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate queries sometimes return tuples of objects, in which case each "
-"tuple is returned as an array:"
+"Hibernate queries sometimes return tuples of objects. Each tuple is returned "
+"as an array:"
 msgstr ""
 "(译注:元组(tuples)指一条结果行包含多个对象) Hibernate查询有时返回元组"
 "(tuples),每个元组(tuples)以数组的形式返回:"
@@ -617,11 +617,11 @@
 
 #. Tag: para
 #: session_api.xml:310
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Queries may specify a property of a class in the <literal>select</literal> "
-"clause. They may even call SQL aggregate functions. Properties or aggregates "
-"are considered \"scalar\" results (and not entities in persistent state)."
+"Queries can specify a property of a class in the <literal>select</literal> "
+"clause. They can even call SQL aggregate functions. Properties or aggregates "
+"are considered \"scalar\" results and not entities in persistent state."
 msgstr ""
 "查询可在<literal>select</literal>从句中指定类的属性,甚至可以调用SQL统计"
 "(aggregate)函数。 属性或统计结果被认定为\"标量(Scalar)\"的结果(而不是持久"
@@ -655,13 +655,13 @@
 
 #. Tag: para
 #: session_api.xml:323
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
 "parameters or JDBC-style <literal>?</literal> parameters. <emphasis>Contrary "
 "to JDBC, Hibernate numbers parameters from zero.</emphasis> Named parameters "
 "are identifiers of the form <literal>:name</literal> in the query string. "
-"The advantages of named parameters are:"
+"The advantages of named parameters are as follows:"
 msgstr ""
 "接口<literal>Query</literal>提供了对命名参数(named parameters)、JDBC风格的"
 "<literal>问号(?)</literal>参数进行绑定的方法。 <emphasis>不同于JDBC,"
@@ -678,8 +678,8 @@
 
 #. Tag: para
 #: session_api.xml:339
-#, no-c-format
-msgid "they may occur multiple times in the same query"
+#, fuzzy, no-c-format
+msgid "they can occur multiple times in the same query"
 msgstr "它们可在同一查询串中多次出现"
 
 #. Tag: para
@@ -731,11 +731,11 @@
 
 #. Tag: para
 #: session_api.xml:361
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you need to specify bounds upon your result set (the maximum number of "
-"rows you want to retrieve and / or the first row you want to retrieve) you "
-"should use methods of the <literal>Query</literal> interface:"
+"If you need to specify bounds upon your result set, that is, the maximum "
+"number of rows you want to retrieve and/or the first row you want to "
+"retrieve, you can use methods of the <literal>Query</literal> interface:"
 msgstr ""
 "如果你需要指定结果集的范围(希望返回的最大行数/或开始的行数),应该使用"
 "<literal>Query</literal>接口提供的方法:"
@@ -768,12 +768,12 @@
 
 #. Tag: para
 #: session_api.xml:379
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
-"<literal>Query</literal> interface may be used to obtain a "
-"<literal>ScrollableResults</literal> object, which allows flexible "
-"navigation of the query results."
+"<literal>Query</literal> interface can be used to obtain a "
+"<literal>ScrollableResults</literal> object that allows flexible navigation "
+"of the query results."
 msgstr ""
 "如果你的JDBC驱动支持可滚动的<literal>ResuleSet</literal>,<literal>Query</"
 "literal>接口可以使用<literal>ScrollableResults</literal>,允许你在查询结果中"
@@ -811,10 +811,10 @@
 
 #. Tag: para
 #: session_api.xml:388
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that an open database connection (and cursor) is required for this "
-"functionality, use <literal>setMaxResult()</literal>/<literal>setFirstResult"
+"Note that an open database connection and cursor is required for this "
+"functionality. Use <literal>setMaxResult()</literal>/<literal>setFirstResult"
 "()</literal> if you need offline pagination functionality."
 msgstr ""
 "请注意,使用此功能需要保持数据库连接(以及游标(cursor))处于一直打开状态。 如"
@@ -829,11 +829,11 @@
 
 #. Tag: para
 #: session_api.xml:399
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may also define named queries in the mapping document. (Remember to use "
-"a <literal>CDATA</literal> section if your query contains characters that "
-"could be interpreted as markup.)"
+"You can also define named queries in the mapping document. Remember to use a "
+"<literal>CDATA</literal> section if your query contains characters that "
+"could be interpreted as markup."
 msgstr ""
 "你可以在映射文件中定义命名查询(named queries)。 (如果你的查询串中包含可能被"
 "解释为XML标记(markup)的字符,别忘了用<literal>CDATA</literal>包裹起来。)"
@@ -867,11 +867,11 @@
 
 #. Tag: para
 #: session_api.xml:413
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that the actual program code is independent of the query language that "
-"is used, you may also define native SQL queries in metadata, or migrate "
-"existing queries to Hibernate by placing them in mapping files."
+"The actual program code is independent of the query language that is used. "
+"You can also define native SQL queries in metadata, or migrate existing "
+"queries to Hibernate by placing them in mapping files."
 msgstr ""
 "请注意实际的程序代码与所用的查询语言无关,你也可在元数据中定义原生SQL(native "
 "SQL)查询, 或将原有的其他的查询语句放在配置文件中,这样就可以让Hibernate统一"
@@ -879,13 +879,13 @@
 
 #. Tag: para
 #: session_api.xml:419
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
 "mapping&gt;</literal> element requires a global unique name for the query, "
 "while a query declaration inside a <literal>&lt;class&gt;</literal> element "
 "is made unique automatically by prepending the fully qualified name of the "
-"class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
+"class. For example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 "也请注意在<literal>&lt;hibernate-mapping&gt;</literal>元素中声明的查询必须有"
 "一个全局唯一的名字,而在<literal>&lt;class&gt;</literal>元素中声明的查询自动具"
@@ -900,10 +900,10 @@
 
 #. Tag: para
 #: session_api.xml:433
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A collection <emphasis>filter</emphasis> is a special type of query that may "
-"be applied to a persistent collection or array. The query string may refer "
+"A collection <emphasis>filter</emphasis> is a special type of query that can "
+"be applied to a persistent collection or array. The query string can refer "
 "to <literal>this</literal>, meaning the current collection element."
 msgstr ""
 "集合<emphasis>过滤器(filter)</emphasis>是一种用于一个持久化集合或者数组的特殊"
@@ -924,11 +924,11 @@
 
 #. Tag: para
 #: session_api.xml:441
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The returned collection is considered a bag, and it's a copy of the given "
-"collection. The original collection is not modified (this is contrary to the "
-"implication of the name \"filter\", but consistent with expected behavior)."
+"The returned collection is considered a bag that is a copy of the given "
+"collection. The original collection is not modified. This is contrary to the "
+"implication of the name \"filter\", but consistent with expected behavior."
 msgstr ""
 "返回的集合可以被认为是一个包(bag, 无顺序可重复的集合(collection)),它是所给集"
 "合的副本。 原来的集合不会被改动(这与“过滤器(filter)”的隐含的含义不符,不过与"
@@ -936,11 +936,11 @@
 
 #. Tag: para
 #: session_api.xml:447
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Observe that filters do not require a <literal>from</literal> clause (though "
-"they may have one if required). Filters are not limited to returning the "
-"collection elements themselves."
+"Observe that filters do not require a <literal>from</literal> clause, "
+"although they can have one if required. Filters are not limited to returning "
+"the collection elements themselves."
 msgstr ""
 "请注意过滤器(filter)并不需要<literal>from</literal>子句(当然需要的话它们也可"
 "以加上)。过滤器(filter)不限定于只能返回集合元素本身。"
@@ -957,10 +957,10 @@
 
 #. Tag: para
 #: session_api.xml:454
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Even an empty filter query is useful, e.g. to load a subset of elements in a "
-"huge collection:"
+"large collection:"
 msgstr ""
 "即使无条件的过滤器(filter)也是有意义的。例如,用于加载一个大集合的子集:"
 
@@ -982,10 +982,10 @@
 
 #. Tag: para
 #: session_api.xml:466
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"HQL is extremely powerful but some developers prefer to build queries "
-"dynamically, using an object-oriented API, rather than building query "
+"HQL is extremely powerful, but some developers prefer to build queries "
+"dynamically using an object-oriented API, rather than building query "
 "strings. Hibernate provides an intuitive <literal>Criteria</literal> query "
 "API for these cases:"
 msgstr ""
@@ -1022,13 +1022,13 @@
 
 #. Tag: para
 #: session_api.xml:484
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You may express a query in SQL, using <literal>createSQLQuery()</literal> "
-"and let Hibernate take care of the mapping from result sets to objects. Note "
-"that you may at any time call <literal>session.connection()</literal> and "
-"use the JDBC <literal>Connection</literal> directly. If you chose to use the "
-"Hibernate API, you must enclose SQL aliases in braces:"
+"You can express a query in SQL, using <literal>createSQLQuery()</literal> "
+"and let Hibernate manage the mapping from result sets to objects. You can at "
+"any time call <literal>session.connection()</literal> and use the JDBC "
+"<literal>Connection</literal> directly. If you choose to use the Hibernate "
+"API, you must enclose SQL aliases in braces:"
 msgstr ""
 "你可以使用<literal>createSQLQuery()</literal>方法,用SQL来描述查询,并由"
 "Hibernate将结果集转换成对象。 请注意,你可以在任何时候调用<literal>session."
@@ -1060,9 +1060,9 @@
 
 #. Tag: para
 #: session_api.xml:496
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"SQL queries may contain named and positional parameters, just like Hibernate "
+"SQL queries can contain named and positional parameters, just like Hibernate "
 "queries. More information about native SQL queries in Hibernate can be found "
 "in <xref linkend=\"querysql\"/>."
 msgstr ""
@@ -1077,17 +1077,17 @@
 
 #. Tag: para
 #: session_api.xml:509
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
-"saved, created or queried by the <literal>Session</literal>) may be "
-"manipulated by the application and any changes to persistent state will be "
+"<emphasis>Transactional persistent instances</emphasis> (i.e. objects "
+"loaded, saved, created or queried by the <literal>Session</literal>) can be "
+"manipulated by the application, and any changes to persistent state will be "
 "persisted when the <literal>Session</literal> is <emphasis>flushed</"
-"emphasis> (discussed later in this chapter). There is no need to call a "
-"particular method (like <literal>update()</literal>, which has a different "
-"purpose) to make your modifications persistent. So the most straightforward "
-"way to update the state of an object is to <literal>load()</literal> it, and "
-"then manipulate it directly, while the <literal>Session</literal> is open:"
+"emphasis>. This is discussed later in this chapter. There is no need to call "
+"a particular method (like <literal>update()</literal>, which has a different "
+"purpose) to make your modifications persistent. The most straightforward way "
+"to update the state of an object is to <literal>load()</literal> it and then "
+"manipulate it directly while the <literal>Session</literal> is open:"
 msgstr ""
 "<emphasis>事务中的持久实例</emphasis>(就是通过<literal>session</literal>装"
 "载、保存、创建或者查询出的对象) 被应用程序操作所造成的任何修改都会在"
@@ -1109,31 +1109,30 @@
 
 #. Tag: para
 #: session_api.xml:522
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes this programming model is inefficient since it would require both "
-"an SQL <literal>SELECT</literal> (to load an object) and an SQL "
-"<literal>UPDATE</literal> (to persist its updated state) in the same "
-"session. Therefore Hibernate offers an alternate approach, using detached "
-"instances."
+"Sometimes this programming model is inefficient, as it requires in the same "
+"session both an SQL <literal>SELECT</literal> to load an object and an SQL "
+"<literal>UPDATE</literal> to persist its updated state. Hibernate offers an "
+"alternate approach by using detached instances."
 msgstr ""
 "有时这种程序模型效率低下,因为它在同一Session里需要一条SQL <literal>SELECT</"
 "literal>语句(用于加载对象) 以及一条SQL <literal>UPDATE</literal>语句(持久化"
 "更新的状态)。 为此Hibernate提供了另一种途径,使用脱管(detached)实例。"
 
-#. Tag: emphasis
-#: session_api.xml:530
+#. Tag: para
+#: session_api.xml:529
 #, fuzzy, no-c-format
 msgid ""
-"Note that Hibernate does not offer its own API for direct execution of "
+"Hibernate does not offer its own API for direct execution of "
 "<literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibernate "
-"is a <emphasis>state management</emphasis> service, you don't have to think "
+"is a <emphasis>state management</emphasis> service, you do not have to think "
 "in <emphasis>statements</emphasis> to use it. JDBC is a perfect API for "
 "executing SQL statements, you can get a JDBC <literal>Connection</literal> "
 "at any time by calling <literal>session.connection()</literal>. Furthermore, "
 "the notion of mass operations conflicts with object/relational mapping for "
 "online transaction processing-oriented applications. Future versions of "
-"Hibernate may however provide special mass operation functions. See <xref "
+"Hibernate can, however, provide special mass operation functions. See <xref "
 "linkend=\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 "请注意Hibernate本身不提供直接执行<placeholder-1/>或<placeholder-2/>语句的"
@@ -1145,13 +1144,13 @@
 ">,寻找一些可用的批量(batch)操作技巧。"
 
 #. Tag: title
-#: session_api.xml:545
+#: session_api.xml:546
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "修改脱管(Detached)对象"
 
 #. Tag: para
-#: session_api.xml:547
+#: session_api.xml:548
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1165,7 +1164,7 @@
 "的数据来保证这些“长“工作单元之间的隔离。"
 
 #. Tag: para
-#: session_api.xml:554
+#: session_api.xml:555
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1176,7 +1175,7 @@
 "()</literal> 重新关联脱管实例的办法来支持这种模型。"
 
 #. Tag: programlisting
-#: session_api.xml:560
+#: session_api.xml:561
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1193,7 +1192,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:562
+#: session_api.xml:563
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1205,16 +1204,16 @@
 "(reattach)的时候会抛出一个异常。"
 
 #. Tag: para
-#: session_api.xml:568
-#, no-c-format
+#: session_api.xml:569
+#, fuzzy, no-c-format
 msgid ""
-"Use <literal>update()</literal> if you are sure that the session does not "
-"contain an already persistent instance with the same identifier, and "
+"Use <literal>update()</literal> if you are certain that the session does not "
+"contain an already persistent instance with the same identifier. Use "
 "<literal>merge()</literal> if you want to merge your modifications at any "
 "time without consideration of the state of the session. In other words, "
 "<literal>update()</literal> is usually the first method you would call in a "
-"fresh session, ensuring that reattachment of your detached instances is the "
-"first operation that is executed."
+"fresh session, ensuring that the reattachment of your detached instances is "
+"the first operation that is executed."
 msgstr ""
 "如果你确定当前session没有包含与之具有相同持久化标识的持久实例,使用"
 "<literal>update()</literal>。 如果想随时合并你的的改动而不考虑session的状态,"
@@ -1223,14 +1222,14 @@
 "先被执行。"
 
 #. Tag: para
-#: session_api.xml:577
-#, no-c-format
+#: session_api.xml:578
+#, fuzzy, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
-"instances reachable from the given detached instance if and <emphasis>only</"
-"emphasis> if it wants their state also updated. This can be automated of "
-"course, using <emphasis>transitive persistence</emphasis>, see <xref linkend="
-"\"objectstate-transitive\"/>."
+"instances that are reachable from the given detached instance "
+"<emphasis>only</emphasis> if it wants their state to be updated. This can be "
+"automated using <emphasis>transitive persistence</emphasis>. See <xref "
+"linkend=\"objectstate-transitive\"/> for more information."
 msgstr ""
 "如果希望相关联的脱管对象(通过引用“可到达”的脱管对象)的数据也要更新到数据库"
 "时(并且也<emphasis>仅仅</emphasis>在这种情况), 可以对该相关联的脱管对象单"
@@ -1239,18 +1238,18 @@
 "\"objectstate-transitive\"/>。"
 
 #. Tag: para
-#: session_api.xml:584
-#, no-c-format
+#: session_api.xml:585
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
 "reassociate an object with a new session. However, the detached instance has "
-"to be unmodified!"
+"to be unmodified."
 msgstr ""
 "<literal>lock()</literal>方法也允许程序重新关联某个对象到一个新session上。不"
 "过,该脱管(detached)的对象必须是没有修改过的!"
 
 #. Tag: programlisting
-#: session_api.xml:589
+#: session_api.xml:590
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1262,11 +1261,11 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:591
-#, no-c-format
+#: session_api.xml:592
+#, fuzzy, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
-"<literal>LockMode</literal>s, see the API documentation and the chapter on "
+"<literal>LockMode</literal>s. See the API documentation and the chapter on "
 "transaction handling for more information. Reattachment is not the only "
 "usecase for <literal>lock()</literal>."
 msgstr ""
@@ -1275,7 +1274,7 @@
 "<literal>lock()</literal>的唯一用途。"
 
 #. Tag: para
-#: session_api.xml:598
+#: session_api.xml:599
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1285,13 +1284,13 @@
 "讨论。"
 
 #. Tag: title
-#: session_api.xml:605
+#: session_api.xml:606
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "自动状态检测"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:608
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1304,7 +1303,7 @@
 "<literal>saveOrUpdate()</literal>方法实现了这个功能。"
 
 #. Tag: programlisting
-#: session_api.xml:614
+#: session_api.xml:615
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1322,7 +1321,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:616
+#: session_api.xml:617
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1338,7 +1337,7 @@
 "<literal>merge()</literal>。有些程序从来不用这些方法。"
 
 #. Tag: para
-#: session_api.xml:624
+#: session_api.xml:625
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1348,31 +1347,31 @@
 "literal>:"
 
 #. Tag: para
-#: session_api.xml:631
+#: session_api.xml:632
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "程序在第一个session中加载对象"
 
 #. Tag: para
-#: session_api.xml:636
+#: session_api.xml:637
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "该对象被传递到表现层"
 
 #. Tag: para
-#: session_api.xml:641
+#: session_api.xml:642
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "对象发生了一些改动"
 
 #. Tag: para
-#: session_api.xml:646
+#: session_api.xml:647
 #, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr "该对象被返回到业务逻辑层"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:652
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1380,19 +1379,19 @@
 msgstr "程序调用第二个session的<literal>update()</literal>方法持久这些改动"
 
 #. Tag: para
-#: session_api.xml:658
+#: session_api.xml:659
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal>做下面的事:"
 
 #. Tag: para
-#: session_api.xml:664
+#: session_api.xml:665
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr "如果对象已经在本session中持久化了,不做任何事"
 
 #. Tag: para
-#: session_api.xml:669
+#: session_api.xml:670
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1401,14 +1400,14 @@
 "如果另一个与本session关联的对象拥有相同的持久化标识(identifier),抛出一个异常"
 
 #. Tag: para
-#: session_api.xml:675
+#: session_api.xml:676
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
 "如果对象没有持久化标识(identifier)属性,对其调用<literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:680
+#: session_api.xml:681
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1418,11 +1417,11 @@
 "<literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:686
-#, no-c-format
+#: session_api.xml:687
+#, fuzzy, no-c-format
 msgid ""
-"if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
-"<literal>&lt;timestamp&gt;</literal>), and the version property value is the "
+"if the object is versioned by a <literal>&lt;version&gt;</literal> or "
+"<literal>&lt;timestamp&gt;</literal>, and the version property value is the "
 "same value assigned to a newly instantiated object, <literal>save()</"
 "literal> it"
 msgstr ""
@@ -1431,19 +1430,19 @@
 "对象,<literal>save()</literal>它。"
 
 #. Tag: para
-#: session_api.xml:694
+#: session_api.xml:695
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr "否则<literal>update()</literal> 这个对象"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:701
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "<literal>merge()</literal>可非常不同:"
 
 #. Tag: para
-#: session_api.xml:706
+#: session_api.xml:707
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1454,7 +1453,7 @@
 "旧有的持久实例"
 
 #. Tag: para
-#: session_api.xml:713
+#: session_api.xml:714
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1463,13 +1462,13 @@
 "如果session没有相应的持久实例,则尝试从数据库中加载,或创建新的持久化实例"
 
 #. Tag: para
-#: session_api.xml:719
+#: session_api.xml:720
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "最后返回该持久实例"
 
 #. Tag: para
-#: session_api.xml:724
+#: session_api.xml:725
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1477,54 +1476,54 @@
 msgstr "用户给出的这个对象没有被关联到session上,它依旧是脱管的"
 
 #. Tag: title
-#: session_api.xml:734
+#: session_api.xml:735
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "删除持久对象"
 
 #. Tag: para
-#: session_api.xml:736
-#, no-c-format
+#: session_api.xml:737
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
-"database. Of course, your application might still hold a reference to a "
-"deleted object. It's best to think of <literal>delete()</literal> as making "
-"a persistent instance transient."
+"database. Your application, however, can still hold a reference to a deleted "
+"object. It is best to think of <literal>delete()</literal> as making a "
+"persistent instance, transient."
 msgstr ""
 "使用<literal>Session.delete()</literal>会把对象的状态从数据库中移除。 当然,"
 "你的应用程序可能仍然持有一个指向已删除对象的引用。所以,最好这样理解:"
 "<literal>delete()</literal>的用途是把一个持久实例变成瞬时(transient)实例。"
 
 #. Tag: programlisting
-#: session_api.xml:743
+#: session_api.xml:744
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:745
-#, no-c-format
+#: session_api.xml:746
+#, fuzzy, no-c-format
 msgid ""
-"You may delete objects in any order you like, without risk of foreign key "
-"constraint violations. It is still possible to violate a <literal>NOT NULL</"
-"literal> constraint on a foreign key column by deleting objects in the wrong "
-"order, e.g. if you delete the parent, but forget to delete the children."
+"You can delete objects in any order, without risk of foreign key constraint "
+"violations. It is still possible to violate a <literal>NOT NULL</literal> "
+"constraint on a foreign key column by deleting objects in the wrong order, e."
+"g. if you delete the parent, but forget to delete the children."
 msgstr ""
 "你可以用你喜欢的任何顺序删除对象,不用担心外键约束冲突。当然,如果你搞错了顺"
 "序,还是有可能引发在外键字段定义的<literal>NOT NULL</literal>约束冲突。 例如"
 "你删除了父对象,但是忘记删除孩子们。"
 
 #. Tag: title
-#: session_api.xml:756
+#: session_api.xml:757
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "在两个不同数据库间复制对象"
 
 #. Tag: para
-#: session_api.xml:758
-#, no-c-format
+#: session_api.xml:759
+#, fuzzy, no-c-format
 msgid ""
-"It is occasionally useful to be able to take a graph of persistent instances "
+"It is sometimes useful to be able to take a graph of persistent instances "
 "and make them persistent in a different datastore, without regenerating "
 "identifier values."
 msgstr ""
@@ -1532,7 +1531,7 @@
 "不同的数据库中的操作。"
 
 #. Tag: programlisting
-#: session_api.xml:764
+#: session_api.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1551,44 +1550,44 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:766
-#, no-c-format
+#: session_api.xml:767
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
-"literal> will deal with conflicts with existing rows in the database."
+"literal> will deal with conflicts with existing rows in the database:"
 msgstr ""
 "<literal>ReplicationMode</literal>决定在和数据库中已存在记录由冲突时,"
 "<literal>replicate()</literal>如何处理。"
 
 #. Tag: para
-#: session_api.xml:773
-#, no-c-format
+#: session_api.xml:774
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
+"<literal>ReplicationMode.IGNORE</literal>: ignores the object when there is "
 "an existing database row with the same identifier"
 msgstr "<literal>ReplicationMode.IGNORE</literal> - 忽略它"
 
 #. Tag: para
-#: session_api.xml:779
-#, no-c-format
+#: session_api.xml:780
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
+"<literal>ReplicationMode.OVERWRITE</literal>: overwrites any existing "
 "database row with the same identifier"
 msgstr "<literal>ReplicationMode.OVERWRITE</literal> - 覆盖相同的行"
 
 #. Tag: para
-#: session_api.xml:785
-#, no-c-format
+#: session_api.xml:786
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
+"<literal>ReplicationMode.EXCEPTION</literal>: throws an exception if there "
 "is an existing database row with the same identifier"
 msgstr "<literal>ReplicationMode.EXCEPTION</literal> - 抛出异常"
 
 #. Tag: para
-#: session_api.xml:791
-#, no-c-format
+#: session_api.xml:792
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
+"<literal>ReplicationMode.LATEST_VERSION</literal>: overwrites the row if its "
 "version number is earlier than the version number of the object, or ignore "
 "the object otherwise"
 msgstr ""
@@ -1596,7 +1595,7 @@
 "盖,否则忽略"
 
 #. Tag: para
-#: session_api.xml:799
+#: session_api.xml:800
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1609,112 +1608,111 @@
 "Consistent,Isolated and Durable的缩写)"
 
 #. Tag: title
-#: session_api.xml:808
+#: session_api.xml:809
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Session刷出(flush)"
 
 #. Tag: para
-#: session_api.xml:810
-#, no-c-format
+#: session_api.xml:811
+#, fuzzy, no-c-format
 msgid ""
-"From time to time the <literal>Session</literal> will execute the SQL "
-"statements needed to synchronize the JDBC connection's state with the state "
-"of objects held in memory. This process, <emphasis>flush</emphasis>, occurs "
-"by default at the following points"
+"Sometimes the <literal>Session</literal> will execute the SQL statements "
+"needed to synchronize the JDBC connection's state with the state of objects "
+"held in memory. This process, called <emphasis>flush</emphasis>, occurs by "
+"default at the following points:"
 msgstr ""
 "每间隔一段时间,<literal>Session</literal>会执行一些必需的SQL语句来把内存中的"
 "对象的状态同步到JDBC连接中。这个过程被称为<emphasis>刷出(flush)</emphasis>,"
 "默认会在下面的时间点执行:"
 
 #. Tag: para
-#: session_api.xml:819
+#: session_api.xml:820
 #, no-c-format
 msgid "before some query executions"
 msgstr "在某些查询执行之前"
 
 #. Tag: para
-#: session_api.xml:824
+#: session_api.xml:825
 #, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr "在调用<literal>org.hibernate.Transaction.commit()</literal>的时候"
 
 #. Tag: para
-#: session_api.xml:829
+#: session_api.xml:830
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "在调用<literal>Session.flush()</literal>的时候"
 
 #. Tag: para
-#: session_api.xml:835
-#, no-c-format
-msgid "The SQL statements are issued in the following order"
+#: session_api.xml:836
+#, fuzzy, no-c-format
+msgid "The SQL statements are issued in the following order:"
 msgstr "涉及的SQL语句会按照下面的顺序发出执行:"
 
 #. Tag: para
-#: session_api.xml:841
-#, no-c-format
+#: session_api.xml:842
+#, fuzzy, no-c-format
 msgid ""
-"all entity insertions, in the same order the corresponding objects were "
-"saved using <literal>Session.save()</literal>"
+"all entity insertions in the same order the corresponding objects were saved "
+"using <literal>Session.save()</literal>"
 msgstr ""
 "所有对实体进行插入的语句,其顺序按照对象执行<literal>Session.save()</literal>"
 "的时间顺序"
 
 #. Tag: para
-#: session_api.xml:847
+#: session_api.xml:848
 #, no-c-format
 msgid "all entity updates"
 msgstr "所有对实体进行更新的语句"
 
 #. Tag: para
-#: session_api.xml:852
+#: session_api.xml:853
 #, no-c-format
 msgid "all collection deletions"
 msgstr "所有进行集合删除的语句"
 
 #. Tag: para
-#: session_api.xml:857
+#: session_api.xml:858
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "所有对集合元素进行删除,更新或者插入的语句"
 
 #. Tag: para
-#: session_api.xml:862
+#: session_api.xml:863
 #, no-c-format
 msgid "all collection insertions"
 msgstr "所有进行集合插入的语句"
 
 #. Tag: para
-#: session_api.xml:867
-#, no-c-format
+#: session_api.xml:868
+#, fuzzy, no-c-format
 msgid ""
-"all entity deletions, in the same order the corresponding objects were "
+"all entity deletions in the same order the corresponding objects were "
 "deleted using <literal>Session.delete()</literal>"
 msgstr ""
 "所有对实体进行删除的语句,其顺序按照对象执行<literal>Session.delete()</"
 "literal>的时间顺序"
 
 #. Tag: para
-#: session_api.xml:874
-#, no-c-format
+#: session_api.xml:875
+#, fuzzy, no-c-format
 msgid ""
-"(An exception is that objects using <literal>native</literal> ID generation "
-"are inserted when they are saved.)"
+"An exception is that objects using <literal>native</literal> ID generation "
+"are inserted when they are saved."
 msgstr ""
 "(有一个例外是,如果对象使用<literal>native</literal>方式来生成ID(持久化标"
 "识)的话,它们一执行save就会被插入。)"
 
 #. Tag: para
-#: session_api.xml:879
-#, no-c-format
+#: session_api.xml:880
+#, fuzzy, no-c-format
 msgid ""
-"Except when you explicity <literal>flush()</literal>, there are absolutely "
+"Except when you explicitly <literal>flush()</literal>, there are absolutely "
 "no guarantees about <emphasis>when</emphasis> the <literal>Session</literal> "
 "executes the JDBC calls, only the <emphasis>order</emphasis> in which they "
 "are executed. However, Hibernate does guarantee that the <literal>Query.list"
-"(..)</literal> will never return stale data; nor will they return the wrong "
-"data."
+"(..)</literal> will never return stale or incorrect data."
 msgstr ""
 "除非你明确地发出了<literal>flush()</literal>指令,关于Session<emphasis>何时</"
 "emphasis>会执行这些JDBC调用是完全无法保证的,只能保证它们执行的前后顺序。 当"
@@ -1722,17 +1720,17 @@
 "据,也不会返回错误数据。"
 
 #. Tag: para
-#: session_api.xml:887
-#, no-c-format
+#: session_api.xml:888
+#, fuzzy, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
 "frequently. The <literal>FlushMode</literal> class defines three different "
-"modes: only flush at commit time (and only when the Hibernate "
-"<literal>Transaction</literal> API is used), flush automatically using the "
-"explained routine, or never flush unless <literal>flush()</literal> is "
-"called explicitly. The last mode is useful for long running units of work, "
-"where a <literal>Session</literal> is kept open and disconnected for a long "
-"time (see <xref linkend=\"transactions-optimistic-longsession\"/>)."
+"modes: only flush at commit time when the Hibernate <literal>Transaction</"
+"literal> API is used, flush automatically using the explained routine, or "
+"never flush unless <literal>flush()</literal> is called explicitly. The last "
+"mode is useful for long running units of work, where a <literal>Session</"
+"literal> is kept open and disconnected for a long time (see <xref linkend="
+"\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 "也可以改变默认的设置,来让刷出(flush)操作发生的不那么频繁。 "
 "<literal>FlushMode</literal>类定义了三种不同的方式。 仅在提交时刷出(仅当"
@@ -1743,7 +1741,7 @@
 "longsession\"/>)."
 
 #. Tag: programlisting
-#: session_api.xml:897
+#: session_api.xml:898
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1763,7 +1761,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:899
+#: session_api.xml:900
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1776,13 +1774,13 @@
 "论。"
 
 #. Tag: title
-#: session_api.xml:908
+#: session_api.xml:909
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "传播性持久化(transitive persistence)"
 
 #. Tag: para
-#: session_api.xml:910
+#: session_api.xml:911
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1793,17 +1791,17 @@
 "彼此关联的对象的时候。 一个常见的例子是父子关系。考虑下面的例子:"
 
 #. Tag: para
-#: session_api.xml:916
-#, no-c-format
+#: session_api.xml:917
+#, fuzzy, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
 "collection of addresses or strings), their life cycle would depend on the "
 "parent and no further action would be required for convenient \"cascading\" "
 "of state changes. When the parent is saved, the value-typed child objects "
-"are saved as well, when the parent is deleted, the children will be deleted, "
-"etc. This even works for operations such as the removal of a child from the "
-"collection; Hibernate will detect this and, since value-typed objects can't "
-"have shared references, delete the child from the database."
+"are saved and when the parent is deleted, the children will be deleted, etc. "
+"This works for operations such as the removal of a child from the "
+"collection. Since value-typed objects cannot have shared references, "
+"Hibernate will detect this and delete the child from the database."
 msgstr ""
 "如果一个父子关系中的子对象是值类型(value typed)(例如,地址或字符串的集合)"
 "的,他们的生命周期会依赖于父对象,可以享受方便的级联操作(Cascading),不需要额"
@@ -1813,12 +1811,12 @@
 "Hibernate会在数据库中删除这个子对象。"
 
 #. Tag: para
-#: session_api.xml:927
-#, no-c-format
+#: session_api.xml:928
+#, fuzzy, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
 "not value-types (e.g. categories and items, or parent and child cats). "
-"Entities have their own life cycle, support shared references (so removing "
+"Entities have their own life cycle and support shared references. Removing "
 "an entity from the collection does not mean it can be deleted), and there is "
 "by default no cascading of state from one entity to any other associated "
 "entities. Hibernate does not implement <emphasis>persistence by "
@@ -1831,7 +1829,7 @@
 "久化(persistence by reachability)</emphasis>的策略。"
 
 #. Tag: para
-#: session_api.xml:936
+#: session_api.xml:937
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1850,29 +1848,29 @@
 "文件中指出这一点。例如:"
 
 #. Tag: programlisting
-#: session_api.xml:945
+#: session_api.xml:946
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:947
+#: session_api.xml:948
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "级联风格(cascade style)是可组合的:"
 
 #. Tag: programlisting
-#: session_api.xml:951
+#: session_api.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:953
-#, no-c-format
+#: session_api.xml:954
+#, fuzzy, no-c-format
 msgid ""
-"You may even use <literal>cascade=\"all\"</literal> to specify that "
+"You can even use <literal>cascade=\"all\"</literal> to specify that "
 "<emphasis>all</emphasis> operations should be cascaded along the "
 "association. The default <literal>cascade=\"none\"</literal> specifies that "
 "no operations are to be cascaded."
@@ -1882,7 +1880,7 @@
 "literal>,即任何操作都不会被级联(cascaded)。"
 
 #. Tag: para
-#: session_api.xml:959
+#: session_api.xml:960
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -1895,16 +1893,16 @@
 "关联中删除的对象。"
 
 #. Tag: para
-#: session_api.xml:966
+#: session_api.xml:967
 #, no-c-format
 msgid "Recommendations:"
 msgstr "建议:"
 
 #. Tag: para
-#: session_api.xml:972
-#, no-c-format
+#: session_api.xml:973
+#, fuzzy, no-c-format
 msgid ""
-"It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
+"It does not usually make sense to enable cascade on a <literal>&lt;many-to-"
 "one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> association. "
 "Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and "
 "<literal>&lt;one-to-many&gt;</literal> associations."
@@ -1915,7 +1913,7 @@
 "用。"
 
 #. Tag: para
-#: session_api.xml:980
+#: session_api.xml:981
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -1927,7 +1925,7 @@
 "object)</emphasis>。"
 
 #. Tag: para
-#: session_api.xml:987
+#: session_api.xml:988
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -1940,7 +1938,7 @@
 "\"persist,merge,save-update\"</literal>。"
 
 #. Tag: para
-#: session_api.xml:995
+#: session_api.xml:996
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -1953,12 +1951,12 @@
 "父对象进行save/update/delete操作就会导致子对象也进行save/update/delete操作。"
 
 #. Tag: para
-#: session_api.xml:1001
-#, no-c-format
+#: session_api.xml:1002
+#, fuzzy, no-c-format
 msgid ""
-"Futhermore, a mere reference to a child from a persistent parent will result "
-"in save/update of the child. This metaphor is incomplete, however. A child "
-"which becomes unreferenced by its parent is <emphasis>not</emphasis> "
+"Furthermore, a mere reference to a child from a persistent parent will "
+"result in save/update of the child. This metaphor is incomplete, however. A "
+"child which becomes unreferenced by its parent is <emphasis>not</emphasis> "
 "automatically deleted, except in the case of a <literal>&lt;one-to-many&gt;</"
 "literal> association mapped with <literal>cascade=\"delete-orphan\"</"
 "literal>. The precise semantics of cascading operations for a parent/child "
@@ -1971,7 +1969,7 @@
 "对象被自动删除。 父子关系的级联(cascading)操作准确语义如下:"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1013
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -1981,7 +1979,7 @@
 "<literal>persist()</literal>"
 
 #. Tag: para
-#: session_api.xml:1018
+#: session_api.xml:1019
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -1991,7 +1989,7 @@
 "</literal>"
 
 #. Tag: para
-#: session_api.xml:1024
+#: session_api.xml:1025
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2003,7 +2001,7 @@
 "()</literal>"
 
 #. Tag: para
-#: session_api.xml:1030
+#: session_api.xml:1031
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2013,7 +2011,7 @@
 "象将会被<literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1036
+#: session_api.xml:1037
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2021,7 +2019,7 @@
 msgstr "如果父对象被删除,那么所有子对象也会被<literal>delete()</literal>"
 
 #. Tag: para
-#: session_api.xml:1041
+#: session_api.xml:1042
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2035,13 +2033,13 @@
 "式调用delete()删除子对象。"
 
 #. Tag: para
-#: session_api.xml:1050
-#, no-c-format
+#: session_api.xml:1051
+#, fuzzy, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
 "at <emphasis>call time</emphasis> or at <emphasis>flush time</emphasis>. All "
 "operations, if enabled, are cascaded to associated entities reachable when "
-"the operation is executed. However, <literal>save-upate</literal> and "
+"the operation is executed. However, <literal>save-update</literal> and "
 "<literal>delete-orphan</literal> are transitive for all associated entities "
 "reachable during flush of the <literal>Session</literal>."
 msgstr ""
@@ -2052,21 +2050,21 @@
 "flush的时候才作用到所有可触及的被关联对象上的。"
 
 #. Tag: title
-#: session_api.xml:1062
+#: session_api.xml:1063
 #, no-c-format
 msgid "Using metadata"
 msgstr "使用元数据"
 
 #. Tag: para
-#: session_api.xml:1064
-#, no-c-format
+#: session_api.xml:1065
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate requires a very rich meta-level model of all entity and value "
-"types. From time to time, this model is very useful to the application "
-"itself. For example, the application might use Hibernate's metadata to "
-"implement a \"smart\" deep-copy algorithm that understands which objects "
-"should be copied (eg. mutable value types) and which should not (eg. "
-"immutable value types and, possibly, associated entities)."
+"Hibernate requires a rich meta-level model of all entity and value types. "
+"This model can be useful to the application itself. For example, the "
+"application might use Hibernate's metadata to implement a \"smart\" deep-"
+"copy algorithm that understands which objects should be copied (eg. mutable "
+"value types) and which objects that should not (e.g. immutable value types "
+"and, possibly, associated entities)."
 msgstr ""
 "Hibernate中有一个非常丰富的元级别(meta-level)的模型,含有所有的实体和值类型数"
 "据的元数据。 有时这个模型对应用程序本身也会非常有用。 比如说,应用程序可能在"
@@ -2075,12 +2073,12 @@
 "些被关联的实体)。"
 
 #. Tag: para
-#: session_api.xml:1071
-#, no-c-format
+#: session_api.xml:1072
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
 "<literal>CollectionMetadata</literal> interfaces and the <literal>Type</"
-"literal> hierarchy. Instances of the metadata interfaces may be obtained "
+"literal> hierarchy. Instances of the metadata interfaces can be obtained "
 "from the <literal>SessionFactory</literal>."
 msgstr ""
 "Hibernate提供了<literal>ClassMetadata</literal>接口,"
@@ -2088,7 +2086,7 @@
 "访问元数据。 可以通过<literal>SessionFactory</literal>获取元数据接口的实例。"
 
 #. Tag: programlisting
-#: session_api.xml:1078
+#: session_api.xml:1079
 #, no-c-format
 msgid ""
 "<![CDATA[Cat fritz = ......;\n"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/toolset_guide.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/toolset_guide.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/toolset_guide.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,18 +18,18 @@
 
 #. Tag: para
 #: toolset_guide.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
-"plugins, commandline tools, as well as Ant tasks."
+"plugins, commandline tools, and Ant tasks."
 msgstr ""
 "可以通过一系列Eclipse插件、命令行工具和Ant任务来进行与Hibernate关联的转换。"
 
 #. Tag: para
 #: toolset_guide.xml:36
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
+"<emphasis>Hibernate Tools</emphasis> currently include plugins for the "
 "Eclipse IDE as well as Ant tasks for reverse engineering of existing "
 "databases:"
 msgstr ""
@@ -38,12 +38,12 @@
 
 #. Tag: para
 #: toolset_guide.xml:42
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
-"files, supporting auto-completion and syntax highlighting. It also supports "
-"semantic auto-completion for class names and property/field names, making it "
-"much more versatile than a normal XML editor."
+"<emphasis>Mapping Editor:</emphasis> an editor for Hibernate XML mapping "
+"files that supports auto-completion and syntax highlighting. It also "
+"supports semantic auto-completion for class names and property/field names, "
+"making it more versatile than a normal XML editor."
 msgstr ""
 "<emphasis>Mapping Editor:</emphasis> Hibernate XML映射文件的编辑器,支持自动"
 "完成和语法高亮。它也支持对类名和属性/字段名的语义自动完成,比通常的XML编辑器"
@@ -51,13 +51,13 @@
 
 #. Tag: para
 #: toolset_guide.xml:47
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
-"addition to a tree overview of your console configurations, you also get an "
-"interactive view of your persistent classes and their relationships. The "
-"console allows you to execute HQL queries against your database and browse "
-"the result directly in Eclipse."
+"<emphasis>Console:</emphasis> the console is a new view in Eclipse. In "
+"addition to a tree overview of your console configurations, you are also "
+"provided with an interactive view of your persistent classes and their "
+"relationships. The console allows you to execute HQL queries against your "
+"database and browse the result directly in Eclipse."
 msgstr ""
 "<emphasis>Console:</emphasis> Console是Eclipse的一个新视图。除了对你的console"
 "配置的树状概览,你还可以获得对你持久化类及其关联的交互式视图。Console允许你对"
@@ -65,42 +65,35 @@
 
 #. Tag: para
 #: toolset_guide.xml:54
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
-"the Hibernate Eclipse tools; you can use a wizard to quickly generate "
-"Hibernate configuration (cfg.xml) files, or you may even completely reverse "
-"engineer an existing database schema into POJO source files and Hibernate "
-"mapping files. The reverse engineering wizard supports customizable "
-"templates."
+"<emphasis>Development Wizards:</emphasis> several wizards are provided with "
+"the Hibernate Eclipse tools. You can use a wizard to quickly generate "
+"Hibernate configuration (cfg.xml) files, or to reverse engineer an existing "
+"database schema into POJO source files and Hibernate mapping files. The "
+"reverse engineering wizard supports customizable templates."
 msgstr ""
 "<emphasis>Development Wizards:</emphasis> 在Hibernate Eclipse tools中还提供了"
 "几个向导;你可以用向导快速生成Hibernate 配置文件(cfg.xml),你甚至还可以同现"
 "存的数据库schema中反向工程出POJO源代码与Hibernate 映射文件。反向工程支持可定"
 "制的模版。"
 
-#. Tag: emphasis
-#: toolset_guide.xml:62
-#, no-c-format
-msgid "Ant Tasks:"
-msgstr "Ant Tasks:"
-
 #. Tag: para
 #: toolset_guide.xml:67
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
+"Please refer to the <emphasis>Hibernate Tools</emphasis> package "
 "documentation for more information."
 msgstr ""
 "要得到更多信息,请查阅 <emphasis>Hibernate Tools</emphasis> 包及其文档。"
 
 #. Tag: para
 #: toolset_guide.xml:72
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"However, the Hibernate main package comes bundled with an integrated tool "
-"(it can even be used from \"inside\" Hibernate on-the-fly): "
-"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
+"However, the Hibernate main package comes bundled with an integrated tool : "
+"<emphasis>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>.It can even "
+"be used from \"inside\" Hibernate."
 msgstr ""
 "同时,Hibernate主发行包还附带了一个集成的工具(它甚至可以在Hibernate“内部”快"
 "速运行)<emphasis>SchemaExport</emphasis> ,也就是 <literal>hbm2ddl</"
@@ -114,11 +107,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:81
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"DDL may be generated from your mapping files by a Hibernate utility. The "
-"generated schema includes referential integrity constraints (primary and "
-"foreign keys) for entity and collection tables. Tables and sequences are "
+"DDL can be generated from your mapping files by a Hibernate utility. The "
+"generated schema includes referential integrity constraints, primary and "
+"foreign keys, for entity and collection tables. Tables and sequences are "
 "also created for mapped identifier generators."
 msgstr ""
 "可以从你的映射文件使用一个Hibernate工具生成DDL。 生成的schema包含有对实体和集"
@@ -127,11 +120,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:88
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
 "the <literal>hibernate.dialect</literal> property when using this tool, as "
-"DDL is highly vendor specific."
+"DDL is highly vendor-specific."
 msgstr ""
 "在使用这个工具的时候,你<emphasis>必须</emphasis> 通过<literal>hibernate."
 "dialet</literal>属性指定一个SQL<literal>方言(Dialet)</literal>,因为DDL是与供"
@@ -139,8 +132,10 @@
 
 #. Tag: para
 #: toolset_guide.xml:94
-#, no-c-format
-msgid "First, customize your mapping files to improve the generated schema."
+#, fuzzy, no-c-format
+msgid ""
+"First, you must customize your mapping files to improve the generated "
+"schema. The next section covers schema customization."
 msgstr "首先,要定制你的映射文件,来改善生成的schema。"
 
 #. Tag: title
@@ -151,11 +146,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:101
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
 "<literal>length</literal>, <literal>precision</literal> and <literal>scale</"
-"literal>. You may set the length, precision and scale of a column with this "
+"literal>. You can set the length, precision and scale of a column with this "
 "attribute."
 msgstr ""
 "很多Hibernate映射元素定义了可选的<literal>length</literal>、"
@@ -176,12 +171,12 @@
 
 #. Tag: para
 #: toolset_guide.xml:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Some tags also accept a <literal>not-null</literal> attribute (for "
-"generating a <literal>NOT NULL</literal> constraint on table columns) and a "
-"<literal>unique</literal> attribute (for generating <literal>UNIQUE</"
-"literal> constraint on table columns)."
+"Some tags also accept a <literal>not-null</literal> attribute for generating "
+"a <literal>NOT NULL</literal> constraint on table columns, and a "
+"<literal>unique</literal> attribute for generating <literal>UNIQUE</literal> "
+"constraint on table columns."
 msgstr ""
 "有些tag还接受<literal>not-null</literal>属性(用来在表字段上生成<literal>NOT "
 "NULL</literal>约束)和<literal>unique</literal>属性(用来在表字段上生成"
@@ -204,13 +199,13 @@
 
 #. Tag: para
 #: toolset_guide.xml:121
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>unique-key</literal> attribute may be used to group columns in a "
-"single unique key constraint. Currently, the specified value of the "
+"A <literal>unique-key</literal> attribute can be used to group columns in a "
+"single, unique key constraint. Currently, the specified value of the "
 "<literal>unique-key</literal> attribute is <emphasis>not</emphasis> used to "
-"name the constraint in the generated DDL, only to group the columns in the "
-"mapping file."
+"name the constraint in the generated DDL. It is only used to group the "
+"columns in the mapping file."
 msgstr ""
 "<literal>unique-key</literal>属性可以对成组的字段指定一个唯一键约束(unique "
 "key constraint)。目前,<literal>unique-key</literal>属性指定的值在生成DDL时"
@@ -228,11 +223,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:131
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
-"will be created using the mapped column or columns. Multiple columns may be "
-"grouped into the same index, simply by specifying the same index name."
+"will be created using the mapped column or columns. Multiple columns can be "
+"grouped into the same index by simply specifying the same index name."
 msgstr ""
 "<literal>index</literal>属性会用对应的字段(一个或多个)生成一个index,它指出"
 "了这个index的名字。如果多个字段对应的index名字相同,就会生成包含这些字段的"
@@ -248,9 +243,9 @@
 
 #. Tag: para
 #: toolset_guide.xml:139
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>foreign-key</literal> attribute may be used to override the name "
+"A <literal>foreign-key</literal> attribute can be used to override the name "
 "of any generated foreign key constraint."
 msgstr ""
 "<literal>foreign-key</literal>属性可以用来覆盖任何生成的外键约束的名字。"
@@ -288,11 +283,11 @@
 
 #. Tag: para
 #: toolset_guide.xml:153
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>default</literal> attribute lets you specify a default value "
-"for a column (you should assign the same value to the mapped property before "
-"saving a new instance of the mapped class)."
+"The <literal>default</literal> attribute allows you to specify a default "
+"value for a column.You should assign the same value to the mapped property "
+"before saving a new instance of the mapped class."
 msgstr ""
 "<literal>default</literal>属性为字段指定一个默认值 (在保存被映射的类的新实例"
 "之前,你应该将同样的值赋于对应的属性)。"
@@ -361,152 +356,158 @@
 "</class>]]>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:179
+#, no-c-format
+msgid "The following table summarizes these optional attributes."
+msgstr ""
+
 #. Tag: title
-#: toolset_guide.xml:180
+#: toolset_guide.xml:182
 #, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
 #. Tag: entry
-#: toolset_guide.xml:187
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Attribute"
 msgstr "属性(Attribute)"
 
 #. Tag: entry
-#: toolset_guide.xml:188
+#: toolset_guide.xml:190
 #, no-c-format
 msgid "Values"
 msgstr "值(Values)"
 
 #. Tag: entry
-#: toolset_guide.xml:189
+#: toolset_guide.xml:191
 #, no-c-format
 msgid "Interpretation"
 msgstr "解释(Interpretation)"
 
 #. Tag: literal
-#: toolset_guide.xml:194
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
+#: toolset_guide.xml:197 toolset_guide.xml:202 toolset_guide.xml:207
 #, no-c-format
 msgid "number"
 msgstr "数字"
 
 #. Tag: entry
-#: toolset_guide.xml:196
+#: toolset_guide.xml:198
 #, no-c-format
 msgid "column length"
 msgstr "字段长度"
 
 #. Tag: literal
-#: toolset_guide.xml:199
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:201
+#: toolset_guide.xml:203
 #, no-c-format
 msgid "column decimal precision"
 msgstr "精度(decimal precision)"
 
 #. Tag: literal
-#: toolset_guide.xml:204
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:206
+#: toolset_guide.xml:208
 #, no-c-format
 msgid "column decimal scale"
 msgstr "小数点位数(decimal scale)"
 
 #. Tag: literal
-#: toolset_guide.xml:209
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:210 toolset_guide.xml:215
+#: toolset_guide.xml:212 toolset_guide.xml:217
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:211
-#, no-c-format
-msgid "specfies that the column should be non-nullable"
+#: toolset_guide.xml:213
+#, fuzzy, no-c-format
+msgid "specifies that the column should be non-nullable"
 msgstr "指明字段是否应该是非空的"
 
 #. Tag: literal
-#: toolset_guide.xml:214
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:216
+#: toolset_guide.xml:218
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "指明是否该字段具有惟一约束"
 
 #. Tag: literal
-#: toolset_guide.xml:219
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:220
+#: toolset_guide.xml:222
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:221
+#: toolset_guide.xml:223
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "指明一个(多字段)的索引(index)的名字"
 
 #. Tag: literal
-#: toolset_guide.xml:224
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:227
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:226
+#: toolset_guide.xml:228
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "指明多字段惟一约束的名字(参见上面的说明)"
 
 #. Tag: literal
-#: toolset_guide.xml:229
+#: toolset_guide.xml:231
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:230
+#: toolset_guide.xml:232
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:231
+#: toolset_guide.xml:233
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -520,19 +521,19 @@
 "<placeholder-6/>时会被忽略。"
 
 #. Tag: literal
-#: toolset_guide.xml:241
+#: toolset_guide.xml:243
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:242
+#: toolset_guide.xml:244
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL 字段类型"
 
 #. Tag: entry
-#: toolset_guide.xml:243
+#: toolset_guide.xml:245
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -540,13 +541,13 @@
 msgstr "覆盖默认的字段类型(只能用于<placeholder-1/>属性)"
 
 #. Tag: literal
-#: toolset_guide.xml:249
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:250 toolset_guide.xml:257
+#: toolset_guide.xml:252 toolset_guide.xml:259
 #, fuzzy, no-c-format
 msgid "SQL expression"
 msgstr ""
@@ -556,25 +557,25 @@
 "SQL 表达式"
 
 #. Tag: entry
-#: toolset_guide.xml:251
+#: toolset_guide.xml:253
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "为字段指定默认值"
 
 #. Tag: literal
-#: toolset_guide.xml:256
+#: toolset_guide.xml:258
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:258
+#: toolset_guide.xml:260
 #, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr "对字段或表加入SQL约束检查"
 
 #. Tag: para
-#: toolset_guide.xml:266
+#: toolset_guide.xml:268
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -583,7 +584,7 @@
 "<literal>&lt;comment&gt;</literal>元素可以让你在生成的schema中加入注释。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:271
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -593,7 +594,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:273
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -604,23 +605,23 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:275
-#, no-c-format
+#: toolset_guide.xml:277
+#, fuzzy, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
-"column</literal> statement in the generated DDL (where supported)."
+"column</literal> statement in the generated DDL where supported."
 msgstr ""
 "结果是在生成的DDL中包含<literal>comment on table</literal> 或者 "
 "<literal>comment on column</literal>语句(假若支持的话)。"
 
 #. Tag: title
-#: toolset_guide.xml:284
+#: toolset_guide.xml:286
 #, no-c-format
 msgid "Running the tool"
 msgstr "运行该工具"
 
 #. Tag: para
-#: toolset_guide.xml:286
+#: toolset_guide.xml:288
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -630,7 +631,15 @@
 "句。"
 
 #. Tag: para
-#: toolset_guide.xml:291
+#: toolset_guide.xml:293
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaExport</literal> command "
+"line options"
+msgstr "<literal>SchemaExport</literal>命令行选项"
+
+#. Tag: para
+#: toolset_guide.xml:295
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -639,20 +648,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:297
+#: toolset_guide.xml:301
 #, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr "<literal>SchemaExport</literal>命令行选项"
 
 #. Tag: entry
-#: toolset_guide.xml:303 toolset_guide.xml:453 toolset_guide.xml:522
+#: toolset_guide.xml:307 toolset_guide.xml:457 toolset_guide.xml:527
 #, no-c-format
 msgid "Option"
 msgstr "选项"
 
 #. Tag: entry
-#: toolset_guide.xml:304 toolset_guide.xml:391 toolset_guide.xml:454
-#: toolset_guide.xml:523
+#: toolset_guide.xml:308 toolset_guide.xml:395 toolset_guide.xml:458
+#: toolset_guide.xml:528
 #, fuzzy, no-c-format
 msgid "Description"
 msgstr ""
@@ -666,97 +675,97 @@
 "描述"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:459
+#: toolset_guide.xml:313 toolset_guide.xml:463
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:310 toolset_guide.xml:460
-#, no-c-format
-msgid "don't output the script to stdout"
+#: toolset_guide.xml:314 toolset_guide.xml:464
+#, fuzzy, no-c-format
+msgid "do not output the script to stdout"
 msgstr "不要把脚本输出到stdout"
 
 #. Tag: literal
-#: toolset_guide.xml:313
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:314
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only drop the tables"
 msgstr "只进行drop tables的步骤"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:321
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "only create the tables"
 msgstr "只创建表"
 
 #. Tag: literal
-#: toolset_guide.xml:321 toolset_guide.xml:463
+#: toolset_guide.xml:325 toolset_guide.xml:467
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:322
-#, no-c-format
-msgid "don't export to the database"
+#: toolset_guide.xml:326
+#, fuzzy, no-c-format
+msgid "do not export to the database"
 msgstr "不执行在数据库中运行的步骤"
 
 #. Tag: literal
-#: toolset_guide.xml:325
+#: toolset_guide.xml:329
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:326
+#: toolset_guide.xml:330
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "把输出的ddl脚本输出到一个文件"
 
 #. Tag: literal
-#: toolset_guide.xml:329 toolset_guide.xml:467 toolset_guide.xml:528
+#: toolset_guide.xml:333 toolset_guide.xml:471 toolset_guide.xml:533
 #, no-c-format
 msgid "--naming=eg.MyNamingStrategy"
 msgstr "--naming=eg.MyNamingStrategy"
 
 #. Tag: entry
-#: toolset_guide.xml:330 toolset_guide.xml:468 toolset_guide.xml:529
+#: toolset_guide.xml:334 toolset_guide.xml:472 toolset_guide.xml:534
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "在<literal>hibernate.properties</literal>文件中"
 
 #. Tag: literal
-#: toolset_guide.xml:333 toolset_guide.xml:475 toolset_guide.xml:536
+#: toolset_guide.xml:337 toolset_guide.xml:479 toolset_guide.xml:541
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:334
+#: toolset_guide.xml:338
 #, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr "从XML文件读入Hibernate配置"
 
 #. Tag: literal
-#: toolset_guide.xml:337 toolset_guide.xml:471 toolset_guide.xml:532
+#: toolset_guide.xml:341 toolset_guide.xml:475 toolset_guide.xml:537
 #, no-c-format
 msgid "--properties=hibernate.properties"
 msgstr "--properties=hibernate.properties"
 
 #. Tag: entry
-#: toolset_guide.xml:338 toolset_guide.xml:472 toolset_guide.xml:533
+#: toolset_guide.xml:342 toolset_guide.xml:476 toolset_guide.xml:538
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -768,37 +777,37 @@
 "从文件中读取数据库属性"
 
 #. Tag: literal
-#: toolset_guide.xml:341
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:342
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "把脚本中的SQL语句对齐和美化"
 
 #. Tag: literal
-#: toolset_guide.xml:345
+#: toolset_guide.xml:349
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=;"
 
 #. Tag: entry
-#: toolset_guide.xml:346
+#: toolset_guide.xml:350
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "为脚本设置行结束符"
 
 #. Tag: para
-#: toolset_guide.xml:352
-#, no-c-format
-msgid "You may even embed <literal>SchemaExport</literal> in your application:"
+#: toolset_guide.xml:356
+#, fuzzy, no-c-format
+msgid "You can even embed <literal>SchemaExport</literal> in your application:"
 msgstr "你甚至可以在你的应用程序中嵌入<literal>SchemaExport</literal>工具:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:356
+#: toolset_guide.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -806,19 +815,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:361
+#: toolset_guide.xml:365
 #, no-c-format
 msgid "Properties"
 msgstr "属性(Properties)"
 
 #. Tag: para
-#: toolset_guide.xml:363
-#, no-c-format
-msgid "Database properties may be specified"
+#: toolset_guide.xml:367
+#, fuzzy, no-c-format
+msgid "Database properties can be specified:"
 msgstr "可以通过如下方式指定数据库属性:"
 
 #. Tag: para
-#: toolset_guide.xml:369
+#: toolset_guide.xml:373
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -826,13 +835,13 @@
 msgstr "通过<literal>-D</literal><emphasis>&lt;property&gt;</emphasis>系统参数"
 
 #. Tag: para
-#: toolset_guide.xml:372
+#: toolset_guide.xml:376
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "在<literal>hibernate.properties</literal>文件中"
 
 #. Tag: para
-#: toolset_guide.xml:375
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
@@ -840,98 +849,98 @@
 "指定"
 
 #. Tag: para
-#: toolset_guide.xml:379
+#: toolset_guide.xml:383
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "所需的参数包括:"
 
 #. Tag: title
-#: toolset_guide.xml:384
+#: toolset_guide.xml:388
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport 连接属性"
 
 #. Tag: entry
-#: toolset_guide.xml:390
+#: toolset_guide.xml:394
 #, no-c-format
 msgid "Property Name"
 msgstr "属性名"
 
 #. Tag: literal
-#: toolset_guide.xml:396
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:397
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "jdbc driver class"
 
 #. Tag: literal
-#: toolset_guide.xml:400
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:401
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "jdbc url"
 msgstr "jdbc url"
 
 #. Tag: literal
-#: toolset_guide.xml:404
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:405
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "database user"
 msgstr "database user"
 
 #. Tag: literal
-#: toolset_guide.xml:408
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:409
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "user password"
 msgstr "user password"
 
 #. Tag: literal
-#: toolset_guide.xml:412
+#: toolset_guide.xml:416
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:413
+#: toolset_guide.xml:417
 #, no-c-format
 msgid "dialect"
 msgstr "方言(dialect)"
 
 #. Tag: title
-#: toolset_guide.xml:422
+#: toolset_guide.xml:426
 #, no-c-format
 msgid "Using Ant"
 msgstr "使用Ant(Using Ant)"
 
 #. Tag: para
-#: toolset_guide.xml:424
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
 msgstr "你可以在你的Ant build脚本中调用<literal>SchemaExport</literal>:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:428
+#: toolset_guide.xml:432
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -954,26 +963,25 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:433
+#: toolset_guide.xml:437
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "对schema的增量更新(Incremental schema updates)"
 
 #. Tag: para
-#: toolset_guide.xml:435
-#, no-c-format
+#: toolset_guide.xml:439
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
-"\"incremental\" changes. Note that <literal>SchemaUpdate</literal> depends "
-"heavily upon the JDBC metadata API, so it will not work with all JDBC "
-"drivers."
+"\"incremental\" changes. The <literal>SchemaUpdate</literal> depends upon "
+"the JDBC metadata API and, as such, will not work with all JDBC drivers."
 msgstr ""
 "<literal>SchemaUpdate</literal>工具对已存在的schema采用\"增量\"方式进行更新。"
 "注意<literal>SchemaUpdate</literal>严重依赖于JDBC metadata API,所以它并非对所"
 "有JDBC驱动都有效。"
 
 #. Tag: para
-#: toolset_guide.xml:441
+#: toolset_guide.xml:445
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -982,19 +990,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:447
+#: toolset_guide.xml:451
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal>命令行选项"
 
 #. Tag: entry
-#: toolset_guide.xml:464
-#, no-c-format
-msgid "don't export the script to the database"
+#: toolset_guide.xml:468
+#, fuzzy, no-c-format
+msgid "do not export the script to the database"
 msgstr "不把脚本输出到数据库"
 
 #. Tag: entry
-#: toolset_guide.xml:476 toolset_guide.xml:537
+#: toolset_guide.xml:480 toolset_guide.xml:542
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
@@ -1004,13 +1012,13 @@
 "指定一个<placeholder-1/>文件"
 
 #. Tag: para
-#: toolset_guide.xml:482
-#, no-c-format
-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#: toolset_guide.xml:486
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaUpdate</literal> in your application:"
 msgstr "你可以在你的应用程序中嵌入<literal>SchemaUpdate</literal>工具:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:486
+#: toolset_guide.xml:490
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1018,19 +1026,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:491
+#: toolset_guide.xml:495
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "用Ant来增量更新schema(Using Ant for incremental schema updates)"
 
 #. Tag: para
-#: toolset_guide.xml:493
+#: toolset_guide.xml:497
 #, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr "你可以在Ant脚本中调用<literal>SchemaUpdate</literal>:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:497
+#: toolset_guide.xml:501
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1049,27 +1057,27 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:502
+#: toolset_guide.xml:506
 #, no-c-format
 msgid "Schema validation"
 msgstr "Schema 校验"
 
 #. Tag: para
-#: toolset_guide.xml:504
-#, no-c-format
+#: toolset_guide.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
-"database schema \"matches\" your mapping documents. Note that "
+"database schema \"matches\" your mapping documents. The "
 "<literal>SchemaValidator</literal> depends heavily upon the JDBC metadata "
-"API, so it will not work with all JDBC drivers. This tool is extremely "
-"useful for testing."
+"API and, as such, will not work with all JDBC drivers. This tool is "
+"extremely useful for testing."
 msgstr ""
 "<literal>SchemaValidator</literal>工具会比较数据库现状是否与映射文档“匹配”。"
 "注意,<literal>SchemaValidator</literal> 严重依赖于JDBC的metadata API,因此不"
 "是对所有的JDBC驱动都适用。这一工具在测试的时候特别有用。"
 
 #. Tag: para
-#: toolset_guide.xml:510
+#: toolset_guide.xml:514
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1077,20 +1085,28 @@
 "<emphasis>options mapping_files</emphasis>"
 msgstr ""
 
+#. Tag: para
+#: toolset_guide.xml:518
+#, fuzzy, no-c-format
+msgid ""
+"The following table displays the <literal>SchemaValidator</literal> command "
+"line options:"
+msgstr "<literal>SchemaValidator</literal>命令行参数"
+
 #. Tag: title
-#: toolset_guide.xml:516
+#: toolset_guide.xml:521
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal>命令行参数"
 
 #. Tag: para
-#: toolset_guide.xml:543
-#, no-c-format
-msgid "You may embed <literal>SchemaValidator</literal> in your application:"
+#: toolset_guide.xml:548
+#, fuzzy, no-c-format
+msgid "You can embed <literal>SchemaValidator</literal> in your application:"
 msgstr "你可以在你的应用程序中嵌入<literal>SchemaValidator</literal>:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:547
+#: toolset_guide.xml:552
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1098,19 +1114,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:552
+#: toolset_guide.xml:557
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "使用Ant进行schema校验"
 
 #. Tag: para
-#: toolset_guide.xml:554
+#: toolset_guide.xml:559
 #, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script:"
 msgstr "你可以在Ant脚本中调用<literal>SchemaValidator</literal>:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:558
+#: toolset_guide.xml:563
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"
@@ -1127,6 +1143,9 @@
 "</target>]]>"
 msgstr ""
 
+#~ msgid "Ant Tasks:"
+#~ msgstr "Ant Tasks:"
+
 #~ msgid "&lt;one-to-one&gt;"
 #~ msgstr "&lt;one-to-one&gt;"
 

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -12,18 +12,18 @@
 
 #. Tag: title
 #: transactions.xml:29
-#, no-c-format
-msgid "Transactions And Concurrency"
+#, fuzzy, no-c-format
+msgid "Transactions and Concurrency"
 msgstr "事务和并发"
 
 #. Tag: para
 #: transactions.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
-"is very easy to understand. Hibernate directly uses JDBC connections and JTA "
-"resources without adding any additional locking behavior. We highly "
-"recommend you spend some time with the JDBC, ANSI, and transaction isolation "
+"is easy to understand. Hibernate directly uses JDBC connections and JTA "
+"resources without adding any additional locking behavior. It is recommended "
+"that you spend some time with the JDBC, ANSI, and transaction isolation "
 "specification of your database management system."
 msgstr ""
 "Hibernate的事务和并发控制很容易掌握。Hibernate直接使用JDBC连接和JTA资源,不添"
@@ -32,14 +32,13 @@
 
 #. Tag: para
 #: transactions.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
 "behavior as defined by the isolation level of your database transactions. "
-"Note that thanks to the <literal>Session</literal>, which is also a "
-"transaction-scoped cache, Hibernate provides repeatable reads for lookup by "
-"identifier and entity queries (not reporting queries that return scalar "
-"values)."
+"Through <literal>Session</literal>, which is also a transaction-scoped "
+"cache, Hibernate provides repeatable reads for lookup by identifier and "
+"entity queries and not reporting queries that return scalar values."
 msgstr ""
 "Hibernate不锁定内存中的对象。你的应用程序会按照你的数据库事务的隔离级别规定的"
 "那样运作。幸亏有了<literal>Session</literal>,使得Hibernate通过标识符查找,和"
@@ -48,12 +47,12 @@
 
 #. Tag: para
 #: transactions.xml:46
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
-"Hibernate also offers a (minor) API for pessimistic locking of rows, using "
-"the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrency "
-"control and this API are discussed later in this chapter."
+"Hibernate also offers, using the <literal>SELECT FOR UPDATE</literal> "
+"syntax, a (minor) API for pessimistic locking of rows. Optimistic "
+"concurrency control and this API are discussed later in this chapter."
 msgstr ""
 "除了对自动乐观并发控制提供版本管理,针对行级悲观锁定,Hibernate也提供了辅助的"
 "(较小的)API,它使用了 <literal>SELECT FOR UPDATE</literal>的SQL语法。本章后"
@@ -61,9 +60,9 @@
 
 #. Tag: para
 #: transactions.xml:53
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"We start the discussion of concurrency control in Hibernate with the "
+"The discussion of concurrency control in Hibernate begins with the "
 "granularity of <literal>Configuration</literal>, <literal>SessionFactory</"
 "literal>, and <literal>Session</literal>, as well as database transactions "
 "and long conversations."
@@ -80,12 +79,12 @@
 
 #. Tag: para
 #: transactions.xml:62
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
-"object intended to be shared by all application threads. It is created once, "
-"usually on application startup, from a <literal>Configuration</literal> "
-"instance."
+"object, intended to be shared by all application threads. It is created "
+"once, usually on application startup, from a <literal>Configuration</"
+"literal> instance."
 msgstr ""
 "<literal>SessionFactory</literal>对象的创建代价很昂贵,它是线程安全的对象,它"
 "为所有的应用程序线程所共享。它只创建一次,通常是在应用程序启动的时候,由一个"
@@ -93,13 +92,13 @@
 
 #. Tag: para
 #: transactions.xml:68
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
-"should be used once, for a single request, a conversation, single unit of "
-"work, and then discarded. A <literal>Session</literal> will not obtain a "
-"JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>) "
-"unless it is needed, hence consume no resources until used."
+"should be used once and then discarded for: a single request, a conversation "
+"or a single unit of work. A <literal>Session</literal> will not obtain a "
+"JDBC <literal>Connection</literal>, or a <literal>Datasource</literal>, "
+"unless it is needed. It will not consume any resources until used."
 msgstr ""
 "<literal>Session</literal>对象的创建代价比较小,是非线程安全的,对于单个请"
 "求,单个会话、单个的 工作单元而言,它只被使用一次,然后就丢弃。只有在需要的时"
@@ -109,28 +108,27 @@
 
 #. Tag: para
 #: transactions.xml:76
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"To complete this picture you also have to think about database transactions. "
-"A database transaction has to be as short as possible, to reduce lock "
-"contention in the database. Long database transactions will prevent your "
-"application from scaling to highly concurrent load. Hence, it is almost "
-"never good design to hold a database transaction open during user think "
-"time, until the unit of work is complete."
+"In order to reduce lock contention in the database, a database transaction "
+"has to be as short as possible. Long database transactions will prevent your "
+"application from scaling to a highly concurrent load. It is not recommended "
+"that you hold a database transaction open during user think time until the "
+"unit of work is complete."
 msgstr ""
 "此外我们还要考虑数据库事务。数据库事务应该尽可能的短,降低数据库中的锁争用。 "
 "数据库长事务会阻止你的应用程序扩展到高的并发负载。因此,假若在用户思考期间让"
 "数据库事务开着,直到整个工作单元完成才关闭这个事务,这绝不是一个好的设计。"
 
 #. Tag: para
-#: transactions.xml:85
-#, no-c-format
+#: transactions.xml:84
+#, fuzzy, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
-"<literal>Session</literal> span several database transactions or is this a "
+"<literal>Session</literal> span several database transactions, or is this a "
 "one-to-one relationship of scopes? When should you open and close a "
 "<literal>Session</literal> and how do you demarcate the database transaction "
-"boundaries?"
+"boundaries? These questions are addressed in the following sections."
 msgstr ""
 "一个操作单元(Unit of work)的范围是多大?单个的Hibernate <literal>Session</"
 "literal>能跨越多个 数据库事务吗?还是一个<literal>Session</literal>的作用范围"
@@ -138,28 +136,43 @@
 "<literal>Session</literal>?,你又如何划分数据库事务的边界呢?"
 
 #. Tag: title
-#: transactions.xml:93
+#: transactions.xml:92
 #, no-c-format
 msgid "Unit of work"
 msgstr "操作单元(Unit of work)"
 
 #. Tag: para
-#: transactions.xml:95
+#: transactions.xml:94
 #, no-c-format
 msgid ""
-"First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
-"that is, don't open and close a <literal>Session</literal> for every simple "
-"database call in a single thread! Of course, the same is true for database "
-"transactions. Database calls in an application are made using a planned "
-"sequence, they are grouped into atomic units of work. (Note that this also "
-"means that auto-commit after every single SQL statement is useless in an "
-"application, this mode is intended for ad-hoc SQL console work. Hibernate "
-"disables, or expects the application server to do so, auto-commit mode "
-"immediately.) Database transactions are never optional, all communication "
-"with a database has to occur inside a transaction, no matter if you read or "
-"write data. As explained, auto-commit behavior for reading data should be "
+"First, let's define a unit of work. A unit of work is a design pattern "
+"described by Martin Fowler as <quote> [maintaining] a list of objects "
+"affected by a business transaction and coordinates the writing out of "
+"changes and the resolution of concurrency problems. </quote><citation>PoEAA</"
+"citation> In other words, its a series of operations we wish to carry out "
+"against the database together. Basically, it is a transaction, though "
+"fulfilling a unit of work will often span multiple physical database "
+"transactions (see <xref linkend=\"transactions-basics-apptx\"/>). So really "
+"we are talking about a more abstract notion of a transaction. The term "
+"\"business transaction\" is also sometimes used in lieu of unit of work."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:111
+#, fuzzy, no-c-format
+msgid ""
+"Do not use the <emphasis>session-per-operation</emphasis> antipattern: do "
+"not open and close a <literal>Session</literal> for every simple database "
+"call in a single thread. The same is true for database transactions. "
+"Database calls in an application are made using a planned sequence; they are "
+"grouped into atomic units of work. This also means that auto-commit after "
+"every single SQL statement is useless in an application as this mode is "
+"intended for ad-hoc SQL console work. Hibernate disables, or expects the "
+"application server to disable, auto-commit mode immediately. Database "
+"transactions are never optional. All communication with a database has to "
+"occur inside a transaction. Auto-commit behavior for reading data should be "
 "avoided, as many small transactions are unlikely to perform better than one "
-"clearly defined unit of work. The latter is also much more maintainable and "
+"clearly defined unit of work. The latter is also more maintainable and "
 "extensible."
 msgstr ""
 "首先,别用<emphasis>session-per-operation</emphasis>这种反模式了,也就是说,"
@@ -173,19 +186,19 @@
 "为,因为很多小的事务比一个清晰定义的工作单元性能差。后者也更容易维护和扩展。"
 
 #. Tag: para
-#: transactions.xml:111
+#: transactions.xml:126
 #, fuzzy, no-c-format
 msgid ""
 "The most common pattern in a multi-user client/server application is "
 "<emphasis>session-per-request</emphasis>. In this model, a request from the "
-"client is sent to the server (where the Hibernate persistence layer runs), a "
+"client is sent to the server, where the Hibernate persistence layer runs. A "
 "new Hibernate <literal>Session</literal> is opened, and all database "
-"operations are executed in this unit of work. Once the work has been "
-"completed (and the response for the client has been prepared), the session "
-"is flushed and closed. You would also use a single database transaction to "
-"serve the clients request, starting and committing it when you open and "
-"close the <literal>Session</literal>. The relationship between the two is "
-"one-to-one and this model is a perfect fit for many applications."
+"operations are executed in this unit of work. On completion of the work, and "
+"once the response for the client has been prepared, the session is flushed "
+"and closed. Use a single database transaction to serve the clients request, "
+"starting and committing it when you open and close the <literal>Session</"
+"literal>. The relationship between the two is one-to-one and this model is a "
+"perfect fit for many applications."
 msgstr ""
 "在多用户的client/server应用程序中,最常用的模式是 <emphasis>每个请求一个会话"
 "(session-per-request)</emphasis>。 在这种模式下,来自客户端的请求被发送到服务"
@@ -197,20 +210,20 @@
 "这种模式对 于大多数应用程序来说是很棒的。"
 
 #. Tag: para
-#: transactions.xml:123
+#: transactions.xml:138
 #, fuzzy, no-c-format
 msgid ""
 "The challenge lies in the implementation. Hibernate provides built-in "
-"management of the \"current session\" to simplify this pattern. All you have "
-"to do is start a transaction when a server request has to be processed, and "
-"end the transaction before the response is sent to the client. You can do "
-"this in any way you like, common solutions are <literal>ServletFilter</"
-"literal>, AOP interceptor with a pointcut on the service methods, or a proxy/"
-"interception container. An EJB container is a standardized way to implement "
-"cross-cutting aspects such as transaction demarcation on EJB session beans, "
-"declaratively with CMT. If you decide to use programmatic transaction "
-"demarcation, prefer the Hibernate <literal>Transaction</literal> API shown "
-"later in this chapter, for ease of use and code portability."
+"management of the \"current session\" to simplify this pattern. Start a "
+"transaction when a server request has to be processed, and end the "
+"transaction before the response is sent to the client. Common solutions are "
+"<literal>ServletFilter</literal>, AOP interceptor with a pointcut on the "
+"service methods, or a proxy/interception container. An EJB container is a "
+"standardized way to implement cross-cutting aspects such as transaction "
+"demarcation on EJB session beans, declaratively with CMT. If you use "
+"programmatic transaction demarcation, for ease of use and code portability "
+"use the Hibernate <literal>Transaction</literal> API shown later in this "
+"chapter."
 msgstr ""
 "实现才是真正的挑战。Hibernate内置了对\"当前session(current session)\" 的管"
 "理,用于简化此模式。你要做的一切就是在服务器端要处理请求的时候,开启事务,在"
@@ -222,15 +235,14 @@
 "移植性都有好处。"
 
 #. Tag: para
-#: transactions.xml:136
-#, no-c-format
+#: transactions.xml:150
+#, fuzzy, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
-"request by simply calling <literal>sessionFactory.getCurrentSession()</"
-"literal> anywhere and as often as needed. You will always get a "
-"<literal>Session</literal> scoped to the current database transaction. This "
-"has to be configured for either resource-local or JTA environments, see "
-"<xref linkend=\"architecture-current-session\"/>."
+"request by calling <literal>sessionFactory.getCurrentSession()</literal>. "
+"You will always get a <literal>Session</literal> scoped to the current "
+"database transaction. This has to be configured for either resource-local or "
+"JTA environments, see <xref linkend=\"architecture-current-session\"/>."
 msgstr ""
 "在任何时间,任何地方,你的应用代码可以通过简单的调用<literal>sessionFactory."
 "getCurrentSession()</literal>来访问\"当前session\",用于处理请求。你总是会得"
@@ -238,19 +250,18 @@
 "时,必须配置它,请参见<xref linkend=\"architecture-current-session\"/>。"
 
 #. Tag: para
-#: transactions.xml:144
-#, no-c-format
+#: transactions.xml:158
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes it is convenient to extend the scope of a <literal>Session</"
-"literal> and database transaction until the \"view has been rendered\". This "
-"is especially useful in servlet applications that utilize a separate "
-"rendering phase after the request has been processed. Extending the database "
-"transaction until view rendering is complete is easy to do if you implement "
-"your own interceptor. However, it is not easily doable if you rely on EJBs "
-"with container-managed transactions, as a transaction will be completed when "
-"an EJB method returns, before rendering of any view can start. See the "
-"Hibernate website and forum for tips and examples around this <emphasis>Open "
-"Session in View</emphasis> pattern."
+"You can extend the scope of a <literal>Session</literal> and database "
+"transaction until the \"view has been rendered\". This is especially useful "
+"in servlet applications that utilize a separate rendering phase after the "
+"request has been processed. Extending the database transaction until view "
+"rendering, is achieved by implementing your own interceptor. However, this "
+"will be difficult if you rely on EJBs with container-managed transactions. A "
+"transaction will be completed when an EJB method returns, before rendering "
+"of any view can start. See the Hibernate website and forum for tips and "
+"examples relating to this <emphasis>Open Session in View</emphasis> pattern."
 msgstr ""
 "有时,将<literal>Session</literal>和数据库事务的边界延伸到\"展示层被渲染后"
 "\"会带来便利。有些serlvet应用程序在对请求进行处理后,有个单独的渲染期,这种延"
@@ -260,20 +271,20 @@
 "坛,你可以找到<emphasis>Open Session in View</emphasis>这一模式的提示和示例。"
 
 #. Tag: title
-#: transactions.xml:159
+#: transactions.xml:173
 #, no-c-format
 msgid "Long conversations"
 msgstr "长对话"
 
 #. Tag: para
-#: transactions.xml:161
-#, no-c-format
+#: transactions.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"The session-per-request pattern is not the only useful concept you can use "
-"to design units of work. Many business processes require a whole series of "
-"interactions with the user interleaved with database accesses. In web and "
-"enterprise applications it is not acceptable for a database transaction to "
-"span a user interaction. Consider the following example:"
+"The session-per-request pattern is not the only way of designing units of "
+"work. Many business processes require a whole series of interactions with "
+"the user that are interleaved with database accesses. In web and enterprise "
+"applications, it is not acceptable for a database transaction to span a user "
+"interaction. Consider the following example:"
 msgstr ""
 "session-per-request模式不仅仅是一个可以用来设计操作单元的有用概念。很多业务处"
 "理都需 要一系列完整的与用户之间的交互,而这些用户是指对数据库有交叉访问的用"
@@ -281,10 +292,10 @@
 "面的例子:"
 
 #. Tag: para
-#: transactions.xml:171
-#, no-c-format
+#: transactions.xml:185
+#, fuzzy, no-c-format
 msgid ""
-"The first screen of a dialog opens, the data seen by the user has been "
+"The first screen of a dialog opens. The data seen by the user has been "
 "loaded in a particular <literal>Session</literal> and database transaction. "
 "The user is free to modify the objects."
 msgstr ""
@@ -292,38 +303,37 @@
 "literal> 和数据 库事务载入(load)的。用户可以随意修改对话框中的数据对象。"
 
 #. Tag: para
-#: transactions.xml:178
-#, no-c-format
+#: transactions.xml:192
+#, fuzzy, no-c-format
 msgid ""
-"The user clicks \"Save\" after 5 minutes and expects his modifications to be "
-"made persistent; he also expects that he was the only person editing this "
-"information and that no conflicting modification can occur."
+"The user clicks \"Save\" after 5 minutes and expects their modifications to "
+"be made persistent. The user also expects that they were the only person "
+"editing this information and that no conflicting modification has occurred."
 msgstr ""
 "5分钟后,用户点击“保存”,期望所做出的修改被持久化;同时他也期望自己是唯一修改"
 "这个信息的人,不会出现 修改冲突。"
 
 #. Tag: para
-#: transactions.xml:186
-#, no-c-format
+#: transactions.xml:200
+#, fuzzy, no-c-format
 msgid ""
-"We call this unit of work, from the point of view of the user, a long "
-"running <emphasis>conversation</emphasis> (or <emphasis>application "
-"transaction</emphasis>). There are many ways how you can implement this in "
-"your application."
+"From the point of view of the user, we call this unit of work a long-running "
+"<emphasis>conversation</emphasis> or <emphasis>application transaction</"
+"emphasis>. There are many ways to implement this in your application."
 msgstr ""
 "从用户的角度来看,我们把这个操作单元称为长时间运行的<emphasis>对话</emphasis>"
 "(conversation),或者(or <emphasis>应用事务</emphasis>,application "
 "transaction)。 在你的应用程序中,可以有很多种方法来实现它。"
 
 #. Tag: para
-#: transactions.xml:192
-#, no-c-format
+#: transactions.xml:206
+#, fuzzy, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
 "database transaction open during user think time, with locks held in the "
-"database to prevent concurrent modification, and to guarantee isolation and "
-"atomicity. This is of course an anti-pattern, since lock contention would "
-"not allow the application to scale with the number of concurrent users."
+"database to prevent concurrent modification and to guarantee isolation and "
+"atomicity. This is an anti-pattern, since lock contention would not allow "
+"the application to scale with the number of concurrent users."
 msgstr ""
 "头一个幼稚的做法是,在用户思考的过程中,保持<literal>Session</literal>和数据"
 "库事务是打开的, 保持数据库锁定,以阻止并发修改,从而保证数据库事务隔离级别和"
@@ -331,17 +341,17 @@
 "的数目。"
 
 #. Tag: para
-#: transactions.xml:200
+#: transactions.xml:214
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, we have to use several database transactions to implement the "
-"conversation. In this case, maintaining isolation of business processes "
-"becomes the partial responsibility of the application tier. A single "
-"conversation usually spans several database transactions. It will be atomic "
-"if only one of these database transactions (the last one) stores the updated "
-"data, all others simply read data (e.g. in a wizard-style dialog spanning "
+"You have to use several database transactions to implement the conversation. "
+"In this case, maintaining isolation of business processes becomes the "
+"partial responsibility of the application tier. A single conversation "
+"usually spans several database transactions. It will be atomic if only one "
+"of these database transactions (the last one) stores the updated data. All "
+"others simply read data (for example, in a wizard-style dialog spanning "
 "several request/response cycles). This is easier to implement than it might "
-"sound, especially if you use Hibernate's features:"
+"sound, especially if you utilize some of Hibernate's features:"
 msgstr ""
 "很明显,我们必须使用多个数据库事务来实现这个对话。在这个例子中,维护业务处理"
 "的 事务隔离变成了应用程序层的部分责任。一个对话通常跨越多个数据库事务。如果仅"
@@ -351,28 +361,28 @@
 "Hibernate的下述特性的时候:"
 
 #. Tag: para
-#: transactions.xml:213
+#: transactions.xml:227
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Automatic Versioning</emphasis> - Hibernate can do automatic "
-"optimistic concurrency control for you, it can automatically detect if a "
-"concurrent modification occurred during user think time. Usually we only "
-"check at the end of the conversation."
+"<emphasis>Automatic Versioning</emphasis>: Hibernate can perform automatic "
+"optimistic concurrency control for you. It can automatically detect if a "
+"concurrent modification occurred during user think time. Check for this at "
+"the end of the conversation."
 msgstr ""
 "<emphasis>自动版本化</emphasis> - Hibernate能够自动进行乐观并发控制 ,如果在"
 "用户思考 的过程中发生并发修改,Hibernate能够自动检测到。一般我们只在对话结束"
 "时才检查。"
 
 #. Tag: para
-#: transactions.xml:221
-#, no-c-format
+#: transactions.xml:235
+#, fuzzy, no-c-format
 msgid ""
-"<emphasis>Detached Objects</emphasis> - If you decide to use the already "
-"discussed <emphasis>session-per-request</emphasis> pattern, all loaded "
-"instances will be in detached state during user think time. Hibernate allows "
-"you to reattach the objects and persist the modifications, the pattern is "
-"called <emphasis>session-per-request-with-detached-objects</emphasis>. "
-"Automatic versioning is used to isolate concurrent modifications."
+"<emphasis>Detached Objects</emphasis>: if you decide to use the "
+"<emphasis>session-per-request</emphasis> pattern, all loaded instances will "
+"be in the detached state during user think time. Hibernate allows you to "
+"reattach the objects and persist the modifications. The pattern is called "
+"<emphasis>session-per-request-with-detached-objects</emphasis>. Automatic "
+"versioning is used to isolate concurrent modifications."
 msgstr ""
 "<emphasis>脱管对象</emphasis>(Detached Objects)- 如果你决定采用前面已经讨论"
 "过的 <emphasis>session-per-request</emphasis>模式,所有载入的实例在用户思考的"
@@ -381,17 +391,17 @@
 "request-with-detached-objects</emphasis>。自动版本化被用来隔离并发修改。"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:245
 #, fuzzy, no-c-format
 msgid ""
-"<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
-"<literal>Session</literal> may be disconnected from the underlying JDBC "
-"connection after the database transaction has been committed, and "
-"reconnected when a new client request occurs. This pattern is known as "
-"<emphasis>session-per-conversation</emphasis> and makes even reattachment "
-"unnecessary. Automatic versioning is used to isolate concurrent "
-"modifications and the <literal>Session</literal> is usually not allowed to "
-"be flushed automatically, but explicitly."
+"<emphasis>Extended (or Long) Session</emphasis>: the Hibernate "
+"<literal>Session</literal> can be disconnected from the underlying JDBC "
+"connection after the database transaction has been committed and reconnected "
+"when a new client request occurs. This pattern is known as <emphasis>session-"
+"per-conversation</emphasis> and makes even reattachment unnecessary. "
+"Automatic versioning is used to isolate concurrent modifications and the "
+"<literal>Session</literal> will not be allowed to be flushed automatically, "
+"but explicitly."
 msgstr ""
 "<emphasis>Extended (or Long) Session</emphasis> - Hibernate 的"
 "<literal>Session</literal> 可以在数据库事务提交之后和底层的JDBC连接断开,当一"
@@ -401,73 +411,73 @@
 "literal>通常不允许自动flush,而是明确flush。"
 
 #. Tag: para
-#: transactions.xml:244
-#, no-c-format
+#: transactions.xml:258
+#, fuzzy, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
 "<emphasis>session-per-conversation</emphasis> have advantages and "
-"disadvantages, we discuss them later in this chapter in the context of "
-"optimistic concurrency control."
+"disadvantages. These disadvantages are discussed later in this chapter in "
+"the context of optimistic concurrency control."
 msgstr ""
 "<emphasis>session-per-request-with-detached-objects</emphasis> 和 "
 "<emphasis>session-per-conversation</emphasis> 各有优缺点,我们在本章后面乐观"
 "并发 控制那部分再进行讨论。"
 
 #. Tag: title
-#: transactions.xml:253
+#: transactions.xml:267
 #, no-c-format
 msgid "Considering object identity"
 msgstr "关注对象标识(Considering object identity)"
 
 #. Tag: para
-#: transactions.xml:255
-#, no-c-format
+#: transactions.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"An application may concurrently access the same persistent state in two "
+"An application can concurrently access the same persistent state in two "
 "different <literal>Session</literal>s. However, an instance of a persistent "
-"class is never shared between two <literal>Session</literal> instances. "
-"Hence there are two different notions of identity:"
+"class is never shared between two <literal>Session</literal> instances. It "
+"is for this reason that there are two different notions of identity:"
 msgstr ""
 "应用程序可能在两个不同的<literal>Session</literal>中并发访问同一持久化状态,"
 "但是, 一个持久化类的实例无法在两个 <literal>Session</literal>中共享。因此有"
 "两种不同的标识语义:"
 
 #. Tag: term
-#: transactions.xml:264
+#: transactions.xml:278
 #, no-c-format
 msgid "Database Identity"
 msgstr "数据库标识"
 
 #. Tag: literal
-#: transactions.xml:267
+#: transactions.xml:281
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:272
+#: transactions.xml:286
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM 标识"
 
 #. Tag: literal
-#: transactions.xml:275
+#: transactions.xml:289
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:281
+#: transactions.xml:295
 #, fuzzy, no-c-format
 msgid ""
-"Then for objects attached to a <emphasis>particular</emphasis> "
-"<literal>Session</literal> (i.e. in the scope of a <literal>Session</"
-"literal>) the two notions are equivalent, and JVM identity for database "
-"identity is guaranteed by Hibernate. However, while the application might "
-"concurrently access the \"same\" (persistent identity) business object in "
-"two different sessions, the two instances will actually be \"different"
-"\" (JVM identity). Conflicts are resolved using (automatic versioning) at "
-"flush/commit time, using an optimistic approach."
+"For objects attached to a <emphasis>particular</emphasis> <literal>Session</"
+"literal> (i.e., in the scope of a <literal>Session</literal>), the two "
+"notions are equivalent and JVM identity for database identity is guaranteed "
+"by Hibernate. While the application might concurrently access the \"same"
+"\" (persistent identity) business object in two different sessions, the two "
+"instances will actually be \"different\" (JVM identity). Conflicts are "
+"resolved using an optimistic approach and automatic versioning at flush/"
+"commit time."
 msgstr ""
 "对于那些关联到 <emphasis>特定</emphasis><literal>Session</literal> (也就是在"
 "单个<literal>Session</literal>的范围内)上的对象来说,这 两种标识的语义是等价"
@@ -477,16 +487,16 @@
 "候使用自动版本化和乐 观锁定方法来解决。"
 
 #. Tag: para
-#: transactions.xml:290
-#, no-c-format
+#: transactions.xml:304
+#, fuzzy, no-c-format
 msgid ""
-"This approach leaves Hibernate and the database to worry about concurrency; "
-"it also provides the best scalability, since guaranteeing identity in single-"
-"threaded units of work only doesn't need expensive locking or other means of "
-"synchronization. The application never needs to synchronize on any business "
-"object, as long as it sticks to a single thread per <literal>Session</"
-"literal>. Within a <literal>Session</literal> the application may safely use "
-"<literal>==</literal> to compare objects."
+"This approach leaves Hibernate and the database to worry about concurrency. "
+"It also provides the best scalability, since guaranteeing identity in single-"
+"threaded units of work means that it does not need expensive locking or "
+"other means of synchronization. The application does not need to synchronize "
+"on any business object, as long as it maintains a single thread per "
+"<literal>Session</literal>. Within a <literal>Session</literal> the "
+"application can safely use <literal>==</literal> to compare objects."
 msgstr ""
 "这种方式把关于并发的头疼问题留给了Hibernate和数据库;由于在单个线程内,操作单"
 "元中的对象识别不 需要代价昂贵的锁定或其他意义上的同步,因此它同时可以提供最好"
@@ -495,28 +505,29 @@
 "的使用<literal>==</literal>进行对象比较。"
 
 #. Tag: para
-#: transactions.xml:299
-#, no-c-format
+#: transactions.xml:313
+#, fuzzy, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
-"<literal>Session</literal>, might see unexpected results. This might occur "
-"even in some unexpected places, for example, if you put two detached "
-"instances into the same <literal>Set</literal>. Both might have the same "
-"database identity (i.e. they represent the same row), but JVM identity is by "
-"definition not guaranteed for instances in detached state. The developer has "
-"to override the <literal>equals()</literal> and <literal>hashCode()</"
-"literal> methods in persistent classes and implement his own notion of "
-"object equality. There is one caveat: Never use the database identifier to "
-"implement equality, use a business key, a combination of unique, usually "
-"immutable, attributes. The database identifier will change if a transient "
-"object is made persistent. If the transient instance (usually together with "
-"detached instances) is held in a <literal>Set</literal>, changing the "
-"hashcode breaks the contract of the <literal>Set</literal>. Attributes for "
-"business keys don't have to be as stable as database primary keys, you only "
-"have to guarantee stability as long as the objects are in the same "
-"<literal>Set</literal>. See the Hibernate website for a more thorough "
-"discussion of this issue. Also note that this is not a Hibernate issue, but "
-"simply how Java object identity and equality has to be implemented."
+"<literal>Session</literal> might produce unexpected results. This might "
+"occur even in some unexpected places. For example, if you put two detached "
+"instances into the same <literal>Set</literal>, both might have the same "
+"database identity (i.e., they represent the same row). JVM identity, "
+"however, is by definition not guaranteed for instances in a detached state. "
+"The developer has to override the <literal>equals()</literal> and "
+"<literal>hashCode()</literal> methods in persistent classes and implement "
+"their own notion of object equality. There is one caveat: never use the "
+"database identifier to implement equality. Use a business key that is a "
+"combination of unique, usually immutable, attributes. The database "
+"identifier will change if a transient object is made persistent. If the "
+"transient instance (usually together with detached instances) is held in a "
+"<literal>Set</literal>, changing the hashcode breaks the contract of the "
+"<literal>Set</literal>. Attributes for business keys do not have to be as "
+"stable as database primary keys; you only have to guarantee stability as "
+"long as the objects are in the same <literal>Set</literal>. See the "
+"Hibernate website for a more thorough discussion of this issue. Please note "
+"that this is not a Hibernate issue, but simply how Java object identity and "
+"equality has to be implemented."
 msgstr ""
 "不过,应用程序在<literal>Session</literal>的外面使用<literal>==</literal>进行"
 "对象比较可能会 导致无法预期的结果。在一些无法预料的场合,例如,如果你把两个脱"
@@ -534,19 +545,19 @@
 "Hibernate的问题,而仅仅是一个关于Java对象标识和判等行为如何实现的问题。"
 
 #. Tag: title
-#: transactions.xml:320
+#: transactions.xml:334
 #, no-c-format
 msgid "Common issues"
 msgstr "常见问题"
 
 #. Tag: para
-#: transactions.xml:322
-#, no-c-format
+#: transactions.xml:336
+#, fuzzy, no-c-format
 msgid ""
-"Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
-"<emphasis>session-per-application</emphasis> (of course, there are rare "
-"exceptions to this rule). Note that some of the following issues might also "
-"appear with the recommended patterns, make sure you understand the "
+"Do not use the anti-patterns <emphasis>session-per-user-session</emphasis> "
+"or <emphasis>session-per-application</emphasis> (there are, however, rare "
+"exceptions to this rule). Some of the following issues might also arise "
+"within the recommended patterns, so ensure that you understand the "
 "implications before making a design decision:"
 msgstr ""
 "决不要使用反模式<emphasis>session-per-user-session</emphasis>或者<emphasis> "
@@ -555,17 +566,17 @@
 "解该模式的应用前提。"
 
 #. Tag: para
-#: transactions.xml:331
-#, no-c-format
+#: transactions.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is not thread-safe. Things which are supposed "
-"to work concurrently, like HTTP requests, session beans, or Swing workers, "
-"will cause race conditions if a <literal>Session</literal> instance would be "
-"shared. If you keep your Hibernate <literal>Session</literal> in your "
-"<literal>HttpSession</literal> (discussed later), you should consider "
-"synchronizing access to your Http session. Otherwise, a user that clicks "
-"reload fast enough may use the same <literal>Session</literal> in two "
-"concurrently running threads."
+"A <literal>Session</literal> is not thread-safe. Things that work "
+"concurrently, like HTTP requests, session beans, or Swing workers, will "
+"cause race conditions if a <literal>Session</literal> instance is shared. If "
+"you keep your Hibernate <literal>Session</literal> in your "
+"<literal>HttpSession</literal> (this is discussed later in the chapter), you "
+"should consider synchronizing access to your Http session. Otherwise, a user "
+"that clicks reload fast enough can use the same <literal>Session</literal> "
+"in two concurrently running threads."
 msgstr ""
 "<literal>Session</literal> 对象是非线程安全的。如果一个<literal>Session</"
 "literal> 实例允许共享的话,那些支持并发运行的东东,例如HTTP request,session "
@@ -576,18 +587,18 @@
 "literal>。"
 
 #. Tag: para
-#: transactions.xml:342
-#, no-c-format
+#: transactions.xml:356
+#, fuzzy, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
-"transaction and close the <literal>Session</literal> immediately (discussed "
-"later in more detail). If your <literal>Session</literal> is bound to the "
-"application, you have to stop the application. Rolling back the database "
-"transaction doesn't put your business objects back into the state they were "
-"at the start of the transaction. This means the database state and the "
-"business objects do get out of sync. Usually this is not a problem, because "
-"exceptions are not recoverable and you have to start over after rollback "
-"anyway."
+"transaction and close the <literal>Session</literal> immediately (this is "
+"discussed in more detail later in the chapter). If your <literal>Session</"
+"literal> is bound to the application, you have to stop the application. "
+"Rolling back the database transaction does not put your business objects "
+"back into the state they were at the start of the transaction. This means "
+"that the database state and the business objects will be out of sync. "
+"Usually this is not a problem, because exceptions are not recoverable and "
+"you will have to start over after rollback anyway."
 msgstr ""
 "一个由Hibernate抛出的异常意味着你必须立即回滚数据库事务,并立即关闭"
 "<literal>Session</literal> (稍后会展开讨论)。如果你的<literal>Session</"
@@ -597,18 +608,18 @@
 "行。"
 
 #. Tag: para
-#: transactions.xml:354
-#, no-c-format
+#: transactions.xml:368
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>Session</literal> caches every object that is in persistent "
-"state (watched and checked for dirty state by Hibernate). This means it "
-"grows endlessly until you get an OutOfMemoryException, if you keep it open "
-"for a long time or simply load too much data. One solution for this is to "
-"call <literal>clear()</literal> and <literal>evict()</literal> to manage the "
-"<literal>Session</literal> cache, but you most likely should consider a "
-"Stored Procedure if you need mass data operations. Some solutions are shown "
-"in <xref linkend=\"batch\"/>. Keeping a <literal>Session</literal> open for "
-"the duration of a user session also means a high probability of stale data."
+"The <literal>Session</literal> caches every object that is in a persistent "
+"state (watched and checked for dirty state by Hibernate). If you keep it "
+"open for a long time or simply load too much data, it will grow endlessly "
+"until you get an OutOfMemoryException. One solution is to call <literal>clear"
+"()</literal> and <literal>evict()</literal> to manage the <literal>Session</"
+"literal> cache, but you should consider a Stored Procedure if you need mass "
+"data operations. Some solutions are shown in <xref linkend=\"batch\"/>. "
+"Keeping a <literal>Session</literal> open for the duration of a user session "
+"also means a higher probability of stale data."
 msgstr ""
 "<literal>Session</literal> 缓存了处于持久化状态的每个对象(Hibernate会监视和"
 "检查脏数据)。 这意味着,如果你让<literal>Session</literal>打开很长一段时间,"
@@ -620,21 +631,21 @@
 "literal>打开也意味着出现脏数据的可能性很高。"
 
 #. Tag: title
-#: transactions.xml:372
+#: transactions.xml:386
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "数据库事务声明"
 
 #. Tag: para
-#: transactions.xml:374
+#: transactions.xml:388
 #, fuzzy, no-c-format
 msgid ""
-"Database (or system) transaction boundaries are always necessary. No "
+"Database, or system, transaction boundaries are always necessary. No "
 "communication with the database can occur outside of a database transaction "
 "(this seems to confuse many developers who are used to the auto-commit "
 "mode). Always use clear transaction boundaries, even for read-only "
 "operations. Depending on your isolation level and database capabilities this "
-"might not be required but there is no downside if you always demarcate "
+"might not be required, but there is no downside if you always demarcate "
 "transactions explicitly. Certainly, a single database transaction is going "
 "to perform better than many small transactions, even for reading data."
 msgstr ""
@@ -645,18 +656,18 @@
 "独的数据库事务总是比很多琐碎的事务性能更好,即时对读数据而言也是一样。"
 
 #. Tag: para
-#: transactions.xml:384
-#, no-c-format
+#: transactions.xml:398
+#, fuzzy, no-c-format
 msgid ""
-"A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
-"or Swing applications) and managed J2EE environments. In a non-managed "
+"A Hibernate application can run in non-managed (i.e., standalone, simple "
+"Web- or Swing applications) and managed J2EE environments. In a non-managed "
 "environment, Hibernate is usually responsible for its own database "
 "connection pool. The application developer has to manually set transaction "
-"boundaries, in other words, begin, commit, or rollback database transactions "
-"himself. A managed environment usually provides container-managed "
-"transactions (CMT), with the transaction assembly defined declaratively in "
-"deployment descriptors of EJB session beans, for example. Programmatic "
-"transaction demarcation is then no longer necessary."
+"boundaries (begin, commit, or rollback database transactions) themselves. A "
+"managed environment usually provides container-managed transactions (CMT), "
+"with the transaction assembly defined declaratively (in deployment "
+"descriptors of EJB session beans, for example). Programmatic transaction "
+"demarcation is then no longer necessary."
 msgstr ""
 "一个Hibernate应用程序可以运行在非托管环境中(也就是独立运行的应用程序,简单"
 "Web应用程序, 或者Swing图形桌面应用程序),也可以运行在托管的J2EE环境中。在一"
@@ -667,12 +678,12 @@
 "<literal>Session</literal> 的同步也可以自动完成。"
 
 #. Tag: para
-#: transactions.xml:394
+#: transactions.xml:408
 #, fuzzy, no-c-format
 msgid ""
 "However, it is often desirable to keep your persistence layer portable "
 "between non-managed resource-local environments, and systems that can rely "
-"on JTA but use BMT instead of CMT. In both cases you'd use programmatic "
+"on JTA but use BMT instead of CMT. In both cases use programmatic "
 "transaction demarcation. Hibernate offers a wrapper API called "
 "<literal>Transaction</literal> that translates into the native transaction "
 "system of your deployment environment. This API is actually optional, but we "
@@ -685,59 +696,59 @@
 "烈 推荐你使用,除非你用CMT session bean。"
 
 #. Tag: para
-#: transactions.xml:403
-#, no-c-format
+#: transactions.xml:417
+#, fuzzy, no-c-format
 msgid ""
-"Usually, ending a <literal>Session</literal> involves four distinct phases:"
+"Ending a <literal>Session</literal> usually involves four distinct phases:"
 msgstr "通常情况下,结束 <literal>Session</literal> 包含了四个不同的阶段:"
 
 #. Tag: para
-#: transactions.xml:409
+#: transactions.xml:423
 #, no-c-format
 msgid "flush the session"
 msgstr "同步session(flush,刷出到磁盘)"
 
 #. Tag: para
-#: transactions.xml:414
+#: transactions.xml:428
 #, no-c-format
 msgid "commit the transaction"
 msgstr "提交事务"
 
 #. Tag: para
-#: transactions.xml:419
+#: transactions.xml:433
 #, no-c-format
 msgid "close the session"
 msgstr "关闭session"
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:438
 #, no-c-format
 msgid "handle exceptions"
 msgstr "处理异常"
 
 #. Tag: para
-#: transactions.xml:430
-#, no-c-format
+#: transactions.xml:444
+#, fuzzy, no-c-format
 msgid ""
-"Flushing the session has been discussed earlier, we'll now have a closer "
-"look at transaction demarcation and exception handling in both managed- and "
-"non-managed environments."
+"We discussed Flushing the session earlier, so we will now have a closer look "
+"at transaction demarcation and exception handling in both managed and non-"
+"managed environments."
 msgstr ""
 "session的同步(flush,刷出)前面已经讨论过了,我们现在进一步考察在托管和非托管"
 "环境下的事务声明和异常处理。"
 
 #. Tag: title
-#: transactions.xml:437
+#: transactions.xml:451
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "非托管环境"
 
 #. Tag: para
-#: transactions.xml:439
-#, no-c-format
+#: transactions.xml:453
+#, fuzzy, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
-"connections are usually handled by simple (i.e. non-DataSource) connection "
+"connections are usually handled by simple (i.e., non-DataSource) connection "
 "pools from which Hibernate obtains connections as needed. The session/"
 "transaction handling idiom looks like this:"
 msgstr ""
@@ -745,7 +756,7 @@
 "非DataSource)连接池机制 来处理。session/transaction处理方式如下所示:"
 
 #. Tag: programlisting
-#: transactions.xml:446
+#: transactions.xml:460
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -769,12 +780,12 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:448
+#: transactions.xml:462
 #, fuzzy, no-c-format
 msgid ""
-"You don't have to <literal>flush()</literal> the <literal>Session</literal> "
-"explicitly - the call to <literal>commit()</literal> automatically triggers "
-"the synchronization (depending upon the <link linkend=\"objectstate-flushing"
+"You do not have to <literal>flush()</literal> the <literal>Session</literal> "
+"explicitly: the call to <literal>commit()</literal> automatically triggers "
+"the synchronization depending on the <link linkend=\"objectstate-flushing"
 "\">FlushMode</link> for the session. A call to <literal>close()</literal> "
 "marks the end of a session. The main implication of <literal>close()</"
 "literal> is that the JDBC connection will be relinquished by the session. "
@@ -788,16 +799,16 @@
 "下都可以运行。"
 
 #. Tag: para
-#: transactions.xml:457
-#, no-c-format
+#: transactions.xml:471
+#, fuzzy, no-c-format
 msgid ""
-"A much more flexible solution is Hibernate's built-in \"current session\" "
-"context management, as described earlier:"
+"As outlined earlier, a much more flexible solution is Hibernate's built-in "
+"\"current session\" context management:"
 msgstr ""
 "更加灵活的方案是Hibernate内置的\"current session\"上下文管理,前文已经讲过:"
 
 #. Tag: programlisting
-#: transactions.xml:462
+#: transactions.xml:476
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -816,17 +827,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:464
-#, no-c-format
+#: transactions.xml:478
+#, fuzzy, no-c-format
 msgid ""
-"You will very likely never see these code snippets in a regular application; "
-"fatal (system) exceptions should always be caught at the \"top\". In other "
-"words, the code that executes Hibernate calls (in the persistence layer) and "
-"the code that handles <literal>RuntimeException</literal> (and usually can "
-"only clean up and exit) are in different layers. The current context "
-"management by Hibernate can significantly simplify this design, as all you "
-"need is access to a <literal>SessionFactory</literal>. Exception handling is "
-"discussed later in this chapter."
+"You will not see these code snippets in a regular application; fatal "
+"(system) exceptions should always be caught at the \"top\". In other words, "
+"the code that executes Hibernate calls in the persistence layer, and the "
+"code that handles <literal>RuntimeException</literal> (and usually can only "
+"clean up and exit), are in different layers. The current context management "
+"by Hibernate can significantly simplify this design by accessing a "
+"<literal>SessionFactory</literal>. Exception handling is discussed later in "
+"this chapter."
 msgstr ""
 "你很可能从未在一个通常的应用程序的业务代码中见过这样的代码片断:致命的(系"
 "统)异常应该总是 在应用程序“顶层”被捕获。换句话说,执行Hibernate调用的代码"
@@ -836,12 +847,12 @@
 "处理将在本章稍后进行讨论。"
 
 #. Tag: para
-#: transactions.xml:474
-#, no-c-format
+#: transactions.xml:488
+#, fuzzy, no-c-format
 msgid ""
-"Note that you should select <literal>org.hibernate.transaction."
-"JDBCTransactionFactory</literal> (which is the default), and for the second "
-"example <literal>\"thread\"</literal> as your <literal>hibernate."
+"You should select <literal>org.hibernate.transaction.JDBCTransactionFactory</"
+"literal>, which is the default, and for the second example select <literal>"
+"\"thread\"</literal> as your <literal>hibernate."
 "current_session_context_class</literal>."
 msgstr ""
 "请注意,你应该选择 <literal>org.hibernate.transaction."
@@ -850,17 +861,17 @@
 "\"thread\"</literal>"
 
 #. Tag: title
-#: transactions.xml:483
+#: transactions.xml:497
 #, no-c-format
 msgid "Using JTA"
 msgstr "使用JTA"
 
 #. Tag: para
-#: transactions.xml:485
-#, no-c-format
+#: transactions.xml:499
+#, fuzzy, no-c-format
 msgid ""
-"If your persistence layer runs in an application server (e.g. behind EJB "
-"session beans), every datasource connection obtained by Hibernate will "
+"If your persistence layer runs in an application server (for example, behind "
+"EJB session beans), every datasource connection obtained by Hibernate will "
 "automatically be part of the global JTA transaction. You can also install a "
 "standalone JTA implementation and use it without EJB. Hibernate offers two "
 "strategies for JTA integration."
@@ -870,12 +881,12 @@
 "独立的JTA实现,使用它而不使用EJB。Hibernate提供了两种策略进行JTA集成。"
 
 #. Tag: para
-#: transactions.xml:492
-#, no-c-format
+#: transactions.xml:506
+#, fuzzy, no-c-format
 msgid ""
-"If you use bean-managed transactions (BMT) Hibernate will tell the "
+"If you use bean-managed transactions (BMT), Hibernate will tell the "
 "application server to start and end a BMT transaction if you use the "
-"<literal>Transaction</literal> API. So, the transaction management code is "
+"<literal>Transaction</literal> API. The transaction management code is "
 "identical to the non-managed environment."
 msgstr ""
 "如果你使用bean管理事务(BMT),可以通过使用Hibernate的 <literal>Transaction</"
@@ -883,7 +894,7 @@
 "环境下是一样的。"
 
 #. Tag: programlisting
-#: transactions.xml:498
+#: transactions.xml:512
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -907,20 +918,19 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:500
-#, no-c-format
+#: transactions.xml:514
+#, fuzzy, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
 "the <literal>getCurrentSession()</literal> functionality for easy context "
-"propagation, you will have to use the JTA <literal>UserTransaction</literal> "
-"API directly:"
+"propagation, use the JTA <literal>UserTransaction</literal> API directly:"
 msgstr ""
 "如果你希望使用与事务绑定的<literal>Session</literal>,也就是使用"
 "<literal>getCurrentSession()</literal>来简化上下文管理,你将不得不直接使用"
 "JTA <literal>UserTransaction</literal>API。"
 
 #. Tag: programlisting
-#: transactions.xml:506
+#: transactions.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -943,17 +953,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:508
+#: transactions.xml:522
 #, fuzzy, no-c-format
 msgid ""
-"With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programmatically, hence, the code is reduced to:"
+"With CMT, transaction demarcation is completed in session bean deployment "
+"descriptors, not programmatically. The code is reduced to:"
 msgstr ""
 "在CMT方式下,事务声明是在session bean的部署描述符中,而不需要编程。 因此,代"
 "码被简化为:"
 
 #. Tag: programlisting
-#: transactions.xml:513
+#: transactions.xml:527
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -965,15 +975,15 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:515
-#, no-c-format
+#: transactions.xml:529
+#, fuzzy, no-c-format
 msgid ""
-"In a CMT/EJB even rollback happens automatically, since an unhandled "
+"In a CMT/EJB, even rollback happens automatically. An unhandled "
 "<literal>RuntimeException</literal> thrown by a session bean method tells "
-"the container to set the global transaction to rollback. <emphasis>This "
-"means you do not need to use the Hibernate <literal>Transaction</literal> "
-"API at all with BMT or CMT, and you get automatic propagation of the "
-"\"current\" Session bound to the transaction.</emphasis>"
+"the container to set the global transaction to rollback. <emphasis>You do "
+"not need to use the Hibernate <literal>Transaction</literal> API at all with "
+"BMT or CMT, and you get automatic propagation of the \"current\" Session "
+"bound to the transaction.</emphasis>"
 msgstr ""
 "在CMT/EJB中甚至会自动rollback,因为假若有未捕获的<literal>RuntimeException</"
 "literal>从session bean方法中抛出,这就会通知容器把全局事务回滚。<emphasis>这"
@@ -981,17 +991,16 @@
 "literal> API ,你自动得到了绑定到事务的“当前”Session。 </emphasis>"
 
 #. Tag: para
-#: transactions.xml:523
+#: transactions.xml:537
 #, fuzzy, no-c-format
 msgid ""
-"Note that you should choose <literal>org.hibernate.transaction."
-"JTATransactionFactory</literal> if you use JTA directly (BMT), and "
-"<literal>org.hibernate.transaction.CMTTransactionFactory</literal> in a CMT "
-"session bean, when you configure Hibernate's transaction factory. Remember "
-"to also set <literal>hibernate.transaction.manager_lookup_class</literal>. "
-"Furthermore, make sure that your <literal>hibernate."
-"current_session_context_class</literal> is either unset (backwards "
-"compatibility), or set to <literal>\"jta\"</literal>."
+"When configuring Hibernate's transaction factory, choose <literal>org."
+"hibernate.transaction.JTATransactionFactory</literal> if you use JTA "
+"directly (BMT), and <literal>org.hibernate.transaction."
+"CMTTransactionFactory</literal> in a CMT session bean. Remember to also set "
+"<literal>hibernate.transaction.manager_lookup_class</literal>. Ensure that "
+"your <literal>hibernate.current_session_context_class</literal> is either "
+"unset (backwards compatibility), or is set to <literal>\"jta\"</literal>."
 msgstr ""
 "注意,当你配置Hibernate的transaction factory的时候,在直接使用JTA的时候"
 "(BMT),你应该选择<literal>org.hibernate.transaction.JTATransactionFactory</"
@@ -1002,21 +1011,21 @@
 "<literal>\"jta\"</literal>。"
 
 #. Tag: para
-#: transactions.xml:532
+#: transactions.xml:546
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>getCurrentSession()</literal> operation has one downside in a "
 "JTA environment. There is one caveat to the use of <literal>after_statement</"
 "literal> connection release mode, which is then used by default. Due to a "
-"silly limitation of the JTA spec, it is not possible for Hibernate to "
+"limitation of the JTA spec, it is not possible for Hibernate to "
 "automatically clean up any unclosed <literal>ScrollableResults</literal> or "
 "<literal>Iterator</literal> instances returned by <literal>scroll()</"
 "literal> or <literal>iterate()</literal>. You <emphasis>must</emphasis> "
 "release the underlying database cursor by calling <literal>ScrollableResults."
 "close()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly "
-"from a <literal>finally</literal> block. (Of course, most applications can "
-"easily avoid using <literal>scroll()</literal> or <literal>iterate()</"
-"literal> at all from the JTA or CMT code.)"
+"from a <literal>finally</literal> block. Most applications can easily avoid "
+"using <literal>scroll()</literal> or <literal>iterate()</literal> from the "
+"JTA or CMT code.)"
 msgstr ""
 "<literal>getCurrentSession()</literal>在JTA环境中有一个弊端。对"
 "<literal>after_statement</literal>连接释放方式有一个警告,这是被默认使用的。"
@@ -1030,23 +1039,23 @@
 "literal>。)"
 
 #. Tag: title
-#: transactions.xml:548
+#: transactions.xml:562
 #, no-c-format
 msgid "Exception handling"
 msgstr "异常处理"
 
 #. Tag: para
-#: transactions.xml:550
-#, no-c-format
+#: transactions.xml:564
+#, fuzzy, no-c-format
 msgid ""
-"If the <literal>Session</literal> throws an exception (including any "
-"<literal>SQLException</literal>), you should immediately rollback the "
-"database transaction, call <literal>Session.close()</literal> and discard "
-"the <literal>Session</literal> instance. Certain methods of "
-"<literal>Session</literal> will <emphasis>not</emphasis> leave the session "
-"in a consistent state. No exception thrown by Hibernate can be treated as "
-"recoverable. Ensure that the <literal>Session</literal> will be closed by "
-"calling <literal>close()</literal> in a <literal>finally</literal> block."
+"If the <literal>Session</literal> throws an exception, including any "
+"<literal>SQLException</literal>, immediately rollback the database "
+"transaction, call <literal>Session.close()</literal> and discard the "
+"<literal>Session</literal> instance. Certain methods of <literal>Session</"
+"literal> will <emphasis>not</emphasis> leave the session in a consistent "
+"state. No exception thrown by Hibernate can be treated as recoverable. "
+"Ensure that the <literal>Session</literal> will be closed by calling "
+"<literal>close()</literal> in a <literal>finally</literal> block."
 msgstr ""
 "如果 <literal>Session</literal> 抛出异常 (包括任何<literal>SQLException</"
 "literal>), 你应该立即回滚数据库事务,调用 <literal>Session.close()</"
@@ -1056,19 +1065,19 @@
 "</literal>方法,以关闭掉 <literal>Session</literal>。"
 
 #. Tag: para
-#: transactions.xml:561
-#, no-c-format
+#: transactions.xml:575
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
-"that can occur in a Hibernate persistence layer, is an unchecked exception "
-"(it wasn't in older versions of Hibernate). In our opinion, we shouldn't "
+"that can occur in a Hibernate persistence layer, is an unchecked exception. "
+"It was not in older versions of Hibernate. In our opinion, we should not "
 "force the application developer to catch an unrecoverable exception at a low "
 "layer. In most systems, unchecked and fatal exceptions are handled in one of "
-"the first frames of the method call stack (i.e. in higher layers) and an "
-"error message is presented to the application user (or some other "
-"appropriate action is taken). Note that Hibernate might also throw other "
-"unchecked exceptions which are not a <literal>HibernateException</literal>. "
-"These are, again, not recoverable and appropriate action should be taken."
+"the first frames of the method call stack (i.e., in higher layers) and "
+"either an error message is presented to the application user or some other "
+"appropriate action is taken. Note that Hibernate might also throw other "
+"unchecked exceptions that are not a <literal>HibernateException</literal>. "
+"These are not recoverable and appropriate action should be taken."
 msgstr ""
 "<literal>HibernateException</literal>是一个非检查期异常(这不同于Hibernate老"
 "的版本), 它封装了Hibernate持久层可能出现的大多数错误。我们的观点是,不应该"
@@ -1080,7 +1089,7 @@
 "处理。"
 
 #. Tag: para
-#: transactions.xml:573
+#: transactions.xml:587
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate wraps <literal>SQLException</literal>s thrown while interacting "
@@ -1093,9 +1102,9 @@
 "<literal>SQLExceptionConverter</literal> attached to the "
 "<literal>SessionFactory</literal>. By default, the "
 "<literal>SQLExceptionConverter</literal> is defined by the configured "
-"dialect; however, it is also possible to plug in a custom implementation "
-"(see the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
-"class for details). The standard <literal>JDBCException</literal> subtypes "
+"dialect. However, it is also possible to plug in a custom implementation. "
+"See the javadocs for the <literal>SQLExceptionConverterFactory</literal> "
+"class for details. The standard <literal>JDBCException</literal> subtypes "
 "are:"
 msgstr ""
 "在和数据库进行交互时,Hibernate把捕获的<literal>SQLException</literal>封装为"
@@ -1111,68 +1120,68 @@
 "<literal>JDBCException</literal>子类型是:"
 
 #. Tag: para
-#: transactions.xml:589
-#, no-c-format
+#: transactions.xml:603
+#, fuzzy, no-c-format
 msgid ""
-"<literal>JDBCConnectionException</literal> - indicates an error with the "
+"<literal>JDBCConnectionException</literal>: indicates an error with the "
 "underlying JDBC communication."
 msgstr ""
 "<literal>JDBCConnectionException</literal> - 指明底层的JDBC通讯出现错误"
 
 #. Tag: para
-#: transactions.xml:595
-#, no-c-format
+#: transactions.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
+"<literal>SQLGrammarException</literal>: indicates a grammar or syntax "
 "problem with the issued SQL."
 msgstr ""
 "<literal>SQLGrammarException</literal> - 指明发送的SQL语句的语法或者格式错误"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:615
+#, fuzzy, no-c-format
 msgid ""
-"<literal>ConstraintViolationException</literal> - indicates some form of "
+"<literal>ConstraintViolationException</literal>: indicates some form of "
 "integrity constraint violation."
 msgstr ""
 "<literal>ConstraintViolationException</literal> - 指明某种类型的约束违例错误"
 
 #. Tag: para
-#: transactions.xml:607
-#, no-c-format
+#: transactions.xml:621
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
+"<literal>LockAcquisitionException</literal>: indicates an error acquiring a "
 "lock level necessary to perform the requested operation."
 msgstr ""
 "<literal>LockAcquisitionException</literal> - 指明了在执行请求操作时,获取 所"
 "需的锁级别时出现的错误。"
 
 #. Tag: para
-#: transactions.xml:613
-#, no-c-format
+#: transactions.xml:627
+#, fuzzy, no-c-format
 msgid ""
-"<literal>GenericJDBCException</literal> - a generic exception which did not "
+"<literal>GenericJDBCException</literal>: a generic exception which did not "
 "fall into any of the other categories."
 msgstr "<literal>GenericJDBCException</literal> - 不属于任何其他种类的原生异常"
 
 #. Tag: title
-#: transactions.xml:623
+#: transactions.xml:637
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "事务超时"
 
 #. Tag: para
-#: transactions.xml:625
+#: transactions.xml:639
 #, fuzzy, no-c-format
 msgid ""
-"One extremely important feature provided by a managed environment like EJB "
-"that is never provided for non-managed code is transaction timeout. "
-"Transaction timeouts ensure that no misbehaving transaction can indefinitely "
-"tie up resources while returning no response to the user. Outside a managed "
-"(JTA) environment, Hibernate cannot fully provide this functionality. "
-"However, Hibernate can at least control data access operations, ensuring "
-"that database level deadlocks and queries with huge result sets are limited "
-"by a defined timeout. In a managed environment, Hibernate can delegate "
+"An important feature provided by a managed environment like EJB, that is "
+"never provided for non-managed code, is transaction timeout. Transaction "
+"timeouts ensure that no misbehaving transaction can indefinitely tie up "
+"resources while returning no response to the user. Outside a managed (JTA) "
+"environment, Hibernate cannot fully provide this functionality. However, "
+"Hibernate can at least control data access operations, ensuring that "
+"database level deadlocks and queries with huge result sets are limited by a "
+"defined timeout. In a managed environment, Hibernate can delegate "
 "transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
@@ -1184,7 +1193,7 @@
 "Hibernate <literal>Transaction</literal>对象进行抽象。"
 
 #. Tag: programlisting
-#: transactions.xml:638
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1209,33 +1218,32 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:640
-#, no-c-format
+#: transactions.xml:654
+#, fuzzy, no-c-format
 msgid ""
-"Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
-"where transaction timeouts must be defined declaratively."
+"<literal>setTimeout()</literal> cannot be called in a CMT bean, where "
+"transaction timeouts must be defined declaratively."
 msgstr ""
 "注意<literal>setTimeout()</literal>不应该在CMT bean中调用,此时事务超时值应该"
 "是被声明式定义的。"
 
 #. Tag: title
-#: transactions.xml:650
+#: transactions.xml:664
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "乐观并发控制(Optimistic concurrency control)"
 
 #. Tag: para
-#: transactions.xml:652
-#, no-c-format
+#: transactions.xml:666
+#, fuzzy, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
-"scalability is optimistic concurrency control with versioning. Version "
+"scalability, is optimistic concurrency control with versioning. Version "
 "checking uses version numbers, or timestamps, to detect conflicting updates "
-"(and to prevent lost updates). Hibernate provides for three possible "
-"approaches to writing application code that uses optimistic concurrency. The "
-"use cases we show are in the context of long conversations, but version "
-"checking also has the benefit of preventing lost updates in single database "
-"transactions."
+"and to prevent lost updates. Hibernate provides three possible approaches to "
+"writing application code that uses optimistic concurrency. The use cases we "
+"discuss are in the context of long conversations, but version checking also "
+"has the benefit of preventing lost updates in single database transactions."
 msgstr ""
 "唯一能够同时保持高并发和高可伸缩性的方法就是使用带版本化的乐观并发控制。版本"
 "检查使用版本号、 或者时间戳来检测更新冲突(并且防止更新丢失)。Hibernate为使"
@@ -1244,22 +1252,22 @@
 "单个数据库事务范围内,版本检查也提供了防止更新丢失的好处。"
 
 #. Tag: title
-#: transactions.xml:663
+#: transactions.xml:677
 #, no-c-format
 msgid "Application version checking"
 msgstr "应用程序级别的版本检查(Application version checking)"
 
 #. Tag: para
-#: transactions.xml:665
-#, no-c-format
+#: transactions.xml:679
+#, fuzzy, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
 "the database occurs in a new <literal>Session</literal> and the developer is "
 "responsible for reloading all persistent instances from the database before "
-"manipulating them. This approach forces the application to carry out its own "
-"version checking to ensure conversation transaction isolation. This approach "
-"is the least efficient in terms of database access. It is the approach most "
-"similar to entity EJBs."
+"manipulating them. The application is forced to carry out its own version "
+"checking to ensure conversation transaction isolation. This approach is the "
+"least efficient in terms of database access. It is the approach most similar "
+"to entity EJBs."
 msgstr ""
 "未能充分利用Hibernate功能的实现代码中,每次和数据库交互都需要一个新的 "
 "<literal>Session</literal>,而且开发人员必须在显示数据之前从数据库中重 新载入"
@@ -1267,7 +1275,7 @@
 "离,从数据访问的角度来说是最低效的。这种使用方式和 entity EJB最相似。"
 
 #. Tag: programlisting
-#: transactions.xml:674
+#: transactions.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1285,7 +1293,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:676
+#: transactions.xml:690
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1296,15 +1304,15 @@
 "射,如果对象 是脏数据,在同步的时候,Hibernate会自动增加版本号。"
 
 #. Tag: para
-#: transactions.xml:682
-#, no-c-format
+#: transactions.xml:696
+#, fuzzy, no-c-format
 msgid ""
-"Of course, if you are operating in a low-data-concurrency environment and "
-"don't require version checking, you may use this approach and just skip the "
-"version check. In that case, <emphasis>last commit wins</emphasis> will be "
-"the default strategy for your long conversations. Keep in mind that this "
-"might confuse the users of the application, as they might experience lost "
-"updates without error messages or a chance to merge conflicting changes."
+"If you are operating in a low-data-concurrency environment, and do not "
+"require version checking, you can use this approach and skip the version "
+"check. In this case, <emphasis>last commit wins</emphasis> is the default "
+"strategy for long conversations. Be aware that this might confuse the users "
+"of the application, as they might experience lost updates without error "
+"messages or a chance to merge conflicting changes."
 msgstr ""
 "当然,如果你的应用是在一个低数据并发环境下,并不需要版本检查的话,你照样可以"
 "使用 这种方式,只不过跳过版本检查就是了。在这种情况下,<emphasis>最晚提交生效"
@@ -1313,14 +1321,14 @@
 "丢失掉却没 有出错信息,或者需要合并更改冲突的情况。"
 
 #. Tag: para
-#: transactions.xml:691
+#: transactions.xml:705
 #, fuzzy, no-c-format
 msgid ""
-"Clearly, manual version checking is only feasible in very trivial "
-"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified objects have to be checked. "
-"Hibernate offers automatic version checking with either an extended "
-"<literal>Session</literal> or detached instances as the design paradigm."
+"Manual version checking is only feasible in trivial circumstances and not "
+"practical for most applications. Often not only single instances, but "
+"complete graphs of modified objects, have to be checked. Hibernate offers "
+"automatic version checking with either an extended <literal>Session</"
+"literal> or detached instances as the design paradigm."
 msgstr ""
 "很明显,手工进行版本检查只适合于某些软件规模非常小的应用场景,对于大多数软件"
 "应用场景 来说并不现实。通常情况下,不仅是单个对象实例需要进行版本检查,整个被"
@@ -1329,22 +1337,22 @@
 "检查。"
 
 #. Tag: title
-#: transactions.xml:702
+#: transactions.xml:716
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "扩展周期的session和自动版本化"
 
 #. Tag: para
-#: transactions.xml:704
-#, no-c-format
+#: transactions.xml:718
+#, fuzzy, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
-"are used for the whole conversation, known as <emphasis>session-per-"
+"that are used for the whole conversation are known as <emphasis>session-per-"
 "conversation</emphasis>. Hibernate checks instance versions at flush time, "
-"throwing an exception if concurrent modification is detected. It's up to the "
-"developer to catch and handle this exception (common options are the "
+"throwing an exception if concurrent modification is detected. It is up to "
+"the developer to catch and handle this exception. Common options are the "
 "opportunity for the user to merge changes or to restart the business "
-"conversation with non-stale data)."
+"conversation with non-stale data."
 msgstr ""
 "单个 <literal>Session</literal>实例和它所关联的所有持久化对象实例都被用于整"
 "个 对话,这被称为<emphasis>session-per-conversation</emphasis>。Hibernate在同"
@@ -1353,21 +1361,21 @@
 "数据情况下重新进行业务对话的机会)。"
 
 #. Tag: para
-#: transactions.xml:713
-#, no-c-format
+#: transactions.xml:727
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
 "connection when waiting for user interaction. This approach is the most "
-"efficient in terms of database access. The application need not concern "
-"itself with version checking or with reattaching detached instances, nor "
-"does it have to reload instances in every database transaction."
+"efficient in terms of database access. The application does not version "
+"check or reattach detached instances, nor does it have to reload instances "
+"in every database transaction."
 msgstr ""
 "在等待用户交互的时候, <literal>Session</literal> 断开底层的JDBC连接。这种方"
 "式 以数据库访问的角度来说是最高效的方式。应用程序不需要关心版本检查或脱管对象"
 "实例 的重新关联,在每个数据库事务中,应用程序也不需要载入读取对象实例。"
 
 #. Tag: programlisting
-#: transactions.xml:721
+#: transactions.xml:735
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1382,24 +1390,23 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:722
-#, no-c-format
+#: transactions.xml:736
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>foo</literal> object still knows which <literal>Session</"
-"literal> it was loaded in. Beginning a new database transaction on an old "
-"session obtains a new connection and resumes the session. Committing a "
-"database transaction disconnects a session from the JDBC connection and "
-"returns the connection to the pool. After reconnection, to force a version "
-"check on data you aren't updating, you may call <literal>Session.lock()</"
-"literal> with <literal>LockMode.READ</literal> on any objects that might "
-"have been updated by another transaction. You don't need to lock any data "
-"that you <emphasis>are</emphasis> updating. Usually you would set "
-"<literal>FlushMode.MANUAL</literal> on an extended <literal>Session</"
-"literal>, so that only the last database transaction cycle is allowed to "
-"actually persist all modifications made in this conversation. Hence, only "
-"this last database transaction would include the <literal>flush()</literal> "
-"operation, and then also <literal>close()</literal> the session to end the "
-"conversation."
+"The <literal>foo</literal> object knows which <literal>Session</literal> it "
+"was loaded in. Beginning a new database transaction on an old session "
+"obtains a new connection and resumes the session. Committing a database "
+"transaction disconnects a session from the JDBC connection and returns the "
+"connection to the pool. After reconnection, to force a version check on data "
+"you are not updating, you can call <literal>Session.lock()</literal> with "
+"<literal>LockMode.READ</literal> on any objects that might have been updated "
+"by another transaction. You do not need to lock any data that you "
+"<emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode."
+"MANUAL</literal> on an extended <literal>Session</literal>, so that only the "
+"last database transaction cycle is allowed to actually persist all "
+"modifications made in this conversation. Only this last database transaction "
+"will include the <literal>flush()</literal> operation, and then "
+"<literal>close()</literal> the session to end the conversation."
 msgstr ""
 "<literal>foo</literal>对象知道它是在哪个<literal>Session</literal>中被装入"
 "的。在一个旧session中开启一个新的数据库事务,会导致session获取一个新的连接,"
@@ -1414,16 +1421,16 @@
 "literal>这个session。"
 
 #. Tag: para
-#: transactions.xml:737
-#, no-c-format
+#: transactions.xml:751
+#, fuzzy, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
-"be stored during user think time, e.g. an <literal>HttpSession</literal> "
-"should be kept as small as possible. As the <literal>Session</literal> is "
-"also the (mandatory) first-level cache and contains all loaded objects, we "
-"can probably use this strategy only for a few request/response cycles. You "
-"should use a <literal>Session</literal> only for a single conversation, as "
-"it will soon also have stale data."
+"be stored during user think time (for example, an <literal>HttpSession</"
+"literal> should be kept as small as possible). As the <literal>Session</"
+"literal> is also the first-level cache and contains all loaded objects, we "
+"can probably use this strategy only for a few request/response cycles. Use a "
+"<literal>Session</literal> only for a single conversation as it will soon "
+"have stale data."
 msgstr ""
 "如果在用户思考的过程中,<literal>Session</literal>因为太大了而不能保存,那么"
 "这种模式是有 问题的。举例来说,一个<literal>HttpSession</literal>应该尽可能的"
@@ -1431,27 +1438,33 @@
 "因此 我们只应该在那些少量的request/response情况下使用这种策略。你应该只把一个"
 "<literal>Session</literal>用于单个对话,因为它很快就会出现脏数据。"
 
+#. Tag: title
+#: transactions.xml:762
+#, no-c-format
+msgid "Note"
+msgstr ""
+
 #. Tag: para
-#: transactions.xml:747
-#, no-c-format
+#: transactions.xml:763
+#, fuzzy, no-c-format
 msgid ""
-"(Note that earlier Hibernate versions required explicit disconnection and "
+"Earlier versions of Hibernate required explicit disconnection and "
 "reconnection of a <literal>Session</literal>. These methods are deprecated, "
-"as beginning and ending a transaction has the same effect.)"
+"as beginning and ending a transaction has the same effect."
 msgstr ""
 "(注意,早期的Hibernate版本需要明确的对<literal>Session</literal>进行"
 "disconnec和reconnect。这些方法现在已经过时了,打开事务和关闭事务会起到同样的"
 "效果。)"
 
 #. Tag: para
-#: transactions.xml:753
-#, no-c-format
+#: transactions.xml:769
+#, fuzzy, no-c-format
 msgid ""
-"Also note that you should keep the disconnected <literal>Session</literal> "
-"close to the persistence layer. In other words, use an EJB stateful session "
-"bean to hold the <literal>Session</literal> in a three-tier environment, and "
-"don't transfer it to the web layer (or even serialize it to a separate tier) "
-"to store it in the <literal>HttpSession</literal>."
+"Keep the disconnected <literal>Session</literal> close to the persistence "
+"layer. Use an EJB stateful session bean to hold the <literal>Session</"
+"literal> in a three-tier environment. Do not transfer it to the web layer, "
+"or even serialize it to a separate tier, to store it in the "
+"<literal>HttpSession</literal>."
 msgstr ""
 "此外,也请注意,你应该让与数据库连接断开的<literal>Session</literal>对持久层"
 "保持 关闭状态。换句话说,在三层环境中,使用有状态的EJB session bean来持有"
@@ -1459,13 +1472,13 @@
 "的层),保存在<literal>HttpSession</literal>中。"
 
 #. Tag: para
-#: transactions.xml:761
-#, no-c-format
+#: transactions.xml:777
+#, fuzzy, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
 "emphasis>, is more difficult to implement with automatic current session "
 "context management. You need to supply your own implementation of the "
-"<literal>CurrentSessionContext</literal> for this, see the Hibernate Wiki "
+"<literal>CurrentSessionContext</literal> for this. See the Hibernate Wiki "
 "for examples."
 msgstr ""
 "扩展session模式,或者被称为<emphasis>每次对话一个session(session-per-"
@@ -1474,13 +1487,13 @@
 "Hibernate Wiki以获得示例。"
 
 #. Tag: title
-#: transactions.xml:771
+#: transactions.xml:787
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "脱管对象(deatched object)和自动版本化"
 
 #. Tag: para
-#: transactions.xml:773
+#: transactions.xml:789
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1499,7 +1512,7 @@
 "该对象实例。"
 
 #. Tag: programlisting
-#: transactions.xml:781
+#: transactions.xml:797
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1513,7 +1526,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:783
+#: transactions.xml:799
 #, fuzzy, no-c-format
 msgid ""
 "Again, Hibernate will check instance versions during flush, throwing an "
@@ -1523,12 +1536,12 @@
 "常。"
 
 #. Tag: para
-#: transactions.xml:788
-#, no-c-format
+#: transactions.xml:804
+#, fuzzy, no-c-format
 msgid ""
-"You may also call <literal>lock()</literal> instead of <literal>update()</"
-"literal> and use <literal>LockMode.READ</literal> (performing a version "
-"check, bypassing all caches) if you are sure that the object has not been "
+"You can also call <literal>lock()</literal> instead of <literal>update()</"
+"literal>, and use <literal>LockMode.READ</literal> (performing a version "
+"check and bypassing all caches) if you are sure that the object has not been "
 "modified."
 msgstr ""
 "如果你确信对象没有被修改过,你也可以调用<literal>lock()</literal> 来设置 "
@@ -1536,16 +1549,16 @@
 "<literal>update()</literal>操作。"
 
 #. Tag: title
-#: transactions.xml:797
+#: transactions.xml:813
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "定制自动版本化行为"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:815
+#, fuzzy, no-c-format
 msgid ""
-"You may disable Hibernate's automatic version increment for particular "
+"You can disable Hibernate's automatic version increment for particular "
 "properties and collections by setting the <literal>optimistic-lock</literal> "
 "mapping attribute to <literal>false</literal>. Hibernate will then no longer "
 "increment versions if the property is dirty."
@@ -1555,19 +1568,19 @@
 "的话,如果该属性 脏数据,Hibernate将不再增加版本号。"
 
 #. Tag: para
-#: transactions.xml:806
+#: transactions.xml:822
 #, fuzzy, no-c-format
 msgid ""
-"Legacy database schemas are often static and can't be modified. Or, other "
-"applications might also access the same database and don't know how to "
-"handle version numbers or even timestamps. In both cases, versioning can't "
-"rely on a particular column in a table. To force a version check without a "
-"version or timestamp property mapping, with a comparison of the state of all "
-"fields in a row, turn on <literal>optimistic-lock=\"all\"</literal> in the "
-"<literal>&lt;class&gt;</literal> mapping. Note that this conceptually only "
-"works if Hibernate can compare the old and new state, i.e. if you use a "
-"single long <literal>Session</literal> and not session-per-request-with-"
-"detached-objects."
+"Legacy database schemas are often static and cannot be modified. Or, other "
+"applications might access the same database and will not know how to handle "
+"version numbers or even timestamps. In both cases, versioning cannot rely on "
+"a particular column in a table. To force a version check with a comparison "
+"of the state of all fields in a row but without a version or timestamp "
+"property mapping, turn on <literal>optimistic-lock=\"all\"</literal> in the "
+"<literal>&lt;class&gt;</literal> mapping. This conceptually only works if "
+"Hibernate can compare the old and the new state (i.e., if you use a single "
+"long <literal>Session</literal> and not session-per-request-with-detached-"
+"objects)."
 msgstr ""
 "遗留系统的数据库Schema通常是静态的,不可修改的。或者,其他应用程序也可能访问"
 "同一数据 库,根本无法得知如何处理版本号,甚至时间戳。在以上的所有场景中,实现"
@@ -1579,34 +1592,34 @@
 "request-with-detached-objects模式。"
 
 #. Tag: para
-#: transactions.xml:817
-#, no-c-format
+#: transactions.xml:834
+#, fuzzy, no-c-format
 msgid ""
-"Sometimes concurrent modification can be permitted as long as the changes "
-"that have been made don't overlap. If you set <literal>optimistic-lock="
-"\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>, "
-"Hibernate will only compare dirty fields during flush."
+"Concurrent modification can be permitted in instances where the changes that "
+"have been made do not overlap. If you set <literal>optimistic-lock=\"dirty"
+"\"</literal> when mapping the <literal>&lt;class&gt;</literal>, Hibernate "
+"will only compare dirty fields during flush."
 msgstr ""
 "有些情况下,只要更改不发生交错,并发修改也是允许的。当你在<literal>&lt;"
 "class&gt;</literal> 的映射中设置<literal>optimistic-lock=\"dirty\"</"
 "literal>,Hibernate在同步的时候将只比较有脏 数据的字段。"
 
 #. Tag: para
-#: transactions.xml:823
+#: transactions.xml:840
 #, fuzzy, no-c-format
 msgid ""
-"In both cases, with dedicated version/timestamp columns or with full/dirty "
+"In both cases, with dedicated version/timestamp columns or with a full/dirty "
 "field comparison, Hibernate uses a single <literal>UPDATE</literal> "
-"statement (with an appropriate <literal>WHERE</literal> clause) per entity "
+"statement, with an appropriate <literal>WHERE</literal> clause, per entity "
 "to execute the version check and update the information. If you use "
 "transitive persistence to cascade reattachment to associated entities, "
-"Hibernate might execute unnecessary updates. This is usually not a problem, "
+"Hibernate may execute unnecessary updates. This is usually not a problem, "
 "but <emphasis>on update</emphasis> triggers in the database might be "
 "executed even when no changes have been made to detached instances. You can "
 "customize this behavior by setting <literal>select-before-update=\"true\"</"
 "literal> in the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate "
-"to <literal>SELECT</literal> the instance to ensure that changes did "
-"actually occur, before updating the row."
+"to <literal>SELECT</literal> the instance to ensure that changes did occur "
+"before updating the row."
 msgstr ""
 "在以上所有场景中,不管是专门设置一个版本/时间戳列,还是进行全部字段/脏数据字"
 "段比较, Hibernate都会针对每个实体对象发送一条<literal>UPDATE</literal>(带有"
@@ -1620,45 +1633,45 @@
 "对象的确是被修改过。"
 
 #. Tag: title
-#: transactions.xml:841
-#, no-c-format
-msgid "Pessimistic Locking"
+#: transactions.xml:858
+#, fuzzy, no-c-format
+msgid "Pessimistic locking"
 msgstr "悲观锁定(Pessimistic Locking)"
 
 #. Tag: para
-#: transactions.xml:843
+#: transactions.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "It is not intended that users spend much time worrying about locking "
-"strategies. It's usually enough to specify an isolation level for the JDBC "
+"strategies. It is usually enough to specify an isolation level for the JDBC "
 "connections and then simply let the database do all the work. However, "
-"advanced users may sometimes wish to obtain exclusive pessimistic locks, or "
-"re-obtain locks at the start of a new transaction."
+"advanced users may wish to obtain exclusive pessimistic locks or re-obtain "
+"locks at the start of a new transaction."
 msgstr ""
 "用户其实并不需要花很多精力去担心锁定策略的问题。通常情况下,只要为JDBC连接指"
 "定一下隔 离级别,然后让数据库去搞定一切就够了。然而,高级用户有时候希望进行一"
 "个排它的悲观锁定, 或者在一个新的事务启动的时候,重新进行锁定。"
 
 #. Tag: para
-#: transactions.xml:850
-#, no-c-format
+#: transactions.xml:867
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate will always use the locking mechanism of the database, never lock "
-"objects in memory!"
+"Hibernate will always use the locking mechanism of the database; it never "
+"lock objects in memory."
 msgstr "Hibernate总是使用数据库的锁定机制,从不在内存中锁定对象!"
 
 #. Tag: para
-#: transactions.xml:855
-#, no-c-format
+#: transactions.xml:872
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
-"may be acquired by Hibernate. A lock is obtained by the following mechanisms:"
+"can be acquired by Hibernate. A lock is obtained by the following mechanisms:"
 msgstr ""
 "类<literal>LockMode</literal> 定义了Hibernate所需的不同的锁定级别。一个锁定 "
 "可以通过以下的机制来设置:"
 
 #. Tag: para
-#: transactions.xml:862
+#: transactions.xml:879
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1668,10 +1681,10 @@
 "WRITE</literal>。"
 
 #. Tag: para
-#: transactions.xml:868
-#, no-c-format
+#: transactions.xml:885
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
+"<literal>LockMode.UPGRADE</literal> can be acquired upon explicit user "
 "request using <literal>SELECT ... FOR UPDATE</literal> on databases which "
 "support that syntax."
 msgstr ""
@@ -1679,10 +1692,10 @@
 "发送SQL的时候,锁定级别设置为<literal>LockMode.UPGRADE</literal>"
 
 #. Tag: para
-#: transactions.xml:874
-#, no-c-format
+#: transactions.xml:891
+#, fuzzy, no-c-format
 msgid ""
-"<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
+"<literal>LockMode.UPGRADE_NOWAIT</literal> can be acquired upon explicit "
 "user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> under "
 "Oracle."
 msgstr ""
@@ -1690,19 +1703,19 @@
 "literal> 的时候,锁定级别设置<literal>LockMode.UPGRADE_NOWAIT</literal>"
 
 #. Tag: para
-#: transactions.xml:880
-#, no-c-format
+#: transactions.xml:897
+#, fuzzy, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
-"reads data under Repeatable Read or Serializable isolation level. May be re-"
-"acquired by explicit user request."
+"reads data under Repeatable Read or Serializable isolation level. It can be "
+"re-acquired by explicit user request."
 msgstr ""
 "当Hibernate在“可重复读”或者是“序列化”数据库隔离级别下读取数据的时候,锁定模"
 "式 自动设置为<literal>LockMode.READ</literal>。这种模式也可以通过用户显式指定"
 "进行设置。"
 
 #. Tag: para
-#: transactions.xml:887
+#: transactions.xml:904
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1716,14 +1729,14 @@
 "<literal>update()</literal> 或者<literal>saveOrUpdate()</literal>脱离该模式。"
 
 #. Tag: para
-#: transactions.xml:896
+#: transactions.xml:913
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "\"显式的用户指定\"可以通过以下几种方式之一来表示:"
 
 #. Tag: para
-#: transactions.xml:902
+#: transactions.xml:919
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1733,19 +1746,19 @@
 "literal>。"
 
 #. Tag: para
-#: transactions.xml:907
+#: transactions.xml:924
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "调用<literal>Session.lock()</literal>。"
 
 #. Tag: para
-#: transactions.xml:912
+#: transactions.xml:929
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "调用<literal>Query.setLockMode()</literal>。"
 
 #. Tag: para
-#: transactions.xml:918
+#: transactions.xml:935
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1764,14 +1777,14 @@
 "literal> 方法。"
 
 #. Tag: para
-#: transactions.xml:927
-#, no-c-format
+#: transactions.xml:944
+#, fuzzy, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
 "specified lock mode is <literal>READ</literal>, <literal>UPGRADE</literal> "
-"or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRADE</"
+"or <literal>UPGRADE_NOWAIT</literal>. In the case of <literal>UPGRADE</"
 "literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR "
-"UPDATE</literal> is used.)"
+"UPDATE</literal> is used."
 msgstr ""
 "如果指定的锁定模式是<literal>READ</literal>, <literal>UPGRADE</literal> 或 "
 "<literal>UPGRADE_NOWAIT</literal>,那么<literal>Session.lock()</literal>就 执"
@@ -1780,36 +1793,36 @@
 "句。)"
 
 #. Tag: para
-#: transactions.xml:934
-#, no-c-format
+#: transactions.xml:951
+#, fuzzy, no-c-format
 msgid ""
-"If the database does not support the requested lock mode, Hibernate will use "
-"an appropriate alternate mode (instead of throwing an exception). This "
-"ensures that applications will be portable."
+"If the requested lock mode is not supported by the database, Hibernate uses "
+"an appropriate alternate mode instead of throwing an exception. This ensures "
+"that applications are portable."
 msgstr ""
 "如果数据库不支持用户设置的锁定模式,Hibernate将使用适当的替代模式(而不是扔出"
 "异常)。 这一点可以确保应用程序的可移植性。"
 
 #. Tag: title
-#: transactions.xml:943
-#, no-c-format
-msgid "Connection Release Modes"
+#: transactions.xml:960
+#, fuzzy, no-c-format
+msgid "Connection release modes"
 msgstr "连接释放模式(Connection Release Modes)"
 
 #. Tag: para
-#: transactions.xml:945
-#, no-c-format
+#: transactions.xml:962
+#, fuzzy, no-c-format
 msgid ""
-"The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
-"management was that a <literal>Session</literal> would obtain a connection "
-"when it was first needed and then hold unto that connection until the "
-"session was closed. Hibernate 3.x introduced the notion of connection "
-"release modes to tell a session how to handle its JDBC connections. Note "
-"that the following discussion is pertinent only to connections provided "
-"through a configured <literal>ConnectionProvider</literal>; user-supplied "
-"connections are outside the breadth of this discussion. The different "
-"release modes are identified by the enumerated values of <literal>org."
-"hibernate.ConnectionReleaseMode</literal>:"
+"One of the legacies of Hibernate 2.x JDBC connection management meant that a "
+"<literal>Session</literal> would obtain a connection when it was first "
+"required and then maintain that connection until the session was closed. "
+"Hibernate 3.x introduced the notion of connection release modes that would "
+"instruct a session how to handle its JDBC connections. The following "
+"discussion is pertinent only to connections provided through a configured "
+"<literal>ConnectionProvider</literal>. User-supplied connections are outside "
+"the breadth of this discussion. The different release modes are identified "
+"by the enumerated values of <literal>org.hibernate.ConnectionReleaseMode</"
+"literal>:"
 msgstr ""
 "Hibernate关于JDBC连接管理的旧(2.x)行为是,<literal>Session</literal>在第一次"
 "需要的时候获取一个连接,在session关闭之前一直会持有这个连接。Hibernate引入了"
@@ -1819,63 +1832,62 @@
 "literal>的不同枚举值来使用不用的释放模式:"
 
 #. Tag: para
-#: transactions.xml:959
+#: transactions.xml:976
 #, fuzzy, no-c-format
 msgid ""
-"<literal>ON_CLOSE</literal> - is essentially the legacy behavior described "
-"above. The Hibernate session obtains a connection when it first needs to "
-"perform some JDBC access and holds unto that connection until the session is "
-"closed."
+"<literal>ON_CLOSE</literal>: is the legacy behavior described above. The "
+"Hibernate session obtains a connection when it first needs to perform some "
+"JDBC access and maintains that connection until the session is closed."
 msgstr ""
 "<literal>ON_CLOSE</literal> - 基本上就是上面提到的老式行为。Hibernate session"
 "在第一次需要进行JDBC操作的时候获取连接,然后持有它,直到session关闭。"
 
 #. Tag: para
-#: transactions.xml:966
-#, no-c-format
+#: transactions.xml:983
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
-"<literal>org.hibernate.Transaction</literal> has completed."
+"<literal>AFTER_TRANSACTION</literal>: releases connections after a "
+"<literal>org.hibernate.Transaction</literal> has been completed."
 msgstr ""
 "<literal>AFTER_TRANSACTION</literal> - 在<literal>org.hibernate.Transaction</"
 "literal>结束后释放连接。"
 
 #. Tag: para
-#: transactions.xml:972
-#, no-c-format
+#: transactions.xml:989
+#, fuzzy, no-c-format
 msgid ""
-"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
-"- says to release connections after each and every statement execution. This "
-"aggressive releasing is skipped if that statement leaves open resources "
-"associated with the given session; currently the only situation where this "
-"occurs is through the use of <literal>org.hibernate.ScrollableResults</"
-"literal>."
+"<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release): "
+"releases connections after every statement execution. This aggressive "
+"releasing is skipped if that statement leaves open resources associated with "
+"the given session. Currently the only situation where this occurs is through "
+"the use of <literal>org.hibernate.ScrollableResults</literal>."
 msgstr ""
 "<literal>AFTER_STATEMENT</literal> (也被称做积极释放) - 在每一条语句被执行后"
 "就释放连接。但假若语句留下了与session相关的资源,那就不会被释放。目前唯一的这"
 "种情形就是使用<literal>org.hibernate.ScrollableResults</literal>。"
 
 #. Tag: para
-#: transactions.xml:982
-#, no-c-format
+#: transactions.xml:999
+#, fuzzy, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
-"literal> is used to specify which release mode to use. The possible values:"
+"literal> is used to specify which release mode to use. The possible values "
+"are as follows:"
 msgstr ""
 "<literal>hibernate.connection.release_mode</literal>配置参数用来指定使用哪一"
 "种释放模式。可能的值有:"
 
 #. Tag: para
-#: transactions.xml:989
-#, no-c-format
+#: transactions.xml:1006
+#, fuzzy, no-c-format
 msgid ""
-"<literal>auto</literal> (the default) - this choice delegates to the release "
+"<literal>auto</literal> (the default): this choice delegates to the release "
 "mode returned by the <literal>org.hibernate.transaction.TransactionFactory."
 "getDefaultReleaseMode()</literal> method. For JTATransactionFactory, this "
 "returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransactionFactory, "
-"this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely a good "
-"idea to change this default behavior as failures due to the value of this "
-"setting tend to indicate bugs and/or invalid assumptions in user code."
+"this returns ConnectionReleaseMode.AFTER_TRANSACTION. Do not change this "
+"default behavior as failures due to the value of this setting tend to "
+"indicate bugs and/or invalid assumptions in user code."
 msgstr ""
 "<literal>auto</literal>(默认) - 这一选择把释放模式委派给<literal>org."
 "hibernate.transaction.TransactionFactory.getDefaultReleaseMode()</literal>方"
@@ -1885,24 +1897,23 @@
 "或者给用户代码带来误导。"
 
 #. Tag: para
-#: transactions.xml:999
-#, no-c-format
+#: transactions.xml:1016
+#, fuzzy, no-c-format
 msgid ""
-"<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
-"This setting is left for backwards compatibility, but its use is highly "
-"discouraged."
+"<literal>on_close</literal>: uses ConnectionReleaseMode.ON_CLOSE. This "
+"setting is left for backwards compatibility, but its use is discouraged."
 msgstr ""
 "<literal>on_close</literal> - 使用 ConnectionReleaseMode.ON_CLOSE. 这种方式是"
 "为了向下兼容的,但是已经完全不被鼓励使用了。"
 
 #. Tag: para
-#: transactions.xml:1005
-#, no-c-format
+#: transactions.xml:1022
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
+"<literal>after_transaction</literal>: uses ConnectionReleaseMode."
 "AFTER_TRANSACTION. This setting should not be used in JTA environments. Also "
 "note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a session is "
-"considered to be in auto-commit mode connections will be released as if the "
+"considered to be in auto-commit mode, connections will be released as if the "
 "release mode were AFTER_STATEMENT."
 msgstr ""
 "<literal>after_transaction</literal> - 使用ConnectionReleaseMode."
@@ -1911,18 +1922,18 @@
 "态,连接会像AFTER_STATEMENT那样被释放。"
 
 #. Tag: para
-#: transactions.xml:1013
-#, no-c-format
+#: transactions.xml:1030
+#, fuzzy, no-c-format
 msgid ""
-"<literal>after_statement</literal> - says to use ConnectionReleaseMode."
+"<literal>after_statement</literal>: uses ConnectionReleaseMode."
 "AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvider</"
 "literal> is consulted to see if it supports this setting "
 "(<literal>supportsAggressiveRelease()</literal>). If not, the release mode "
 "is reset to ConnectionReleaseMode.AFTER_TRANSACTION. This setting is only "
 "safe in environments where we can either re-acquire the same underlying JDBC "
-"connection each time we make a call into <literal>ConnectionProvider."
+"connection each time you make a call into <literal>ConnectionProvider."
 "getConnection()</literal> or in auto-commit environments where it does not "
-"matter whether we get back the same connection."
+"matter if we re-establish the same connection."
 msgstr ""
 "<literal>after_statement</literal> - 使用ConnectionReleaseMode."
 "AFTER_STATEMENT。除此之外,会查询配置的<literal>ConnectionProvider</"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-10-25 01:01+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -11,155 +11,193 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:7
+#: tutorial.xml:31
 #, no-c-format
-msgid "Introduction to Hibernate"
-msgstr "Hibernate入门"
+msgid "Tutorial"
+msgstr ""
 
-#. Tag: title
-#: tutorial.xml:10
-#, no-c-format
-msgid "Preface"
-msgstr "前言"
-
 #. Tag: para
-#: tutorial.xml:12
+#: tutorial.xml:33
 #, no-c-format
 msgid ""
-"This chapter is an introductory tutorial for new users of Hibernate. We "
-"start with a simple command line application using an in-memory database and "
-"develop it in easy to understand steps."
+"Intended for new users, this chapter provides an step-by-step introduction "
+"to Hibernate, starting with a simple application using an in-memory "
+"database. The tutorial is based on an earlier tutorial developed by Michael "
+"Gloegl. All code is contained in the <filename>tutorials/web</filename> "
+"directory of the project source."
 msgstr ""
-"本章是面向Hibernate初学者的一个入门教程。我们从一个使用驻留内存式(in-memory)"
-"数据库的简单命令行应用程序开始, 用易于理解的方式逐步开发。"
 
 #. Tag: para
-#: tutorial.xml:18
+#: tutorial.xml:42
 #, no-c-format
 msgid ""
-"This tutorial is intended for new users of Hibernate but requires Java and "
-"SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-party "
-"libraries we name are for JDK 1.4 and 5.0. You might need others for JDK 1.3."
+"This tutorial expects the user have knowledge of both Java and SQL. If you "
+"have a limited knowledge of JAVA or SQL, it is advised that you start with a "
+"good introduction to that technology prior to attempting to learn Hibernate."
 msgstr ""
-"本章面向Hibernate初学者,但需要Java和SQL知识。它是在Michael Goegl所写的指南的"
-"基础上完成的。在这里,我们称第三方库文件是指JDK 1.4和5.0。若使用JDK1.3,你可"
-"能需要其它的库文件。"
 
 #. Tag: para
-#: tutorial.xml:24
+#: tutorial.xml:51
 #, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"The distribution contains another example application under the "
+"<filename>tutorial/eg</filename> project source directory."
 msgstr ""
-"本章的源代码已包含在发布包中,位于<literal>doc/reference/tutorial/</literal>"
-"目录下。"
 
 #. Tag: title
-#: tutorial.xml:32
+#: tutorial.xml:59
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "第一部分 - 第一个Hibernate应用程序"
 
 #. Tag: para
-#: tutorial.xml:34
+#: tutorial.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"For this example, we will set up a small database application that can store "
+"events we want to attend and information about the host(s) of these events."
+msgstr ""
+"假设我们希望有一个小应用程序可以保存我们希望参加的活动(events)和这些活动主"
+"办方的相关信息。 (译者注:在本教程的后面部分,我们将直接使用event而不是它的"
+"中文翻译“活动”,以免混淆。)"
+
+#. Tag: para
+#: tutorial.xml:67
 #, no-c-format
 msgid ""
-"First, we'll create a simple console-based Hibernate application. We use an "
-"Java database (HSQL DB), so we do not have to install any database server."
+"Although you can use whatever database you feel comfortable using, we will "
+"use <ulink url=\"http://hsqldb.org/\">HSQLDB</ulink> (an in-memory, Java "
+"database) to avoid describing installation/setup of any particular database "
+"servers."
 msgstr ""
-"首先我们将创建一个简单的基于控制台的(console-based)Hibernate应用程序。由于我"
-"们使用Java数据库(HSQL DB),所以不必安装任何数据库服务器。"
 
+#. Tag: title
+#: tutorial.xml:76
+#, no-c-format
+msgid "Setup"
+msgstr ""
+
 #. Tag: para
-#: tutorial.xml:39
+#: tutorial.xml:78
 #, no-c-format
 msgid ""
-"Let's assume we need a small database application that can store events we "
-"want to attend, and information about the hosts of these events."
+"The first thing we need to do is to set up the development environment. We "
+"will be using the \"standard layout\" advocated by alot of build tools such "
+"as <ulink url=\"http://maven.org\">Maven</ulink>. Maven, in particular, has "
+"a good resource describing this <ulink url=\"http://maven.apache.org/guides/"
+"introduction/introduction-to-the-standard-directory-layout.html\">layout</"
+"ulink>. As this tutorial is to be a web application, we will be creating and "
+"making use of <filename>src/main/java</filename>, <filename>src/main/"
+"resources</filename> and <filename>src/main/webapp</filename> directories."
 msgstr ""
-"假设我们希望有一个小应用程序可以保存我们希望参加的活动(events)和这些活动主"
-"办方的相关信息。 (译者注:在本教程的后面部分,我们将直接使用event而不是它的"
-"中文翻译“活动”,以免混淆。)"
 
 #. Tag: para
-#: tutorial.xml:44
+#: tutorial.xml:88
 #, no-c-format
 msgid ""
-"The first thing we do, is set up our development directory and put all the "
-"Java libraries we need into it. Download the Hibernate distribution from the "
-"Hibernate website. Extract the package and place all required libraries "
-"found in <literal>/lib</literal> into into the <literal>/lib</literal> "
-"directory of your new development working directory. It should look like "
-"this:"
+"We will be using Maven in this tutorial, taking advantage of its transitive "
+"dependency management capabilities as well as the ability of many IDEs to "
+"automatically set up a project for us based on the maven descriptor."
 msgstr ""
-"我们所做的第一件事就是创建我们的开发目录,并且把所有需要用到的Java库文件放进"
-"去。解压缩从Hibernate网站下载的Hibernate发布包,并把<literal>/lib</literal>目"
-"录下所有需要的库文件拷到我们新建开发目录下的<literal>/lib</literal>目录下。看"
-"起来就像这样:"
 
 #. Tag: programlisting
-#: tutorial.xml:52
+#: tutorial.xml:94
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  antlr.jar\n"
-"  cglib.jar\n"
-"  asm.jar\n"
-"  asm-attrs.jars\n"
-"  commons-collections.jar\n"
-"  commons-logging.jar\n"
-"  hibernate3.jar\n"
-"  jta.jar\n"
-"  dom4j.jar\n"
-"  log4j.jar ]]>"
+"<![CDATA[<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n"
+"         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+"         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven."
+"apache.org/xsd/maven-4.0.0.xsd\">\n"
+"\n"
+"    <modelVersion>4.0.0</modelVersion>\n"
+"\n"
+"    <groupId>org.hibernate.tutorials</groupId>\n"
+"    <artifactId>hibernate-tutorial</artifactId>\n"
+"    <version>1.0.0-SNAPSHOT</version>\n"
+"    <name>First Hibernate Tutorial</name>\n"
+"\n"
+"    <build>\n"
+"         <!-- we dont want the version to be part of the generated war file "
+"name -->\n"
+"         <finalName>${artifactId}</finalName>\n"
+"    </build>\n"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>org.hibernate</groupId>\n"
+"            <artifactId>hibernate-core</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Because this is a web app, we also have a dependency on the "
+"servlet api. -->\n"
+"        <dependency>\n"
+"            <groupId>javax.servlet</groupId>\n"
+"            <artifactId>servlet-api</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate uses slf4j for logging, for our purposes here use the "
+"simple backend -->\n"
+"        <dependency>\n"
+"            <groupId>org.slf4j</groupId>\n"
+"            <artifactId>slf4j-simple</artifactId>\n"
+"        </dependency>\n"
+"\n"
+"        <!-- Hibernate gives you a choice of bytecode providers between "
+"cglib and javassist -->\n"
+"        <dependency>\n"
+"            <groupId>javassist</groupId>\n"
+"            <artifactId>javassist</artifactId>\n"
+"        </dependency>\n"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:54
+#: tutorial.xml:97
 #, no-c-format
 msgid ""
-"This is the minimum set of required libraries (note that we also copied "
-"hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
-"writing</emphasis>. The Hibernate release you are using might require more "
-"or less libraries. See the <literal>README.txt</literal> file in the "
-"<literal>lib/</literal> directory of the Hibernate distribution for more "
-"information about required and optional third-party libraries. (Actually, "
-"Log4j is not required but preferred by many developers.)"
+"It is not a requirement to use Maven. If you wish to use something else to "
+"build this tutoial (such as Ant), the layout will remain the same. The only "
+"change is that you will need to manually account for all the needed "
+"dependencies. If you use something like <ulink url=\"http://ant.apache.org/"
+"ivy/\">Ivy</ulink> providing transitive dependency management you would "
+"still use the dependencies mentioned below. Otherwise, you'd need to grab "
+"<emphasis>all</emphasis> dependencies, both explicit and transitive, and add "
+"them to the project's classpath. If working from the Hibernate distribution "
+"bundle, this would mean <filename>hibernate3.jar</filename>, all artifacts "
+"in the <filename>lib/required</filename> directory and all files from either "
+"the <filename>lib/bytecode/cglib</filename> or <filename>lib/bytecode/"
+"javassist</filename> directory; additionally you will need both the servlet-"
+"api jar and one of the slf4j logging backends."
 msgstr ""
-"<emphasis>到编写本文时为止</emphasis>,这些是Hibernate运行所需要的最小库文件"
-"集合(注意我们也拷贝了 Hibernate3.jar,这个是最主要的文件)。你正使用的"
-"Hibernate版本可能需要比这更多或少一些的库文件。请参见发布包中的<literal>lib/"
-"</literal>目录下的<literal>README.txt</literal>,以获取更多关于所需和可选的第"
-"三方库文件信息(事实上,Log4j并不是必须的库文件,但被许多开发者所喜欢)。"
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:114
 #, no-c-format
 msgid ""
-"Next we create a class that represents the event we want to store in "
-"database."
-msgstr "接下来我们创建一个类,用来代表那些我们希望储存在数据库里的event。"
+"Save this file as <filename>pom.xml</filename> in the project root directory."
+msgstr ""
 
 #. Tag: title
-#: tutorial.xml:68
+#: tutorial.xml:121
 #, no-c-format
 msgid "The first class"
 msgstr "第一个class"
 
 #. Tag: para
-#: tutorial.xml:70
-#, no-c-format
+#: tutorial.xml:123
+#, fuzzy, no-c-format
 msgid ""
-"Our first persistent class is a simple JavaBean class with some properties:"
-msgstr "我们的第一个持久化类是一个带有一些属性(property)的简单JavaBean类:"
+"Next, we create a class that represents the event we want to store in the "
+"database; it is a simple JavaBean class with some properties:"
+msgstr "接下来我们创建一个类,用来代表那些我们希望储存在数据库里的event。"
 
 #. Tag: programlisting
-#: tutorial.xml:74
+#: tutorial.xml:128
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -198,15 +236,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:76
-#, no-c-format
+#: tutorial.xml:130
+#, fuzzy, no-c-format
 msgid ""
-"You can see that this class uses standard JavaBean naming conventions for "
-"property getter and setter methods, as well as private visibility for the "
-"fields. This is a recommended design - but not required. Hibernate can also "
-"access fields directly, the benefit of accessor methods is robustness for "
-"refactoring. The no-argument constructor is required to instantiate an "
-"object of this class through reflection."
+"This class uses standard JavaBean naming conventions for property getter and "
+"setter methods, as well as private visibility for the fields. Although this "
+"is the recommended design, it is not required. Hibernate can also access "
+"fields directly, the benefit of accessor methods is robustness for "
+"refactoring."
 msgstr ""
 "你可以看到这个类对属性的存取方法(getter and setter method)使用了标准"
 "JavaBean命名约定,同时把类属性(field)的访问级别设成私有的(private)。这是"
@@ -216,20 +253,20 @@
 "argument constructor)。"
 
 #. Tag: para
-#: tutorial.xml:84
-#, no-c-format
+#: tutorial.xml:138
+#, fuzzy, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
 "particular event. All persistent entity classes (there are less important "
 "dependent classes as well) will need such an identifier property if we want "
-"to use the full feature set of Hibernate. In fact, most applications (esp. "
-"web applications) need to distinguish objects by identifier, so you should "
-"consider this a feature rather than a limitation. However, we usually don't "
-"manipulate the identity of an object, hence the setter method should be "
-"private. Only Hibernate will assign identifiers when an object is saved. You "
-"can see that Hibernate can access public, private, and protected accessor "
-"methods, as well as (public, private, protected) fields directly. The choice "
-"is up to you and you can match it to fit your application design."
+"to use the full feature set of Hibernate. In fact, most applications, "
+"especially web applications, need to distinguish objects by identifier, so "
+"you should consider this a feature rather than a limitation. However, we "
+"usually do not manipulate the identity of an object, hence the setter method "
+"should be private. Only Hibernate will assign identifiers when an object is "
+"saved. Hibernate can access public, private, and protected accessor methods, "
+"as well as public, private and protected fields directly. The choice is up "
+"to you and you can match it to fit your application design."
 msgstr ""
 "对一特定的event, <literal>id</literal> 属性持有唯一的标识符(identifier)的"
 "值。如果我们希望使用Hibernate提供的所有特性,那么所有的持久化实体"
@@ -242,13 +279,13 @@
 "你可以使你的选择与你的应用程序设计相吻合。"
 
 #. Tag: para
-#: tutorial.xml:96
-#, no-c-format
+#: tutorial.xml:153
+#, fuzzy, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
 "Hibernate has to create objects for you, using Java Reflection. The "
-"constructor can be private, however, package visibility is required for "
-"runtime proxy generation and efficient data retrieval without bytecode "
+"constructor can be private, however package or public visibility is required "
+"for runtime proxy generation and efficient data retrieval without bytecode "
 "instrumentation."
 msgstr ""
 "所有的持久化类(persistent classes)都要求有无参的构造器,因为Hibernate必须使"
@@ -258,42 +295,21 @@
 "获取数据会更有效率。"
 
 #. Tag: para
-#: tutorial.xml:103
+#: tutorial.xml:161
 #, no-c-format
 msgid ""
-"Place this Java source file in a directory called <literal>src</literal> in "
-"the development folder, and in its correct package. The directory should now "
-"look like this:"
+"Save this file to the <filename>src/main/java/org/hibernate/tutorial/domain</"
+"filename> directory."
 msgstr ""
-"把这个Java源代码文件放到开发目录下的<literal>src</literal>目录里,注意包位置"
-"要正确。 现在这个目录看起来应该像这样:"
 
-#. Tag: programlisting
-#: tutorial.xml:108
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:110
-#, no-c-format
-msgid "In the next step, we tell Hibernate about this persistent class."
-msgstr "下一步,我们把这个持久化类的信息告诉Hibernate。"
-
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:168
 #, no-c-format
 msgid "The mapping file"
 msgstr "映射文件"
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:170
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -306,13 +322,13 @@
 "(database)里面的哪个表(table)及应该使用表里面的哪些字段(column)。"
 
 #. Tag: para
-#: tutorial.xml:126
+#: tutorial.xml:178
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr "一个映射文件的基本结构看起来像这样:"
 
 #. Tag: programlisting
-#: tutorial.xml:130
+#: tutorial.xml:182
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -320,23 +336,23 @@
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
 "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "[...]\n"
 "</hibernate-mapping>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:132
-#, no-c-format
+#: tutorial.xml:184
+#, fuzzy, no-c-format
 msgid ""
-"Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
-"completion of XML mapping elements and attributes in your editor or IDE. You "
-"also should open up the DTD file in your text editor - it's the easiest way "
-"to get an overview of all elements and attributes and to see the defaults, "
-"as well as some comments. Note that Hibernate will not load the DTD file "
-"from the web, but first look it up from the classpath of the application. "
-"The DTD file is included in <literal>hibernate3.jar</literal> as well as in "
-"the <literal>src/</literal> directory of the Hibernate distribution."
+"Hibernate DTD is sophisticated. You can use it for auto-completion of XML "
+"mapping elements and attributes in your editor or IDE. Opening up the DTD "
+"file in your text editor is the easiest way to get an overview of all "
+"elements and attributes, and to view the defaults, as well as some comments. "
+"Hibernate will not load the DTD file from the web, but first look it up from "
+"the classpath of the application. The DTD file is included in "
+"<filename>hibernate-core.jar</filename> (it is also included in the "
+"<filename>hibernate3.jar</filename>, if using the distribution bundle)."
 msgstr ""
 "注意Hibernate的DTD是非常复杂的。你的编辑器或者IDE里使用它来自动完成那些用来映"
 "射的XML元素(element)和属性(attribute)。你也可以在文本编辑器里打开DTD-这"
@@ -346,23 +362,23 @@
 "<literal>src/</literal>目录下。"
 
 #. Tag: para
-#: tutorial.xml:143
-#, no-c-format
+#: tutorial.xml:197
+#, fuzzy, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
-"is of course not optional."
+"is, of course, not optional."
 msgstr ""
 "为缩短代码长度,在以后的例子里我们会省略DTD的声明。当然,在实际的应用程序中,"
 "DTD声明是必须的。"
 
 #. Tag: para
-#: tutorial.xml:148
-#, no-c-format
+#: tutorial.xml:203
+#, fuzzy, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
 "<literal>class</literal> element. All persistent entity classes (again, "
 "there might be dependent classes later on, which are not first-class "
-"entities) need such a mapping, to a table in the SQL database:"
+"entities) need a mapping to a table in the SQL database:"
 msgstr ""
 "在<literal>hibernate-mapping</literal>标签(tag)之间, 含有一个"
 "<literal>class</literal>元素。所有的持久化实体类(再次声明,或许接下来会有依"
@@ -370,12 +386,12 @@
 "表。"
 
 #. Tag: programlisting
-#: tutorial.xml:155
+#: tutorial.xml:210
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "\n"
 "    </class>\n"
 "\n"
@@ -383,16 +399,15 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:157
-#, no-c-format
+#: tutorial.xml:212
+#, fuzzy, no-c-format
 msgid ""
-"So far we told Hibernate how to persist and load object of class "
-"<literal>Event</literal> to the table <literal>EVENTS</literal>, each "
-"instance represented by a row in that table. Now we continue with a mapping "
-"of the unique identifier property to the tables primary key. In addition, as "
-"we don't want to care about handling this identifier, we configure "
-"Hibernate's identifier generation strategy for a surrogate primary key "
-"column:"
+"So far we have told Hibernate how to persist and load object of class "
+"<literal>Event</literal> to the table <literal>EVENTS</literal>. Each "
+"instance is now represented by a row in that table. Now we can continue by "
+"mapping the unique identifier property to the tables primary key. As we do "
+"not want to care about handling this identifier, we configure Hibernate's "
+"identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 "到目前为止,我们告诉了Hibernate怎样把<literal>Events</literal>类的对象持久化"
 "到数据库的<literal>EVENTS</literal>表里,以及怎样从<literal>EVENTS</literal>"
@@ -401,12 +416,12 @@
 "处理这个标识符,我们就配置由Hibernate的标识符生成策略来产生代理主键字段。"
 
 #. Tag: programlisting
-#: tutorial.xml:165
+#: tutorial.xml:222
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -416,48 +431,56 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
+#: tutorial.xml:224
 #, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
-"property, <literal>name=\"id\"</literal> declares the name of the Java "
-"property - Hibernate will use the getter and setter methods to access the "
-"property. The column attribute tells Hibernate which column of the "
-"<literal>EVENTS</literal> table we use for this primary key. The nested "
-"<literal>generator</literal> element specifies the identifier generation "
-"strategy, in this case we used <literal>native</literal>, which picks the "
-"best strategy depending on the configured database (dialect). Hibernate "
-"supports database generated, globally unique, as well as application "
-"assigned identifiers (or any strategy you have written an extension for)."
+"The <literal>id</literal> element is the declaration of the identifier "
+"property. The <literal>name=\"id\"</literal> mapping attribute declares the "
+"name of the JavaBean property and tells Hibernate to use the <literal>getId()"
+"</literal> and <literal>setId()</literal> methods to access the property. "
+"The column attribute tells Hibernate which column of the <literal>EVENTS</"
+"literal> table holds the primary key value."
 msgstr ""
-"<literal>id</literal>元素是标识符属性的声明,<literal>name=\"id\"</literal> "
-"声明了Java属性的名字 - Hibernate会使用<literal>getId()</literal>和"
-"<literal>setId()</literal>来访问它。 <literal>column</literal>属性则告诉"
-"Hibernate, 我们使用<literal>EVENTS</literal>表的哪个字段作为主键。嵌套的"
-"<literal>generator</literal>元素指定了标识符生成策略,在这里我们指定"
-"<literal>native</literal>,它根据已配置的数据库(方言)自动选择最佳的标识符生"
-"成策略。Hibernate支持由数据库生成,全局唯一性(globally unique)和应用程序指"
-"定(或者你自己为任何已有策略所写的扩展)这些策略来生成标识符。"
 
 #. Tag: para
-#: tutorial.xml:180
+#: tutorial.xml:234
 #, no-c-format
 msgid ""
-"Finally we include declarations for the persistent properties of the class "
-"in the mapping file. By default, no properties of the class are considered "
-"persistent:"
+"The nested <literal>generator</literal> element specifies the identifier "
+"generation strategy (aka how are identifier values generated?). In this case "
+"we choose <literal>native</literal>, which offers a level of portability "
+"depending on the configured database dialect. Hibernate supports database "
+"generated, globally unique, as well as application assigned, identifiers. "
+"Identifier value generation is also one of Hibernate's many extension points "
+"and you can plugin in your own strategy."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:246
+#, no-c-format
+msgid ""
+"<literal>native</literal> is no longer consider the best strategy in terms "
+"of portability. for further discussion, see"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:252
+#, fuzzy, no-c-format
+msgid ""
+"Lastly, we need to tell Hibernate about the remaining entity class "
+"properties. By default, no properties of the class are considered persistent:"
+msgstr ""
 "最后我们在映射文件里面包含需要持久化属性的声明。默认情况下,类里面的属性都被"
 "视为非持久化的:"
 
 #. Tag: programlisting
-#: tutorial.xml:186
+#: tutorial.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
-"<hibernate-mapping>\n"
+"<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Event\" table=\"EVENTS\">\n"
+"    <class name=\"Event\" table=\"EVENTS\">\n"
 "        <id name=\"id\" column=\"EVENT_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -469,14 +492,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:188
-#, no-c-format
+#: tutorial.xml:260
+#, fuzzy, no-c-format
 msgid ""
-"Just as with the <literal>id</literal> element, the <literal>name</literal> "
+"Similar to the <literal>id</literal> element, the <literal>name</literal> "
 "attribute of the <literal>property</literal> element tells Hibernate which "
-"getter and setter methods to use. So, in this case, Hibernate will look for "
-"<literal>getDate()/setDate()</literal>, as well as <literal>getTitle()/"
-"setTitle()</literal>."
+"getter and setter methods to use. In this case, Hibernate will search for "
+"<literal>getDate()</literal>, <literal>setDate()</literal>, <literal>getTitle"
+"()</literal> and <literal>setTitle()</literal> methods."
 msgstr ""
 "和<literal>id</literal>元素一样,<literal>property</literal>元素的"
 "<literal>name</literal>属性告诉Hibernate使用哪个getter和setter方法。在此例"
@@ -484,15 +507,15 @@
 "<literal>getTitle()/setTitle()</literal>。"
 
 #. Tag: para
-#: tutorial.xml:195
-#, no-c-format
+#: tutorial.xml:271
+#, fuzzy, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
-"<literal>column</literal> attribute, but the <literal>title</literal> "
-"doesn't? Without the <literal>column</literal> attribute Hibernate by "
-"default uses the property name as the column name. This works fine for "
-"<literal>title</literal>. However, <literal>date</literal> is a reserved "
-"keyword in most database, so we better map it to a different name."
+"<literal>column</literal> attribute, but the <literal>title</literal> does "
+"not? Without the <literal>column</literal> attribute, Hibernate by default "
+"uses the property name as the column name. This works for <literal>title</"
+"literal>, however, <literal>date</literal> is a reserved keyword in most "
+"databases so you will need to map it to a different name."
 msgstr ""
 "为什么<literal>date</literal>属性的映射含有<literal>column</literal> "
 "attribute,而<literal>title</literal>却没有?当没有设定<literal>column</"
@@ -501,24 +524,23 @@
 "数的数据库里,是一个保留关键字,所以我们最好把它映射成一个不同的名字。"
 
 #. Tag: para
-#: tutorial.xml:204
-#, no-c-format
+#: tutorial.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"The next interesting thing is that the <literal>title</literal> mapping also "
-"lacks a <literal>type</literal> attribute. The types we declare and use in "
-"the mapping files are not, as you might expect, Java data types. They are "
-"also not SQL database types. These types are so called <emphasis>Hibernate "
-"mapping types</emphasis>, converters which can translate from Java to SQL "
-"data types and vice versa. Again, Hibernate will try to determine the "
-"correct conversion and mapping type itself if the <literal>type</literal> "
-"attribute is not present in the mapping. In some cases this automatic "
-"detection (using Reflection on the Java class) might not have the default "
-"you expect or need. This is the case with the <literal>date</literal> "
-"property. Hibernate can't know if the property (which is of <literal>java."
-"util.Date</literal>) should map to a SQL <literal>date</literal>, "
-"<literal>timestamp</literal>, or <literal>time</literal> column. We preserve "
-"full date and time information by mapping the property with a "
-"<literal>timestamp</literal> converter."
+"The <literal>title</literal> mapping also lacks a <literal>type</literal> "
+"attribute. The types declared and used in the mapping files are not Java "
+"data types; they are not SQL database types either. These types are called "
+"<emphasis>Hibernate mapping types</emphasis>, converters which can translate "
+"from Java to SQL data types and vice versa. Again, Hibernate will try to "
+"determine the correct conversion and mapping type itself if the "
+"<literal>type</literal> attribute is not present in the mapping. In some "
+"cases this automatic detection using Reflection on the Java class might not "
+"have the default you expect or need. This is the case with the "
+"<literal>date</literal> property. Hibernate cannot know if the property, "
+"which is of <literal>java.util.Date</literal>, should map to a SQL "
+"<literal>date</literal>, <literal>timestamp</literal>, or <literal>time</"
+"literal> column. Full date and time information is preserved by mapping the "
+"property with a <literal>timestamp</literal> converter."
 msgstr ""
 "另一有趣的事情是<literal>title</literal>属性缺少一个<literal>type</literal> "
 "attribute。我们在映射文件里声明并使用的类型,却不是我们期望的那样,是Java数据"
@@ -534,73 +556,55 @@
 "日期和时间的全部信息。"
 
 #. Tag: para
-#: tutorial.xml:220
+#: tutorial.xml:297
 #, no-c-format
 msgid ""
-"This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
-"in the directory next to the <literal>Event</literal> Java class source "
-"file. The naming of mapping files can be arbitrary, however the <literal>hbm."
-"xml</literal> suffix is a convention in the Hibernate developer community. "
-"The directory structure should now look like this:"
+"Hibernate makes this mapping type determination using reflection when the "
+"mapping files are processed. This can take time and resources, so if startup "
+"performance is important you should consider explicitly defining the type to "
+"use."
 msgstr ""
-"应该把这个映射文件保存为<literal>Event.hbm.xml</literal>,且就在"
-"<literal>Event</literal>Java类的源文件目录下。映射文件可随意地命名,但"
-"<literal>hbm.xml</literal>的后缀已成为Hibernate开发者社区的约定。现在目录结构"
-"看起来应该像这样:"
 
-#. Tag: programlisting
-#: tutorial.xml:228
+#. Tag: para
+#: tutorial.xml:304
 #, no-c-format
 msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml]]>"
+"Save this mapping file as <filename>src/main/resources/org/hibernate/"
+"tutorial/domain/Event.hbm.xml</filename>."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:230
-#, no-c-format
-msgid "We continue with the main configuration of Hibernate."
-msgstr "我们继续进行Hibernate的主要配置。"
-
 #. Tag: title
-#: tutorial.xml:237
+#: tutorial.xml:312
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Hibernate配置"
 
 #. Tag: para
-#: tutorial.xml:239
+#: tutorial.xml:314
 #, no-c-format
 msgid ""
-"We now have a persistent class and its mapping file in place. It is time to "
-"configure Hibernate. Before we do this, we will need a database. HSQL DB, a "
-"java-based SQL DBMS, can be downloaded from the HSQL DB website(http://"
-"hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</literal> from "
-"this download. Place this file in the <literal>lib/</literal> directory of "
-"the development folder."
+"At this point, you should have the persistent class and its mapping file in "
+"place. It is now time to configure Hibernate. First let's set up HSQLDB to "
+"run in \"server mode\""
 msgstr ""
-"现在我们已经有了一个持久化类和它的映射文件,该是配置Hibernate的时候了。在此之"
-"前,我们需要一个数据库。 HSQL DB是种基于Java 的SQL数据库管理系统(DBMS),可"
-"以从HSQL DB的网站上下载。实际上,你只需下载的包中的<literal>hsqldb.jar</"
-"literal>文件,并把这个文件放在开发文件夹的<literal>lib/</literal>目录下即可。"
 
 #. Tag: para
-#: tutorial.xml:247
+#: tutorial.xml:321
 #, no-c-format
+msgid "We do this do that the data remains between runs."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:326
+#, fuzzy, no-c-format
 msgid ""
-"Create a directory called <literal>data</literal> in the root of the "
-"development directory - this is where HSQL DB will store its data files. Now "
-"start the database by running <literal>java -classpath ../lib/hsqldb.jar org."
-"hsqldb.Server</literal> in this data directory. You can see it start up and "
-"bind to a TCP/IP socket, this is where our application will connect later. "
-"If you want to start with a fresh database during this tutorial, shutdown "
-"HSQL DB (press <literal>CTRL + C</literal> in the window), delete all files "
-"in the <literal>data/</literal> directory, and start HSQL DB again."
+"We will utilize the Maven exec plugin to launch the HSQLDB server by "
+"running: <command> mvn exec:java -Dexec.mainClass=\"org.hsqldb.Server\" -"
+"Dexec.args=\"-database.0 file:target/data/tutorial\"</command> You will see "
+"it start up and bind to a TCP/IP socket; this is where our application will "
+"connect later. If you want to start with a fresh database during this "
+"tutorial, shutdown HSQLDB, delete all files in the <filename>target/data</"
+"filename> directory, and start HSQLDB again."
 msgstr ""
 "在开发的根目录下创建一个<literal>data</literal>目录 - 这是HSQL DB存储数据文"
 "件的地方。此时在data目录中运行<literal>java -classpath ../lib/hsqldb.jar org."
@@ -610,33 +614,35 @@
 "删除<literal>data/</literal>目录下的所有文件,再重新启动HSQL数据库。"
 
 #. Tag: para
-#: tutorial.xml:257
+#: tutorial.xml:337
 #, no-c-format
 msgid ""
-"Hibernate is the layer in your application which connects to this database, "
-"so it needs connection information. The connections are made through a JDBC "
-"connection pool, which we also have to configure. The Hibernate distribution "
-"contains several open source JDBC connection pooling tools, but will use the "
-"Hibernate built-in connection pool for this tutorial. Note that you have to "
-"copy the required library into your classpath and use different connection "
-"pooling settings if you want to use a production-quality third party JDBC "
-"pooling software."
+"Hibernate will be connecting to the database on behalf of your application, "
+"so it needs to know how to obtain connections. For this tutorial we will be "
+"using a standalone connection pool (as opposed to a <interfacename>javax.sql."
+"DataSource</interfacename>). Hibernate comes with support for two third-"
+"party open source JDBC connection pools: <ulink url=\"https://sourceforge."
+"net/projects/c3p0\">c3p0</ulink> and <ulink url=\"http://proxool.sourceforge."
+"net/\">proxool</ulink>. However, we will be using the Hibernate built-in "
+"connection pool for this tutorial."
 msgstr ""
-"Hibernate是你的应用程序里连接数据库的那层,所以它需要连接用的信息。连接"
-"(connection)是通过一个也由我们配置的JDBC连接池(connection pool)来完成的。"
-"Hibernate的发布包里包含了许多开源的(open source)连接池,但在我们例子中使用"
-"Hibernate内置的连接池。注意,如果你希望使用一个产品级(production-quality)的第"
-"三方连接池软件,你必须拷贝所需的库文件到你的classpath下,并使用不同的连接池设"
-"置。"
 
 #. Tag: para
-#: tutorial.xml:267
+#: tutorial.xml:348
 #, no-c-format
 msgid ""
+"The built-in Hibernate connection pool is in no way intended for production "
+"use. It lacks several features found on any decent connection pool."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:354
+#, fuzzy, no-c-format
+msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
-"properties</literal> file, a slightly more sophisticated <literal>hibernate."
-"cfg.xml</literal> file, or even complete programmatic setup. Most users "
-"prefer the XML configuration file:"
+"properties</literal> file, a more sophisticated <literal>hibernate.cfg.xml</"
+"literal> file, or even complete programmatic setup. Most users prefer the "
+"XML configuration file:"
 msgstr ""
 "为了保存Hibernate的配置,我们可以使用一个简单的<literal>hibernate."
 "properties</literal>文件,或者一个稍微复杂的<literal>hibernate.cfg.xml</"
@@ -644,7 +650,7 @@
 "件:"
 
 #. Tag: programlisting
-#: tutorial.xml:273
+#: tutorial.xml:360
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -683,9 +689,9 @@
 "        <property name=\"show_sql\">true</property>\n"
 "\n"
 "        <!-- Drop and re-create the database schema on startup -->\n"
-"        <property name=\"hbm2ddl.auto\">create</property>\n"
+"        <property name=\"hbm2ddl.auto\">update</property>\n"
 "\n"
-"        <mapping resource=\"events/Event.hbm.xml\"/>\n"
+"        <mapping resource=\"org/hibernate/tutorial/domain/Event.hbm.xml\"/>\n"
 "\n"
 "    </session-factory>\n"
 "\n"
@@ -693,14 +699,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:275
+#: tutorial.xml:363
 #, no-c-format
+msgid "Notice that this configuration file specifies a different DTD"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:366
+#, fuzzy, no-c-format
 msgid ""
-"Note that this XML configuration uses a different DTD. We configure "
-"Hibernate's <literal>SessionFactory</literal> - a global factory responsible "
-"for a particular database. If you have several databases, use several "
-"<literal>&lt;session-factory&gt;</literal> configurations, usually in "
-"several configuration files (for easier startup)."
+"You configure Hibernate's <literal>SessionFactory</literal>. SessionFactory "
+"is a global factory responsible for a particular database. If you have "
+"several databases, for easier startup you should use several <literal>&lt;"
+"session-factory&gt;</literal> configurations in several configuration files."
 msgstr ""
 "注意这个XML配置使用了一个不同的DTD。在这里,我们配置了Hibernate的"
 "<literal>SessionFactory</literal>-一个关联于特定数据库全局的工厂"
@@ -708,20 +719,34 @@
 "factory&gt;</literal>,通常把它们放在多个配置文件中(为了更容易启动)。"
 
 #. Tag: para
-#: tutorial.xml:283
+#: tutorial.xml:373
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
 "configuration for the JDBC connection. The dialect <literal>property</"
-"literal> element specifies the particular SQL variant Hibernate generates. "
-"Hibernate's automatic session management for persistence contexts will come "
-"in handy as you will soon see. The <literal>hbm2ddl.auto</literal> option "
-"turns on automatic generation of database schemas - directly into the "
-"database. This can of course also be turned off (by removing the config "
-"option) or redirected to a file with the help of the <literal>SchemaExport</"
-"literal> Ant task. Finally, we add the mapping file(s) for persistent "
-"classes to the configuration."
+"literal> element specifies the particular SQL variant Hibernate generates."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:380
+#, no-c-format
+msgid ""
+"In most cases, Hibernate is able to properly determine which dialect to use. "
+"See <xref linkend=\"portability-dialectresolver\"/> for more information."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:386
+#, fuzzy, no-c-format
+msgid ""
+"Hibernate's automatic session management for persistence contexts is "
+"particularly useful in this context. The <literal>hbm2ddl.auto</literal> "
+"option turns on automatic generation of database schemas directly into the "
+"database. This can also be turned off by removing the configuration option, "
+"or redirected to a file with the help of the <literal>SchemaExport</literal> "
+"Ant task. Finally, add the mapping file(s) for persistent classes to the "
+"configuration."
+msgstr ""
 "最开始的4个<literal>property</literal>元素包含必要的JDBC连接信息。方言"
 "(dialect)的<literal>property</literal>元素指明Hibernate 生成的特定SQL变量。"
 "你很快会看到,Hibernate对持久化上下文的自动session管理就会派上用场。 打开"
@@ -731,134 +756,80 @@
 "配置中为持久化类加入映射文件。"
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
-"Copy this file into the source directory, so it will end up in the root of "
-"the classpath. Hibernate automatically looks for a file called "
-"<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
-"startup."
+"Save this file as <filename>hibernate.cfg.xml</filename> into the "
+"<filename>src/main/resources</filename> directory."
 msgstr ""
-"把这个文件拷贝到源代码目录下面,这样它就位于classpath的根目录的最后。"
-"Hibernate在启动时会自动在classpath的根目录查找名为<literal>hibernate.cfg."
-"xml</literal>的配置文件。"
 
 #. Tag: title
-#: tutorial.xml:305
-#, no-c-format
-msgid "Building with Ant"
+#: tutorial.xml:403
+#, fuzzy, no-c-format
+msgid "Building with Maven"
 msgstr "用Ant构建"
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:405
 #, no-c-format
 msgid ""
-"We'll now build the tutorial with Ant. You will need to have Ant installed - "
-"get it from the <ulink url=\"http://ant.apache.org/bindownload.cgi\">Ant "
-"download page</ulink>. How to install Ant will not be covered here. Please "
-"refer to the <ulink url=\"http://ant.apache.org/manual/index.html\">Ant "
-"manual</ulink>. After you have installed Ant, we can start to create the "
-"buildfile. It will be called <literal>build.xml</literal> and placed "
-"directly in the development directory."
+"We will now build the tutorial with Maven. You will need to have Maven "
+"installed; it is available from the <ulink url=\"http://maven.apache.org/"
+"download.html\">Maven download page</ulink>. Maven will read the <filename>/"
+"pom.xml</filename> file we created earlier and know how to perform some "
+"basic project tasks. First, lets run the <literal>compile</literal> goal to "
+"make sure we can compile everything so far:"
 msgstr ""
-"现在我们用Ant来构建应用程序。你必须先安装Ant-可以从<ulink url=\"http://ant."
-"apache.org/bindownload.cgi\">Ant 下载页面</ulink>得到它。怎样安装Ant就不在这"
-"里介绍了,请参考<ulink url=\"http://ant.apache.org/manual/index.html\">Ant 用"
-"户手册</ulink>。当你安装完了Ant,就可以开始创建<literal>build.xml</literal>文"
-"件,把它直接放在开发目录下面。"
 
-#. Tag: para
-#: tutorial.xml:316
-#, no-c-format
-msgid "A basic build file looks like this:"
-msgstr "一个简单的build文件看起来像这样:"
-
 #. Tag: programlisting
-#: tutorial.xml:320
+#: tutorial.xml:415
 #, no-c-format
 msgid ""
-"<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
-"\n"
-"    <property name=\"sourcedir\" value=\"${basedir}/src\"/>\n"
-"    <property name=\"targetdir\" value=\"${basedir}/bin\"/>\n"
-"    <property name=\"librarydir\" value=\"${basedir}/lib\"/>\n"
-"\n"
-"    <path id=\"libraries\">\n"
-"        <fileset dir=\"${librarydir}\">\n"
-"            <include name=\"*.jar\"/>\n"
-"        </fileset>\n"
-"    </path>\n"
-"\n"
-"    <target name=\"clean\">\n"
-"        <delete dir=\"${targetdir}\"/>\n"
-"        <mkdir dir=\"${targetdir}\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"compile\" depends=\"clean, copy-resources\">\n"
-"      <javac srcdir=\"${sourcedir}\"\n"
-"             destdir=\"${targetdir}\"\n"
-"             classpathref=\"libraries\"/>\n"
-"    </target>\n"
-"\n"
-"    <target name=\"copy-resources\">\n"
-"        <copy todir=\"${targetdir}\">\n"
-"            <fileset dir=\"${sourcedir}\">\n"
-"                <exclude name=\"**/*.java\"/>\n"
-"            </fileset>\n"
-"        </copy>\n"
-"    </target>\n"
-"\n"
-"</project>]]>"
+"<![CDATA[[hibernateTutorial]$ mvn compile\n"
+"[INFO] Scanning for projects...\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Building First Hibernate Tutorial\n"
+"[INFO]    task-segment: [compile]\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] [resources:resources]\n"
+"[INFO] Using default encoding to copy filtered resources.\n"
+"[INFO] [compiler:compile]\n"
+"[INFO] Compiling 1 source file to /home/steve/projects/sandbox/"
+"hibernateTutorial/target/classes\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] BUILD SUCCESSFUL\n"
+"[INFO] "
+"------------------------------------------------------------------------\n"
+"[INFO] Total time: 2 seconds\n"
+"[INFO] Finished at: Tue Jun 09 12:25:25 CDT 2009\n"
+"[INFO] Final Memory: 5M/547M\n"
+"[INFO] "
+"------------------------------------------------------------------------]]>"
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:322
-#, no-c-format
-msgid ""
-"This will tell Ant to add all files in the lib directory ending with "
-"<literal>.jar</literal> to the classpath used for compilation. It will also "
-"copy all non-Java source files to the target directory, e.g. configuration "
-"and Hibernate mapping files. If you now run Ant, you should get this output:"
-msgstr ""
-"这将告诉Ant把所有在lib目录下以<literal>.jar</literal>结尾的文件拷贝到"
-"classpath中以供编译之用。它也把所有的非Java源代码文件,例如配置和Hibernate映"
-"射文件,拷贝到目标目录。如果你现在运行Ant,会得到以下输出:"
-
-#. Tag: programlisting
-#: tutorial.xml:329
-#, no-c-format
-msgid ""
-"<![CDATA[C:\\hibernateTutorial\\>ant\n"
-"Buildfile: build.xml\n"
-"\n"
-"copy-resources:\n"
-"     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
-"\n"
-"compile:\n"
-"    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
-"\n"
-"BUILD SUCCESSFUL\n"
-"Total time: 1 second ]]>"
-msgstr ""
-
 #. Tag: title
-#: tutorial.xml:334
+#: tutorial.xml:420
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "启动和辅助类"
 
 #. Tag: para
-#: tutorial.xml:336
-#, no-c-format
+#: tutorial.xml:422
+#, fuzzy, no-c-format
 msgid ""
-"It's time to load and store some <literal>Event</literal> objects, but first "
-"we have to complete the setup with some infrastructure code. We have to "
-"startup Hibernate. This startup includes building a global "
-"<literal>SessionFactory</literal> object and to store it somewhere for easy "
-"access in application code. A <literal>SessionFactory</literal> can open up "
-"new <literal>Session</literal>'s. A <literal>Session</literal> represents a "
-"single-threaded unit of work, the <literal>SessionFactory</literal> is a "
-"thread-safe global object, instantiated once."
+"It is time to load and store some <literal>Event</literal> objects, but "
+"first you have to complete the setup with some infrastructure code. You have "
+"to startup Hibernate by building a global <interfacename>org.hibernate."
+"SessionFactory</interfacename> object and storing it somewhere for easy "
+"access in application code. A <interfacename>org.hibernate.SessionFactory</"
+"interfacename> is used to obtain <interfacename>org.hibernate.Session</"
+"interfacename> instances. A <interfacename>org.hibernate.Session</"
+"interfacename> represents a single-threaded unit of work. The "
+"<interfacename>org.hibernate.SessionFactory</interfacename> is a thread-safe "
+"global object that is instantiated once."
 msgstr ""
 "是时候来加载和储存一些<literal>Event</literal>对象了,但首先我们得编写一些基"
 "础的代码以完成设置。我们必须启动Hibernate,此过程包括创建一个全局的"
@@ -869,36 +840,37 @@
 "次。"
 
 #. Tag: para
-#: tutorial.xml:346
-#, no-c-format
+#: tutorial.xml:436
+#, fuzzy, no-c-format
 msgid ""
-"We'll create a <literal>HibernateUtil</literal> helper class which takes "
-"care of startup and makes accessing a <literal>SessionFactory</literal> "
-"convenient. Let's have a look at the implementation:"
+"We will create a <literal>HibernateUtil</literal> helper class that takes "
+"care of startup and makes accessing the <interfacename>org.hibernate."
+"SessionFactory</interfacename> more convenient."
 msgstr ""
 "我们将创建一个<literal>HibernateUtil</literal>辅助类(helper class)来负责启"
 "动Hibernate和更方便地操作<literal>SessionFactory</literal>。让我们来看一下它"
 "的实现:"
 
 #. Tag: programlisting
-#: tutorial.xml:352
+#: tutorial.xml:442
 #, no-c-format
 msgid ""
-"<![CDATA[package util;\n"
+"<![CDATA[package org.hibernate.tutorial.util;\n"
 "\n"
-"import org.hibernate.*;\n"
-"import org.hibernate.cfg.*;\n"
+"import org.hibernate.SessionFactory;\n"
+"import org.hibernate.cfg.Configuration;\n"
 "\n"
 "public class HibernateUtil {\n"
 "\n"
-"    private static final SessionFactory sessionFactory;\n"
+"    private static final SessionFactory sessionFactory = buildSessionFactory"
+"();\n"
 "\n"
-"    static {\n"
+"    private static SessionFactory buildSessionFactory() {\n"
 "        try {\n"
 "            // Create the SessionFactory from hibernate.cfg.xml\n"
-"            sessionFactory = new Configuration().configure()."
-"buildSessionFactory();\n"
-"        } catch (Throwable ex) {\n"
+"            return new Configuration().configure().buildSessionFactory();\n"
+"        }\n"
+"        catch (Throwable ex) {\n"
 "            // Make sure you log the exception, as it might be swallowed\n"
 "            System.err.println(\"Initial SessionFactory creation failed.\" + "
 "ex);\n"
@@ -914,29 +886,38 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:354
+#: tutorial.xml:444
 #, no-c-format
 msgid ""
-"This class does not only produce the global <literal>SessionFactory</"
-"literal> in its static initializer (called once by the JVM when the class is "
-"loaded), but also hides the fact that it uses a static singleton. It might "
-"as well lookup the <literal>SessionFactory</literal> from JNDI in an "
-"application server."
+"Save this code as <filename>src/main/java/org/hibernate/tutorial/util/"
+"HibernateUtil.java</filename>"
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:449
+#, fuzzy, no-c-format
+msgid ""
+"This class not only produces the global <interfacename>org.hibernate."
+"SessionFactory</interfacename> reference in its static initializer; it also "
+"hides the fact that it uses a static singleton. We might just as well have "
+"looked up the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"reference from JNDI in an application server or any other location for that "
+"matter."
+msgstr ""
 "这个类不但在它的静态初始化过程(仅当加载这个类的时候被JVM执行一次)中产生全局"
 "的<literal>SessionFactory</literal>,而且隐藏了它使用了静态singleton的事实。"
 "它也可能在应用程序服务器中的JNDI查找<literal>SessionFactory</literal>。"
 
 #. Tag: para
-#: tutorial.xml:361
-#, no-c-format
+#: tutorial.xml:458
+#, fuzzy, no-c-format
 msgid ""
-"If you give the <literal>SessionFactory</literal> a name in your "
-"configuration file, Hibernate will in fact try to bind it to JNDI after it "
-"has been built. To avoid this code completely you could also use JMX "
+"If you give the <interfacename>org.hibernate.SessionFactory</interfacename> "
+"a name in your configuration, Hibernate will try to bind it to JNDI under "
+"that name after it has been built. Another, better option is to use a JMX "
 "deployment and let the JMX-capable container instantiate and bind a "
-"<literal>HibernateService</literal> to JNDI. These advanced options are "
-"discussed in the Hibernate reference documentation."
+"<literal>HibernateService</literal> to JNDI. Such advanced options are "
+"discussed later."
 msgstr ""
 "如果你在配置文件中给<literal>SessionFactory</literal>一个名字,在"
 "<literal>SessionFactory</literal>创建后,Hibernate会试着把它绑定到JNDI。要完"
@@ -945,47 +926,18 @@
 "节中会讨论到。"
 
 #. Tag: para
-#: tutorial.xml:370
-#, no-c-format
+#: tutorial.xml:467
+#, fuzzy, no-c-format
 msgid ""
-"Place <literal>HibernateUtil.java</literal> in the development source "
-"directory, in a package next to <literal>events</literal>:"
+"You now need to configure a logging system. Hibernate uses commons logging "
+"and provides two choices: Log4j and JDK 1.4 logging. Most developers prefer "
+"Log4j: copy <literal>log4j.properties</literal> from the Hibernate "
+"distribution in the <literal>etc/</literal> directory to your <literal>src</"
+"literal> directory, next to <literal>hibernate.cfg.xml</literal>. If you "
+"prefer to have more verbose output than that provided in the example "
+"configuration, you can change the settings. By default, only the Hibernate "
+"startup message is shown on stdout."
 msgstr ""
-"把<literal>HibernateUtil.java</literal>放在开发目录的源代码路径下,与放"
-"<literal>events</literal>的包并列:"
-
-#. Tag: programlisting
-#: tutorial.xml:375
-#, no-c-format
-msgid ""
-"<![CDATA[.\n"
-"+lib\n"
-"  <Hibernate and third-party libraries>\n"
-"+src\n"
-"  +events\n"
-"    Event.java\n"
-"    Event.hbm.xml\n"
-"  +util\n"
-"    HibernateUtil.java\n"
-"  hibernate.cfg.xml\n"
-"+data\n"
-"build.xml]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:377
-#, no-c-format
-msgid ""
-"This should again compile without problems. We finally need to configure a "
-"logging system - Hibernate uses commons logging and leaves you the choice "
-"between Log4j and JDK 1.4 logging. Most developers prefer Log4j: copy "
-"<literal>log4j.properties</literal> from the Hibernate distribution (it's in "
-"the <literal>etc/</literal> directory) to your <literal>src</literal> "
-"directory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the "
-"example configuration and change the settings if you like to have more "
-"verbose output. By default, only Hibernate startup message are shown on "
-"stdout."
-msgstr ""
 "再次编译这个应用程序应该不会有问题。最后我们需要配置一个日志(logging)系统 "
 "- Hibernate使用通用日志接口,允许你在Log4j和JDK 1.4 日志之间进行选择。多数开"
 "发者更喜欢Log4j:从Hibernate的发布包中(它在<literal>etc/</literal>目录下)拷"
@@ -995,40 +947,42 @@
 "示在标准输出上。"
 
 #. Tag: para
-#: tutorial.xml:387
-#, no-c-format
+#: tutorial.xml:477
+#, fuzzy, no-c-format
 msgid ""
-"The tutorial infrastructure is complete - and we are ready to do some real "
-"work with Hibernate."
+"The tutorial infrastructure is complete and you are now ready to do some "
+"real work with Hibernate."
 msgstr "示例的基本框架完成了 - 现在我们可以用Hibernate来做些真正的工作。"
 
 #. Tag: title
-#: tutorial.xml:395
+#: tutorial.xml:485
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "加载并存储对象"
 
 #. Tag: para
-#: tutorial.xml:397
-#, no-c-format
+#: tutorial.xml:487
+#, fuzzy, no-c-format
 msgid ""
-"Finally, we can use Hibernate to load and store objects. We write an "
-"<literal>EventManager</literal> class with a <literal>main()</literal> "
-"method:"
+"We are now ready to start doing some real worjk with Hibernate. Let's start "
+"by writing an <literal>EventManager</literal> class with a <literal>main()</"
+"literal> method:"
 msgstr ""
 "我们终于可以使用Hibernate来加载和存储对象了,编写一个带有<literal>main()</"
 "literal>方法的<literal>EventManager</literal>类:"
 
 #. Tag: programlisting
-#: tutorial.xml:402
+#: tutorial.xml:493
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial;\n"
+"\n"
 "import org.hibernate.Session;\n"
 "\n"
-"import java.util.Date;\n"
+"import java.util.*;\n"
 "\n"
-"import util.HibernateUtil;\n"
+"import org.hibernate.tutorial.domain.Event;\n"
+"import org.hibernate.tutorial.util.HibernateUtil;\n"
 "\n"
 "public class EventManager {\n"
 "\n"
@@ -1043,16 +997,13 @@
 "    }\n"
 "\n"
 "    private void createAndStoreEvent(String title, Date theDate) {\n"
-"\n"
 "        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
 "        session.beginTransaction();\n"
 "\n"
 "        Event theEvent = new Event();\n"
 "        theEvent.setTitle(title);\n"
 "        theEvent.setDate(theDate);\n"
-"\n"
 "        session.save(theEvent);\n"
 "\n"
 "        session.getTransaction().commit();\n"
@@ -1062,13 +1013,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:404
-#, no-c-format
+#: tutorial.xml:495
+#, fuzzy, no-c-format
 msgid ""
-"We create a new <literal>Event</literal> object, and hand it over to "
-"Hibernate. Hibernate now takes care of the SQL and executes <literal>INSERT</"
-"literal>s on the database. Let's have a look at the <literal>Session</"
-"literal> and <literal>Transaction</literal>-handling code before we run this."
+"In <literal>createAndStoreEvent()</literal> we created a new <literal>Event</"
+"literal> object and handed it over to Hibernate. At that point, Hibernate "
+"takes care of the SQL and executes an <literal>INSERT</literal> on the "
+"database."
 msgstr ""
 "我们创建了个新的<literal>Event</literal>对象并把它传递给Hibernate。现在"
 "Hibernate负责与SQL打交道,并把<literal>INSERT</literal>命令传给数据库。在运行"
@@ -1076,15 +1027,17 @@
 "literal>的代码。"
 
 #. Tag: para
-#: tutorial.xml:411
-#, no-c-format
+#: tutorial.xml:502
+#, fuzzy, no-c-format
 msgid ""
-"A <literal>Session</literal> is a single unit of work. For now we'll keep "
-"things simple and assume a one-to-one granularity between a Hibernate "
-"<literal>Session</literal> and a database transaction. To shield our code "
-"from the actual underlying transaction system (in this case plain JDBC, but "
-"it could also run with JTA) we use the <literal>Transaction</literal> API "
-"that is available on the Hibernate <literal>Session</literal>."
+"A <interface>org.hibernate.Session</interface> is designed to represent a "
+"single unit of work (a single atmoic piece of work to be performed). For now "
+"we will keep things simple and assume a one-to-one granularity between a "
+"Hibernate <interface>org.hibernate.Session</interface> and a database "
+"transaction. To shield our code from the actual underlying transaction "
+"system we use the Hibernate <interfacename>org.hibernate.Transaction</"
+"interfacename> API. In this particular case we are using JDBC-based "
+"transactional semantics, but it could also run with JTA."
 msgstr ""
 "一个<literal>Session</literal>就是个单一的工作单元。我们暂时让事情简单一些,"
 "并假设Hibernate<literal>Session</literal>和数据库事务是一一对应的。为了让我们"
@@ -1092,19 +1045,17 @@
 "Hibernate <literal>Session</literal>中的<literal>Transaction</literal> API。"
 
 #. Tag: para
-#: tutorial.xml:419
-#, no-c-format
+#: tutorial.xml:515
+#, fuzzy, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
-"you can call it as many times and anywhere you like, once you get hold of "
-"your <literal>SessionFactory</literal> (easy thanks to "
-"<literal>HibernateUtil</literal>). The <literal>getCurrentSession()</"
-"literal> method always returns the \"current\" unit of work. Remember that "
-"we switched the configuration option for this mechanism to \"thread\" in "
-"<literal>hibernate.cfg.xml</literal>? Hence, the current unit of work is "
-"bound to the current Java thread that executes our application. However, "
-"this is not the full picture, you also have to consider scope, when a unit "
-"of work begins and when it ends."
+"you can call it as many times and anywhere you like once you get hold of "
+"your <interfacename>org.hibernate.SessionFactory</interfacename>. The "
+"<literal>getCurrentSession()</literal> method always returns the \"current\" "
+"unit of work. Remember that we switched the configuration option for this "
+"mechanism to \"thread\" in our <filename>src/main/resources/hibernate.cfg."
+"xml</filename>? Due to that setting, the context of a current unit of work "
+"is bound to the current Java thread that executes the application."
 msgstr ""
 "<literal>sessionFactory.getCurrentSession()</literal>是干什么的呢?首先,只要"
 "你持有<literal>SessionFactory</literal>(幸亏我们有<literal>HibernateUtil</"
@@ -1115,21 +1066,28 @@
 "是完全准确的,你还得考虑工作单元的生命周期范围 (scope),它何时开始,又何时结束."
 
 #. Tag: para
-#: tutorial.xml:430
+#: tutorial.xml:529
 #, no-c-format
 msgid ""
-"A <literal>Session</literal> begins when it is first needed, when the first "
-"call to <literal>getCurrentSession()</literal> is made. It is then bound by "
-"Hibernate to the current thread. When the transaction ends, either through "
-"commit or rollback, Hibernate automatically unbinds the <literal>Session</"
-"literal> from the thread and closes it for you. If you call "
-"<literal>getCurrentSession()</literal> again, you get a new "
-"<literal>Session</literal> and can start a new unit of work. This "
-"<emphasis>thread-bound</emphasis> programming model is the most popular way "
-"of using Hibernate, as it allows flexible layering of your code (transaction "
-"demarcation code can be separated from data access code, we'll do this later "
-"in this tutorial)."
+"Hibernate offers three methods of current session tracking. The \"thread\" "
+"based method is not intended for production use; it is merely useful for "
+"prototyping and tutorials such as this one. Current session tracking is "
+"discussed in more detail later on."
 msgstr ""
+
+#. Tag: para
+#: tutorial.xml:538
+#, fuzzy, no-c-format
+msgid ""
+"A <interface>org.hibernate.Session</interface> begins when the first call to "
+"<literal>getCurrentSession()</literal> is made for the current thread. It is "
+"then bound by Hibernate to the current thread. When the transaction ends, "
+"either through commit or rollback, Hibernate automatically unbinds the "
+"<interface>org.hibernate.Session</interface> from the thread and closes it "
+"for you. If you call <literal>getCurrentSession()</literal> again, you get a "
+"new <interface>org.hibernate.Session</interface> and can start a new unit of "
+"work."
+msgstr ""
 "<literal>Session</literal>在第一次被使用的时候,即第一次调用"
 "<literal>getCurrentSession()</literal>的时候,其生命周期就开始。然后它被"
 "Hibernate绑定到当前线程。当事务结束的时候,不管是提交还是回滚,Hibernate会自"
@@ -1141,19 +1099,20 @@
 "做)。"
 
 #. Tag: para
-#: tutorial.xml:441
-#, no-c-format
+#: tutorial.xml:551
+#, fuzzy, no-c-format
 msgid ""
-"Related to the unit of work scope, should the Hibernate <literal>Session</"
-"literal> be used to execute one or several database operations? The above "
-"example uses one <literal>Session</literal> for one operation. This is pure "
-"coincidence, the example is just not complex enough to show any other "
-"approach. The scope of a Hibernate <literal>Session</literal> is flexible "
-"but you should never design your application to use a new Hibernate "
-"<literal>Session</literal> for <emphasis>every</emphasis> database "
-"operation. So even if you see it a few more times in the following (very "
-"trivial) examples, consider <emphasis>session-per-operation</emphasis> an "
-"anti-pattern. A real (web) application is shown later in this tutorial."
+"Related to the unit of work scope, should the Hibernate <interface>org."
+"hibernate.Session</interface> be used to execute one or several database "
+"operations? The above example uses one <interface>org.hibernate.Session</"
+"interface> for one operation. However this is pure coincidence; the example "
+"is just not complex enough to show any other approach. The scope of a "
+"Hibernate <interface>org.hibernate.Session</interface> is flexible but you "
+"should never design your application to use a new Hibernate <interface>org."
+"hibernate.Session</interface> for <emphasis>every</emphasis> database "
+"operation. Even though it is used in the following examples, consider "
+"<emphasis>session-per-operation</emphasis> an anti-pattern. A real web "
+"application is shown later in the tutorial which will help illustrate this."
 msgstr ""
 "和工作单元的生命周期这个话题相关,Hibernate <literal>Session</literal>是否被"
 "应该用来执行多次数据库操作?上面的例子对每一次操作使用了一个"
@@ -1165,68 +1124,43 @@
 "在本教程的后面会展示一个真正的(web)程序。"
 
 #. Tag: para
-#: tutorial.xml:452
-#, no-c-format
+#: tutorial.xml:568
+#, fuzzy, no-c-format
 msgid ""
-"Have a look at <xref linkend=\"transactions\"/> for more information about "
-"transaction handling and demarcation. We also skipped any error handling and "
-"rollback in the previous example."
+"See <xref linkend=\"transactions\"/> for more information about transaction "
+"handling and demarcation. The previous example also skipped any error "
+"handling and rollback."
 msgstr ""
 "关于事务处理及事务边界界定的详细信息,请参看<xref linkend=\"transactions\"/"
 ">。在上面的例子中,我们也忽略了所有的错误与回滚的处理。"
 
 #. Tag: para
-#: tutorial.xml:458
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
-"To run this first routine we have to add a callable target to the Ant build "
-"file:"
+"To run this, we will make use of the Maven exec plugin to call our class "
+"with the necessary classpath setup: <command>mvn exec:java -Dexec.mainClass="
+"\"org.hibernate.tutorial.EventManager\" -Dexec.args=\"store\"</command>"
 msgstr ""
-"为第一次运行我们的程序,我们得在Ant的build文件中增加一个可以调用得到的"
-"target。"
 
-#. Tag: programlisting
-#: tutorial.xml:462
-#, no-c-format
-msgid ""
-"<![CDATA[<target name=\"run\" depends=\"compile\">\n"
-"    <java fork=\"true\" classname=\"events.EventManager\" classpathref="
-"\"libraries\">\n"
-"        <classpath path=\"${targetdir}\"/>\n"
-"        <arg value=\"${action}\"/>\n"
-"    </java>\n"
-"</target>]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:464
+#: tutorial.xml:581
 #, no-c-format
-msgid ""
-"The value of the <literal>action</literal> argument is set on the command "
-"line when calling the target:"
+msgid "You may need to perform <command>mvn compile</command> first."
 msgstr ""
-"<literal>action</literal>参数(argument)的值是通过命令行调用这个target的时候"
-"设置的:"
 
-#. Tag: programlisting
-#: tutorial.xml:469
-#, no-c-format
-msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
-msgstr ""
-
 #. Tag: para
-#: tutorial.xml:471
-#, no-c-format
+#: tutorial.xml:586
+#, fuzzy, no-c-format
 msgid ""
-"You should see, after compilation, Hibernate starting up and, depending on "
-"your configuration, lots of log output. At the end you will find the "
-"following line:"
+"You should see Hibernate starting up and, depending on your configuration, "
+"lots of log output. Towards the end, the following line will be displayed:"
 msgstr ""
 "你应该会看到,编译以后,Hibernate根据你的配置启动,并产生一大堆的输出日志。在"
 "日志最后你会看到下面这行:"
 
 #. Tag: programlisting
-#: tutorial.xml:476
+#: tutorial.xml:591
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1234,78 +1168,66 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:478
+#: tutorial.xml:593
 #, no-c-format
-msgid ""
-"This is the <literal>INSERT</literal> executed by Hibernate, the question "
-"marks represent JDBC bind parameters. To see the values bound as arguments, "
-"or to reduce the verbosity of the log, check your <literal>log4j.properties</"
-"literal>."
+msgid "This is the <literal>INSERT</literal> executed by Hibernate."
 msgstr ""
-"这是Hibernate执行的<literal>INSERT</literal>命令,问号代表JDBC的绑定参数。如"
-"果想要看到绑定参数的值或者减少日志的长度,就要调整你在<literal>log4j."
-"properties</literal>文件里的设置。"
 
 #. Tag: para
-#: tutorial.xml:484
-#, no-c-format
-msgid ""
-"Now we'd like to list stored events as well, so we add an option to the main "
-"method:"
+#: tutorial.xml:597
+#, fuzzy, no-c-format
+msgid "To list stored events an option is added to the main method:"
 msgstr ""
 "我们想要列出所有已经被存储的events,就要增加一个条件分支选项到main方法中去。"
 
 #. Tag: programlisting
-#: tutorial.xml:488
+#: tutorial.xml:601
 #, no-c-format
 msgid ""
-"<![CDATA[if (args[0].equals(\"store\")) {\n"
-"    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"}\n"
-"else if (args[0].equals(\"list\")) {\n"
-"    List events = mgr.listEvents();\n"
-"    for (int i = 0; i < events.size(); i++) {\n"
-"        Event theEvent = (Event) events.get(i);\n"
-"        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
-"                           \" Time: \" + theEvent.getDate());\n"
-"    }\n"
-"}]]>"
+"<![CDATA[        if (args[0].equals(\"store\")) {\n"
+"            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+"        }\n"
+"        else if (args[0].equals(\"list\")) {\n"
+"            List events = mgr.listEvents();\n"
+"            for (int i = 0; i < events.size(); i++) {\n"
+"                Event theEvent = (Event) events.get(i);\n"
+"                System.out.println(\n"
+"                        \"Event: \" + theEvent.getTitle() + \" Time: \" + "
+"theEvent.getDate()\n"
+"                );\n"
+"            }\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
-#, no-c-format
-msgid "We also add a new <literal>listEvents() method</literal>:"
+#: tutorial.xml:603
+#, fuzzy, no-c-format
+msgid "A new <literal>listEvents() method is also added</literal>:"
 msgstr "我们也增加一个新的<literal>listEvents()</literal>方法:"
 
 #. Tag: programlisting
-#: tutorial.xml:494
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
-"<![CDATA[private List listEvents() {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private List listEvents() {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"\n"
-"    session.beginTransaction();\n"
-"\n"
-"    List result = session.createQuery(\"from Event\").list();\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"\n"
-"    return result;\n"
-"}]]>"
+"        session.beginTransaction();\n"
+"        List result = session.createQuery(\"from Event\").list();\n"
+"        session.getTransaction().commit();\n"
+"        return result;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:496
-#, no-c-format
+#: tutorial.xml:609
+#, fuzzy, no-c-format
 msgid ""
-"What we do here is use an HQL (Hibernate Query Language) query to load all "
+"Here, we are using a Hibernate Query Language (HQL) query to load all "
 "existing <literal>Event</literal> objects from the database. Hibernate will "
 "generate the appropriate SQL, send it to the database and populate "
 "<literal>Event</literal> objects with the data. You can create more complex "
-"queries with HQL, of course."
+"queries with HQL. See <xref linkend=\"queryhql\"/> for more information."
 msgstr ""
 "我们在这里是用一个HQL(Hibernate Query Language-Hibernate查询语言)查询语句"
 "来从数据库中加载所有存在的<literal>Event</literal>对象。Hibernate会生成适当的"
@@ -1313,82 +1235,28 @@
 "然,你可以使用HQL来创建更加复杂的查询。"
 
 #. Tag: para
-#: tutorial.xml:503
+#: tutorial.xml:617
 #, no-c-format
-msgid "Now, to execute and test all of this, follow these steps:"
-msgstr "现在,根据以下步骤来执行并测试以上各项:"
-
-#. Tag: para
-#: tutorial.xml:509
-#, no-c-format
 msgid ""
-"Run <literal>ant run -Daction=store</literal> to store something into the "
-"database and, of course, to generate the database schema before through "
-"hbm2ddl."
+"Now we can call our new functionality, again using the Maven exec plugin: "
+"<command>mvn exec:java -Dexec.mainClass=\"org.hibernate.tutorial.EventManager"
+"\" -Dexec.args=\"list\"</command>"
 msgstr ""
-"运行<literal>ant run -Daction=store</literal>来保存一些内容到数据库。当然,先"
-"得用hbm2ddl来生成数据库schema。"
 
-#. Tag: para
-#: tutorial.xml:515
-#, no-c-format
-msgid ""
-"Now disable hbm2ddl by commenting out the property in your "
-"<literal>hibernate.cfg.xml</literal> file. Usually you only leave it turned "
-"on in continous unit testing, but another run of hbm2ddl would "
-"<emphasis>drop</emphasis> everything you have stored - the <literal>create</"
-"literal> configuration setting actually translates into \"drop all tables "
-"from the schema, then re-create all tables, when the SessionFactory is build"
-"\"."
-msgstr ""
-"现在把<literal>hibernate.cfg.xml</literal>文件中hbm2ddl属性注释掉,这样我们就"
-"取消了在启动时用hbm2ddl来生成数据库schema。通常只有在不断重复进行单元测试的时"
-"候才需要打开它,但再次运行hbm2ddl会把你保存的一切都删掉(<emphasis>drop</"
-"emphasis>)——<literal>create</literal>配置的真实含义是:“在创建SessionFactory"
-"的时候,从schema 中drop 掉所有的表,再重新创建它们”。"
-
-#. Tag: para
-#: tutorial.xml:525
-#, no-c-format
-msgid ""
-"If you now call Ant with <literal>-Daction=list</literal>, you should see "
-"the events you have stored so far. You can of course also call the "
-"<literal>store</literal> action a few times more."
-msgstr ""
-"如果你现在使用命令行参数<literal>-Daction=list</literal>运行Ant,你会看到那些"
-"至今为止我们所储存的events。当然,你也可以多调用几次<literal>store</literal>"
-"以保存更多的envents。"
-
-#. Tag: para
-#: tutorial.xml:531
-#, no-c-format
-msgid ""
-"Note: Most new Hibernate users fail at this point and we see questions about "
-"<emphasis>Table not found</emphasis> error messages regularly. However, if "
-"you follow the steps outlined above you will not have this problem, as "
-"hbm2ddl creates the database schema on the first run, and subsequent "
-"application restarts will use this schema. If you change the mapping and/or "
-"database schema, you have to re-enable hbm2ddl once again."
-msgstr ""
-"注意,很多Hibernate新手在这一步会失败,我们不时看到关于<emphasis>Table not "
-"found</emphasis>错误信息的提问。但是,只要你根据上面描述的步骤来执行,就不会"
-"有这个问题,因为hbm2ddl会在第一次运行的时候创建数据库schema,后继的应用程序重"
-"起后还能继续使用这个schema。假若你修改了映射,或者修改了数据库schema,你必须"
-"把hbm2ddl重新打开一次。"
-
 #. Tag: title
-#: tutorial.xml:544
+#: tutorial.xml:627
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "第二部分 - 关联映射"
 
 #. Tag: para
-#: tutorial.xml:546
-#, no-c-format
+#: tutorial.xml:629
+#, fuzzy, no-c-format
 msgid ""
-"We mapped a persistent entity class to a table. Let's build on this and add "
-"some class associations. First we'll add people to our application, and "
-"store a list of events they participate in."
+"So far we have mapped a single persistent entity class to a table in "
+"isolation. Let's expand on that a bit and add some class associations. We "
+"will add people to the application and store a list of events in which they "
+"participate."
 msgstr ""
 "我们已经映射了一个持久化实体类到表上。让我们在这个基础上增加一些类之间的关"
 "联。首先我们往应用程序里增加人(people)的概念,并存储他们所参与的一个Event列"
@@ -1396,22 +1264,22 @@
 "翻译)"
 
 #. Tag: title
-#: tutorial.xml:552
+#: tutorial.xml:637
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "映射Person类"
 
 #. Tag: para
-#: tutorial.xml:554
-#, no-c-format
-msgid "The first cut of the <literal>Person</literal> class is simple:"
+#: tutorial.xml:639
+#, fuzzy, no-c-format
+msgid "The first cut of the <literal>Person</literal> class looks like this:"
 msgstr "最初简单的<literal>Person</literal>类:"
 
 #. Tag: programlisting
-#: tutorial.xml:558
+#: tutorial.xml:643
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "public class Person {\n"
 "\n"
@@ -1428,22 +1296,28 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:560
+#: tutorial.xml:645
 #, no-c-format
 msgid ""
-"Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
-"forget the DTD reference at the top):"
+"Save this to a file named <filename>src/main/java/org/hibernate/tutorial/"
+"domain/Person.java</filename>"
 msgstr ""
-"创建一个名为<literal>Person.hbm.xml</literal>的新映射文件(别忘了最上面的DTD"
-"引用):"
 
+#. Tag: para
+#: tutorial.xml:650
+#, no-c-format
+msgid ""
+"Next, create the new mapping file as <filename>src/main/resources/org/"
+"hibernate/tutorial/domain/Person.hbm.xml</filename>"
+msgstr ""
+
 #. Tag: programlisting
-#: tutorial.xml:565
+#: tutorial.xml:655
 #, no-c-format
 msgid ""
-"<![CDATA[<hibernate-mapping>\n"
+"<![CDATA[<hibernate-mapping package=\"org.hibernate.tutorial.domain\">\n"
 "\n"
-"    <class name=\"events.Person\" table=\"PERSON\">\n"
+"    <class name=\"Person\" table=\"PERSON\">\n"
 "        <id name=\"id\" column=\"PERSON_ID\">\n"
 "            <generator class=\"native\"/>\n"
 "        </id>\n"
@@ -1456,13 +1330,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:567
+#: tutorial.xml:657
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr "最后,把新的映射加入到Hibernate的配置中:"
 
 #. Tag: programlisting
-#: tutorial.xml:571
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1470,53 +1344,42 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:573
-#, no-c-format
+#: tutorial.xml:663
+#, fuzzy, no-c-format
 msgid ""
-"We'll now create an association between these two entities. Obviously, "
-"persons can participate in events, and events have participants. The design "
-"questions we have to deal with are: directionality, multiplicity, and "
-"collection behavior."
+"Create an association between these two entities. Persons can participate in "
+"events, and events have participants. The design questions you have to deal "
+"with are: directionality, multiplicity, and collection behavior."
 msgstr ""
 "现在我们在这两个实体之间创建一个关联。显然,persons可以参与一系列events,而"
 "events也有不同的参加者(persons)。我们需要处理的设计问题是关联方向"
 "(directionality),阶数(multiplicity)和集合(collection)的行为。"
 
 #. Tag: title
-#: tutorial.xml:583
+#: tutorial.xml:673
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "单向Set-based的关联"
 
 #. Tag: para
-#: tutorial.xml:585
-#, no-c-format
+#: tutorial.xml:675
+#, fuzzy, no-c-format
 msgid ""
-"We'll add a collection of events to the <literal>Person</literal> class. "
-"That way we can easily navigate to the events for a particular person, "
-"without executing an explicit query - by calling <literal>aPerson.getEvents()"
-"</literal>. We use a Java collection, a <literal>Set</literal>, because the "
-"collection will not contain duplicate elements and the ordering is not "
-"relevant for us."
+"By adding a collection of events to the <literal>Person</literal> class, you "
+"can easily navigate to the events for a particular person, without executing "
+"an explicit query - by calling <literal>Person#getEvents</literal>. Multi-"
+"valued associations are represented in Hibernate by one of the Java "
+"Collection Framework contracts; here we choose a <interfacename>java.util."
+"Set</interfacename> because the collection will not contain duplicate "
+"elements and the ordering is not relevant to our examples:"
 msgstr ""
 "我们将向<literal>Person</literal>类增加一连串的events。那样,通过调用"
 "<literal>aPerson.getEvents()</literal>,就可以轻松地导航到特定person所参与的"
 "events,而不用去执行一个显式的查询。我们使用Java的集合类(collection):"
 "<literal>Set</literal>,因为set 不包含重复的元素及与我们无关的排序。"
 
-#. Tag: para
-#: tutorial.xml:592
-#, no-c-format
-msgid ""
-"We need a unidirectional, many-valued associations, implemented with a "
-"<literal>Set</literal>. Let's write the code for this in the Java classes "
-"and then map it:"
-msgstr ""
-"我们需要用set 实现一个单向多值关联。让我们在Java类里为这个关联编码,接着映射"
-"它:"
-
 #. Tag: programlisting
-#: tutorial.xml:597
+#: tutorial.xml:686
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1534,19 +1397,18 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:599
-#, no-c-format
+#: tutorial.xml:688
+#, fuzzy, no-c-format
 msgid ""
-"Before we map this association, think about the other side. Clearly, we "
-"could just keep this unidirectional. Or, we could create another collection "
-"on the <literal>Event</literal>, if we want to be able to navigate it bi-"
-"directional, i.e. <literal>anEvent.getParticipants()</literal>. This is not "
-"necessary, from a functional perspective. You could always execute an "
-"explicit query to retrieve the participants for a particular event. This is "
-"a design choice left to you, but what is clear from this discussion is the "
-"multiplicity of the association: \"many\" valued on both sides, we call this "
-"a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate's "
-"many-to-many mapping:"
+"Before mapping this association, let's consider the other side. We could "
+"just keep this unidirectional or create another collection on the "
+"<literal>Event</literal>, if we wanted to be able to navigate it from both "
+"directions. This is not necessary, from a functional perspective. You can "
+"always execute an explicit query to retrieve the participants for a "
+"particular event. This is a design choice left to you, but what is clear "
+"from this discussion is the multiplicity of the association: \"many\" valued "
+"on both sides is called a <emphasis>many-to-many</emphasis> association. "
+"Hence, we use Hibernate's many-to-many mapping:"
 msgstr ""
 "在映射这个关联之前,先考虑一下此关联的另外一端。很显然,我们可以保持这个关联"
 "是单向的。或者,我们可以在<literal>Event</literal>里创建另外一个集合,如果希"
@@ -1557,10 +1419,10 @@
 "many)</emphasis>关联。因而,我们使用Hibernate的多对多映射:"
 
 #. Tag: programlisting
-#: tutorial.xml:610
+#: tutorial.xml:701
 #, no-c-format
 msgid ""
-"<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
+"<![CDATA[<class name=\"Person\" table=\"PERSON\">\n"
 "    <id name=\"id\" column=\"PERSON_ID\">\n"
 "        <generator class=\"native\"/>\n"
 "    </id>\n"
@@ -1570,28 +1432,27 @@
 "\n"
 "    <set name=\"events\" table=\"PERSON_EVENT\">\n"
 "        <key column=\"PERSON_ID\"/>\n"
-"        <many-to-many column=\"EVENT_ID\" class=\"events.Event\"/>\n"
+"        <many-to-many column=\"EVENT_ID\" class=\"Event\"/>\n"
 "    </set>\n"
 "\n"
 "</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:612
-#, no-c-format
+#: tutorial.xml:703
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
-"literal> being most common. For a many-to-many association (or <emphasis>n:"
-"m</emphasis> entity relationship), an association table is needed. Each row "
+"Hibernate supports a broad range of collection mappings, a <literal>set</"
+"literal> being most common. For a many-to-many association, or <emphasis>n:"
+"m</emphasis> entity relationship, an association table is required. Each row "
 "in this table represents a link between a person and an event. The table "
-"name is configured with the <literal>table</literal> attribute of the "
+"name is decalred using the <literal>table</literal> attribute of the "
 "<literal>set</literal> element. The identifier column name in the "
-"association, for the person's side, is defined with the <literal>&lt;key&gt;"
-"</literal> element, the column name for the event's side with the "
-"<literal>column</literal> attribute of the <literal>&lt;many-to-many&gt;</"
-"literal>. You also have to tell Hibernate the class of the objects in your "
-"collection (correct: the class on the other side of the collection of "
-"references)."
+"association, for the person side, is defined with the <literal>key</literal> "
+"element, the column name for the event's side with the <literal>column</"
+"literal> attribute of the <literal>many-to-many</literal>. You also have to "
+"tell Hibernate the class of the objects in your collection (the class on the "
+"other side of the collection of references)."
 msgstr ""
 "Hibernate支持各种各样的集合映射,<literal>&lt;set&gt;</literal>使用的最为普"
 "遍。对于多对多关联(或叫<emphasis>n:m</emphasis>实体关系), 需要一个关联表"
@@ -1603,13 +1464,13 @@
 "对象的类(也就是位于这个集合所代表的关联另外一端的类)。"
 
 #. Tag: para
-#: tutorial.xml:624
+#: tutorial.xml:719
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr "因而这个映射的数据库schema是:"
 
 #. Tag: programlisting
-#: tutorial.xml:628
+#: tutorial.xml:723
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1628,59 +1489,54 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:633
+#: tutorial.xml:728
 #, no-c-format
 msgid "Working the association"
 msgstr "使关联工作"
 
 #. Tag: para
-#: tutorial.xml:635
-#, no-c-format
+#: tutorial.xml:730
+#, fuzzy, no-c-format
 msgid ""
-"Let's bring some people and events together in a new method in "
+"Now we will bring some people and events together in a new method in "
 "<literal>EventManager</literal>:"
 msgstr ""
 "我们把一些people和events 一起放到<literal>EventManager</literal>的新方法中:"
 
 #. Tag: programlisting
-#: tutorial.xml:639
+#: tutorial.xml:734
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        aPerson.getEvents().add(anEvent);\n"
 "\n"
-"    aPerson.getEvents().add(anEvent);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:641
-#, no-c-format
+#: tutorial.xml:736
+#, fuzzy, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
-"simply modify the collection using the normal collection methods. As you can "
-"see, there is no explicit call to <literal>update()</literal> or "
-"<literal>save()</literal>, Hibernate automatically detects that the "
-"collection has been modified and needs to be updated. This is called "
-"<emphasis>automatic dirty checking</emphasis>, and you can also try it by "
-"modifying the name or the date property of any of your objects. As long as "
-"they are in <emphasis>persistent</emphasis> state, that is, bound to a "
-"particular Hibernate <literal>Session</literal> (i.e. they have been just "
-"loaded or saved in a unit of work), Hibernate monitors any changes and "
-"executes SQL in a write-behind fashion. The process of synchronizing the "
-"memory state with the database, usually only at the end of a unit of work, "
-"is called <emphasis>flushing</emphasis>. In our code, the unit of work ends "
-"with a commit (or rollback) of the database transaction - as defined by the "
-"<literal>thread</literal> configuration option for the "
-"<literal>CurrentSessionContext</literal> class."
+"simply modify the collection using the normal collection methods. There is "
+"no explicit call to <literal>update()</literal> or <literal>save()</"
+"literal>; Hibernate automatically detects that the collection has been "
+"modified and needs to be updated. This is called <emphasis>automatic dirty "
+"checking</emphasis>. You can also try it by modifying the name or the date "
+"property of any of your objects. As long as they are in "
+"<emphasis>persistent</emphasis> state, that is, bound to a particular "
+"Hibernate <interfacename>org.hibernate.Session</interfacename>, Hibernate "
+"monitors any changes and executes SQL in a write-behind fashion. The process "
+"of synchronizing the memory state with the database, usually only at the end "
+"of a unit of work, is called <emphasis>flushing</emphasis>. In our code, the "
+"unit of work ends with a commit, or rollback, of the database transaction."
 msgstr ""
 "在加载一<literal>Person</literal>和<literal>Event</literal>后,使用普通的集合"
 "方法就可容易地修改我们定义的集合。如你所见,没有显式的<literal>update()</"
@@ -1696,14 +1552,14 @@
 "选项定义的。"
 
 #. Tag: para
-#: tutorial.xml:656
-#, no-c-format
+#: tutorial.xml:755
+#, fuzzy, no-c-format
 msgid ""
-"You might of course load person and event in different units of work. Or you "
-"modify an object outside of a <literal>Session</literal>, when it is not in "
-"persistent state (if it was persistent before, we call this state "
-"<emphasis>detached</emphasis>). You can even modify a collection when it is "
-"detached:"
+"You can load person and event in different units of work. Or you can modify "
+"an object outside of a <interfacename>org.hibernate.Session</interfacename>, "
+"when it is not in persistent state (if it was persistent before, this state "
+"is called <emphasis>detached</emphasis>). You can even modify a collection "
+"when it is detached:"
 msgstr ""
 "当然,你也可以在不同的单元操作里面加载person和event。或在<literal>Session</"
 "literal>以外修改不是处在持久化(persistent)状态下的对象(如果该对象以前曾经"
@@ -1711,68 +1567,64 @@
 "可以在一个集合被脱管时修改它:"
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:764
 #, no-c-format
 msgid ""
-"<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addPersonToEvent(Long personId, Long eventId) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session\n"
-"            .createQuery(\"select p from Person p left join fetch p.events "
-"where p.id = :pid\")\n"
-"            .setParameter(\"pid\", personId)\n"
-"            .uniqueResult(); // Eager fetch the collection so we can use it "
-"detached\n"
+"        Person aPerson = (Person) session\n"
+"                .createQuery(\"select p from Person p left join fetch p."
+"events where p.id = :pid\")\n"
+"                .setParameter(\"pid\", personId)\n"
+"                .uniqueResult(); // Eager fetch the collection so we can use "
+"it detached\n"
+"        Event anEvent = (Event) session.load(Event.class, eventId);\n"
 "\n"
-"    Event anEvent = (Event) session.load(Event.class, eventId);\n"
+"        session.getTransaction().commit();\n"
 "\n"
-"    session.getTransaction().commit();\n"
+"        // End of first unit of work\n"
 "\n"
-"    // End of first unit of work\n"
-"\n"
-"    aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
+"        aPerson.getEvents().add(anEvent); // aPerson (and its collection) is "
 "detached\n"
 "\n"
-"    // Begin second unit of work\n"
+"        // Begin second unit of work\n"
 "\n"
-"    Session session2 = HibernateUtil.getSessionFactory().getCurrentSession"
-"();\n"
-"    session2.beginTransaction();\n"
+"        Session session2 = HibernateUtil.getSessionFactory()."
+"getCurrentSession();\n"
+"        session2.beginTransaction();\n"
+"        session2.update(aPerson); // Reattachment of aPerson\n"
 "\n"
-"    session2.update(aPerson); // Reattachment of aPerson\n"
-"\n"
-"    session2.getTransaction().commit();\n"
-"}]]>"
+"        session2.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
-#, no-c-format
+#: tutorial.xml:766
+#, fuzzy, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
-"again, you could say it binds it to a new unit of work, so any modifications "
-"you made to it while detached can be saved to the database. This includes "
-"any modifications (additions/deletions) you made to a collection of that "
-"entity object."
+"again by binding it to a new unit of work, so any modifications you made to "
+"it while detached can be saved to the database. This includes any "
+"modifications (additions/deletions) you made to a collection of that entity "
+"object."
 msgstr ""
 "对<literal>update</literal>的调用使一个脱管对象重新持久化,你可以说它被绑定到"
 "一个新的单元操作上,所以在脱管状态下对它所做的任何修改都会被保存到数据库里。"
 "这也包括你对这个实体对象的集合所作的任何改动(增加/删除)。"
 
 #. Tag: para
-#: tutorial.xml:672
-#, no-c-format
+#: tutorial.xml:775
+#, fuzzy, no-c-format
 msgid ""
-"Well, this is not much use in our current situation, but it's an important "
-"concept you can design into your own application. For now, complete this "
-"exercise by adding a new action to the <literal>EventManager</literal>'s "
-"main method and call it from the command line. If you need the identifiers "
-"of a person and an event - the <literal>save()</literal> method returns it "
-"(you might have to modify some of the previous methods to return that "
-"identifier):"
+"This is not much use in our example, but it is an important concept you can "
+"incorporate into your own application. Complete this exercise by adding a "
+"new action to the main method of the <literal>EventManager</literal> and "
+"call it from the command line. If you need the identifiers of a person and "
+"an event - the <literal>save()</literal> method returns it (you might have "
+"to modify some of the previous methods to return that identifier):"
 msgstr ""
 "这对我们当前的情形不是很有用,但它是非常重要的概念,你可以把它融入到你自己的"
 "应用程序设计中。在<literal>EventManager</literal>的main方法中添加一个新的动"
@@ -1781,34 +1633,35 @@
 "那个标识符):"
 
 #. Tag: programlisting
-#: tutorial.xml:680
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
-"<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
-"    Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date());\n"
-"    Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
-"    mgr.addPersonToEvent(personId, eventId);\n"
-"    System.out.println(\"Added person \" + personId + \" to event \" + "
-"eventId);\n"
-"}]]>"
+"<![CDATA[        else if (args[0].equals(\"addpersontoevent\")) {\n"
+"            Long eventId = mgr.createAndStoreEvent(\"My Event\", new Date"
+"());\n"
+"            Long personId = mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+"            mgr.addPersonToEvent(personId, eventId);\n"
+"            System.out.println(\"Added person \" + personId + \" to event \" "
+"+ eventId);\n"
+"        }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:682
-#, no-c-format
+#: tutorial.xml:785
+#, fuzzy, no-c-format
 msgid ""
-"This was an example of an association between two equally important classes, "
+"This is an example of an association between two equally important classes : "
 "two entities. As mentioned earlier, there are other classes and types in a "
 "typical model, usually \"less important\". Some you have already seen, like "
-"an <literal>int</literal> or a <literal>String</literal>. We call these "
-"classes <emphasis>value types</emphasis>, and their instances "
+"an <literal>int</literal> or a <classname>java.lang.String</classname>. We "
+"call these classes <emphasis>value types</emphasis>, and their instances "
 "<emphasis>depend</emphasis> on a particular entity. Instances of these types "
-"don't have their own identity, nor are they shared between entities (two "
-"persons don't reference the same <literal>firstname</literal> object, even "
-"if they have the same first name). Of course, value types can not only be "
-"found in the JDK (in fact, in a Hibernate application all JDK classes are "
-"considered value types), but you can also write dependent classes yourself, "
-"<literal>Address</literal> or <literal>MonetaryAmount</literal>, for example."
+"do not have their own identity, nor are they shared between entities. Two "
+"persons do not reference the same <literal>firstname</literal> object, even "
+"if they have the same first name. Value types cannot only be found in the "
+"JDK , but you can also write dependent classes yourself such as an "
+"<literal>Address</literal> or <literal>MonetaryAmount</literal> class. In "
+"fact, in a Hibernate application all JDK classes are considered value types."
 msgstr ""
 "上面是个关于两个同等重要的实体类间关联的例子。像前面所提到的那样,在特定的模"
 "型中也存在其它的类和类型,这些类和类型通常是“次要的”。你已看到过其中的一些,"
@@ -1822,10 +1675,10 @@
 "<literal>MonetaryAmount</literal>。"
 
 #. Tag: para
-#: tutorial.xml:695
-#, no-c-format
+#: tutorial.xml:803
+#, fuzzy, no-c-format
 msgid ""
-"You can also design a collection of value types. This is conceptually very "
+"You can also design a collection of value types. This is conceptually "
 "different from a collection of references to other entities, but looks "
 "almost the same in Java."
 msgstr ""
@@ -1833,69 +1686,66 @@
 "是在Java里面看起来几乎是一样的。"
 
 #. Tag: title
-#: tutorial.xml:703
+#: tutorial.xml:812
 #, no-c-format
 msgid "Collection of values"
 msgstr "值类型的集合"
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:814
 #, no-c-format
 msgid ""
-"We add a collection of value typed objects to the <literal>Person</literal> "
-"entity. We want to store email addresses, so the type we use is "
-"<literal>String</literal>, and the collection is again a <literal>Set</"
-"literal>:"
+"Let's add a collection of email addresses to the <literal>Person</literal> "
+"entity. This will be represented as a <interfacename>java.util.Set</"
+"interfacename> of <classname>java.lang.String</classname> instances:"
 msgstr ""
-"我们把一个值类型对象的集合加入<literal>Person</literal>实体中。我们希望保存"
-"email地址,所以使用<literal>String</literal>类型,而且这次的集合类型又是"
-"<literal>Set</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:710
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
-"<![CDATA[private Set emailAddresses = new HashSet();\n"
+"<![CDATA[    private Set emailAddresses = new HashSet();\n"
 "\n"
-"public Set getEmailAddresses() {\n"
-"    return emailAddresses;\n"
-"}\n"
+"    public Set getEmailAddresses() {\n"
+"        return emailAddresses;\n"
+"    }\n"
 "\n"
-"public void setEmailAddresses(Set emailAddresses) {\n"
-"    this.emailAddresses = emailAddresses;\n"
-"}]]>"
+"    public void setEmailAddresses(Set emailAddresses) {\n"
+"        this.emailAddresses = emailAddresses;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:712
-#, no-c-format
-msgid "The mapping of this <literal>Set</literal>:"
+#: tutorial.xml:822
+#, fuzzy, no-c-format
+msgid "The mapping of this <literal>Set</literal> is as follows:"
 msgstr "这个<literal>Set</literal>的映射"
 
 #. Tag: programlisting
-#: tutorial.xml:716
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
-"    <key column=\"PERSON_ID\"/>\n"
-"    <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
+"            <key column=\"PERSON_ID\"/>\n"
+"            <element type=\"string\" column=\"EMAIL_ADDR\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:718
-#, no-c-format
+#: tutorial.xml:828
+#, fuzzy, no-c-format
 msgid ""
-"The difference compared with the earlier mapping is the <literal>element</"
-"literal> part, which tells Hibernate that the collection does not contain "
-"references to another entity, but a collection of elements of type "
-"<literal>String</literal> (the lowercase name tells you it's a Hibernate "
-"mapping type/converter). Once again, the <literal>table</literal> attribute "
-"of the <literal>set</literal> element determines the table name for the "
-"collection. The <literal>key</literal> element defines the foreign-key "
-"column name in the collection table. The <literal>column</literal> attribute "
-"in the <literal>element</literal> element defines the column name where the "
-"<literal>String</literal> values will actually be stored."
+"The difference compared with the earlier mapping is the use of the "
+"<literal>element</literal> part which tells Hibernate that the collection "
+"does not contain references to another entity, but is rather a collection "
+"whose elements are values types, here specifically of type <literal>string</"
+"literal>. The lowercase name tells you it is a Hibernate mapping type/"
+"converter. Again the <literal>table</literal> attribute of the <literal>set</"
+"literal> element determines the table name for the collection. The "
+"<literal>key</literal> element defines the foreign-key column name in the "
+"collection table. The <literal>column</literal> attribute in the "
+"<literal>element</literal> element defines the column name where the email "
+"address values will actually be stored."
 msgstr ""
 "比较这次和此前映射的差别,主要在于<literal>element</literal>部分,这次并没有"
 "包含对其它实体引用的集合,而是元素类型为<literal>String</literal>的集合(在映"
@@ -1906,13 +1756,13 @@
 "<literal>String</literal>值的字段名。"
 
 #. Tag: para
-#: tutorial.xml:728
-#, no-c-format
-msgid "Have a look at the updated schema:"
+#: tutorial.xml:844
+#, fuzzy, no-c-format
+msgid "Here is the updated schema:"
 msgstr "看一下修改后的数据库schema。"
 
 #. Tag: programlisting
-#: tutorial.xml:732
+#: tutorial.xml:848
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1938,11 +1788,11 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:734
-#, no-c-format
+#: tutorial.xml:850
+#, fuzzy, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
-"composite key, using both columns. This also implies that there can't be "
+"composite key that uses both columns. This also implies that there cannot be "
 "duplicate email addresses per person, which is exactly the semantics we need "
 "for a set in Java."
 msgstr ""
@@ -1951,64 +1801,60 @@
 "元素不能重复)。"
 
 #. Tag: para
-#: tutorial.xml:740
-#, no-c-format
+#: tutorial.xml:856
+#, fuzzy, no-c-format
 msgid ""
-"You can now try and add elements to this collection, just like we did before "
-"by linking persons and events. It's the same code in Java:"
+"You can now try to add elements to this collection, just like we did before "
+"by linking persons and events. It is the same code in Java:"
 msgstr ""
 "你现在可以试着把元素加入到这个集合,就像我们在之前关联person和event的那样。其"
 "实现的Java代码是相同的:"
 
 #. Tag: programlisting
-#: tutorial.xml:745
+#: tutorial.xml:861
 #, no-c-format
 msgid ""
-"<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
-"{\n"
-"\n"
-"    Session session = HibernateUtil.getSessionFactory().getCurrentSession"
+"<![CDATA[    private void addEmailToPerson(Long personId, String "
+"emailAddress) {\n"
+"        Session session = HibernateUtil.getSessionFactory().getCurrentSession"
 "();\n"
-"    session.beginTransaction();\n"
+"        session.beginTransaction();\n"
 "\n"
-"    Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        Person aPerson = (Person) session.load(Person.class, personId);\n"
+"        // adding to the emailAddress collection might trigger a lazy load "
+"of the collection\n"
+"        aPerson.getEmailAddresses().add(emailAddress);\n"
 "\n"
-"    // The getEmailAddresses() might trigger a lazy load of the collection\n"
-"    aPerson.getEmailAddresses().add(emailAddress);\n"
-"\n"
-"    session.getTransaction().commit();\n"
-"}]]>"
+"        session.getTransaction().commit();\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:747
-#, no-c-format
+#: tutorial.xml:863
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
-"collection. Hence, the call to its getter method will trigger an additional "
-"select to initialize it, so we can add an element to it. Monitor the SQL log "
-"and try to optimize this with an eager fetch."
+"This time we did not use a <emphasis>fetch</emphasis> query to initialize "
+"the collection. Monitor the SQL log and try to optimize this with an eager "
+"fetch."
 msgstr ""
 "这次我们没有使用<emphasis>fetch</emphasis>查询来初始化集合。因此,调用其"
 "getter方法会触发另一附加的select来初始化集合,这样我们才能把元素添加进去。检"
 "查SQL log,试着通过预先抓取来优化它。"
 
 #. Tag: title
-#: tutorial.xml:757
+#: tutorial.xml:872
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "双向关联"
 
 #. Tag: para
-#: tutorial.xml:759
-#, no-c-format
+#: tutorial.xml:874
+#, fuzzy, no-c-format
 msgid ""
-"Next we are going to map a bi-directional association - making the "
-"association between person and event work from both sides in Java. Of "
-"course, the database schema doesn't change, we still have many-to-many "
-"multiplicity. A relational database is more flexible than a network "
-"programming language, so it doesn't need anything like a navigation "
-"direction - data can be viewed and retrieved in any possible way."
+"Next you will map a bi-directional association. You will make the "
+"association between person and event work from both sides in Java. The "
+"database schema does not change, so you will still have many-to-many "
+"multiplicity."
 msgstr ""
 "接下来我们将映射双向关联(bi-directional association)- 在Java里让person和"
 "event可以从关联的任何一端访问另一端。当然,数据库schema没有改变,我们仍然需要"
@@ -2017,57 +1863,65 @@
 "获取。"
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:882
 #, no-c-format
 msgid ""
+"A relational database is more flexible than a network programming language, "
+"in that it does not need a navigation direction; data can be viewed and "
+"retrieved in any possible way."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:890
+#, fuzzy, no-c-format
+msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
-"Event class:"
+"class:"
 msgstr "首先,把一个参与者(person)的集合加入<literal>Event</literal>类中:"
 
 #. Tag: programlisting
-#: tutorial.xml:771
+#: tutorial.xml:895
 #, no-c-format
 msgid ""
-"<![CDATA[private Set participants = new HashSet();\n"
+"<![CDATA[    private Set participants = new HashSet();\n"
 "\n"
-"public Set getParticipants() {\n"
-"    return participants;\n"
-"}\n"
+"    public Set getParticipants() {\n"
+"        return participants;\n"
+"    }\n"
 "\n"
-"public void setParticipants(Set participants) {\n"
-"    this.participants = participants;\n"
-"}]]>"
+"    public void setParticipants(Set participants) {\n"
+"        this.participants = participants;\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:773
-#, no-c-format
+#: tutorial.xml:897
+#, fuzzy, no-c-format
 msgid ""
-"Now map this side of the association too, in <literal>Event.hbm.xml</"
-"literal>."
+"Now map this side of the association in <literal>Event.hbm.xml</literal>."
 msgstr "在<literal>Event.hbm.xml</literal>里面也映射这个关联。"
 
 #. Tag: programlisting
-#: tutorial.xml:777
+#: tutorial.xml:901
 #, no-c-format
 msgid ""
-"<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
-"\">\n"
-"    <key column=\"EVENT_ID\"/>\n"
-"    <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
-"</set>]]>"
+"<![CDATA[        <set name=\"participants\" table=\"PERSON_EVENT\" inverse="
+"\"true\">\n"
+"            <key column=\"EVENT_ID\"/>\n"
+"            <many-to-many column=\"PERSON_ID\" class=\"events.Person\"/>\n"
+"        </set>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:779
-#, no-c-format
+#: tutorial.xml:903
+#, fuzzy, no-c-format
 msgid ""
-"As you see, these are normal <literal>set</literal> mappings in both mapping "
-"documents. Notice that the column names in <literal>key</literal> and "
-"<literal>many-to-many</literal> are swapped in both mapping documents. The "
-"most important addition here is the <literal>inverse=\"true\"</literal> "
-"attribute in the <literal>set</literal> element of the <literal>Event</"
-"literal>'s collection mapping."
+"These are normal <literal>set</literal> mappings in both mapping documents. "
+"Notice that the column names in <literal>key</literal> and <literal>many-to-"
+"many</literal> swap in both mapping documents. The most important addition "
+"here is the <literal>inverse=\"true\"</literal> attribute in the "
+"<literal>set</literal> element of the <literal>Event</literal>'s collection "
+"mapping."
 msgstr ""
 "如你所见,两个映射文件里都有普通的<literal>set</literal>映射。注意在两个映射"
 "文件中,互换了<literal>key</literal>和<literal>many-to-many</literal>的字段"
@@ -2075,37 +1929,37 @@
 "literal>元素的<literal>inverse=\"true\"</literal>属性。"
 
 #. Tag: para
-#: tutorial.xml:787
-#, no-c-format
+#: tutorial.xml:911
+#, fuzzy, no-c-format
 msgid ""
-"What this means is that Hibernate should take the other side - the "
-"<literal>Person</literal> class - when it needs to find out information "
-"about the link between the two. This will be a lot easier to understand once "
-"you see how the bi-directional link between our two entities is created ."
+"What this means is that Hibernate should take the other side, the "
+"<literal>Person</literal> class, when it needs to find out information about "
+"the link between the two. This will be a lot easier to understand once you "
+"see how the bi-directional link between our two entities is created."
 msgstr ""
 "这意味着在需要的时候,Hibernate能在关联的另一端 - <literal>Person</literal>"
 "类得到两个实体间关联的信息。这将会极大地帮助你理解双向关联是如何在两个实体间"
 "被创建的。"
 
 #. Tag: title
-#: tutorial.xml:796
+#: tutorial.xml:920
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "使双向连起来"
 
 #. Tag: para
-#: tutorial.xml:798
-#, no-c-format
+#: tutorial.xml:922
+#, fuzzy, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
 "How did we create a link between a <literal>Person</literal> and an "
-"<literal>Event</literal> in the unidirectional example? We added an instance "
+"<literal>Event</literal> in the unidirectional example? You add an instance "
 "of <literal>Event</literal> to the collection of event references, of an "
-"instance of <literal>Person</literal>. So, obviously, if we want to make "
-"this link working bi-directional, we have to do the same on the other side - "
-"adding a <literal>Person</literal> reference to the collection in an "
-"<literal>Event</literal>. This \"setting the link on both sides\" is "
-"absolutely necessary and you should never forget doing it."
+"instance of <literal>Person</literal>. If you want to make this link bi-"
+"directional, you have to do the same on the other side by adding a "
+"<literal>Person</literal> reference to the collection in an <literal>Event</"
+"literal>. This process of \"setting the link on both sides\" is absolutely "
+"necessary with bi-directional links."
 msgstr ""
 "首先请记住,Hibernate并不影响通常的Java语义。 在单向关联的例子中,我们是怎样"
 "在<literal>Person</literal>和<literal>Event</literal>之间创建联系的?我们把"
@@ -2115,47 +1969,46 @@
 "的Person引用集合。这“在关联的两端设置联系”是完全必要的而且你都得这么做。"
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:932
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
-"correctly set both sides, e.g. in <literal>Person</literal>:"
+"Many developers program defensively and create link management methods to "
+"correctly set both sides (for example, in <literal>Person</literal>):"
 msgstr ""
 "许多开发人员防御式地编程,创建管理关联的方法来保证正确的设置了关联的两端,比"
 "如在<literal>Person</literal>里:"
 
 #. Tag: programlisting
-#: tutorial.xml:813
+#: tutorial.xml:937
 #, no-c-format
 msgid ""
-"<![CDATA[protected Set getEvents() {\n"
-"    return events;\n"
-"}\n"
+"<![CDATA[    protected Set getEvents() {\n"
+"        return events;\n"
+"    }\n"
 "\n"
-"protected void setEvents(Set events) {\n"
-"    this.events = events;\n"
-"}\n"
+"    protected void setEvents(Set events) {\n"
+"        this.events = events;\n"
+"    }\n"
 "\n"
-"public void addToEvent(Event event) {\n"
-"    this.getEvents().add(event);\n"
-"    event.getParticipants().add(this);\n"
-"}\n"
+"    public void addToEvent(Event event) {\n"
+"        this.getEvents().add(event);\n"
+"        event.getParticipants().add(this);\n"
+"    }\n"
 "\n"
-"public void removeFromEvent(Event event) {\n"
-"    this.getEvents().remove(event);\n"
-"    event.getParticipants().remove(this);\n"
-"}]]>"
+"    public void removeFromEvent(Event event) {\n"
+"        this.getEvents().remove(event);\n"
+"        event.getParticipants().remove(this);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:815
-#, no-c-format
+#: tutorial.xml:939
+#, fuzzy, no-c-format
 msgid ""
-"Notice that the get and set methods for the collection are now protected - "
-"this allows classes in the same package and subclasses to still access the "
-"methods, but prevents everybody else from messing with the collections "
-"directly (well, almost). You should probably do the same with the collection "
-"on the other side."
+"The get and set methods for the collection are now protected. This allows "
+"classes in the same package and subclasses to still access the methods, but "
+"prevents everybody else from altering the collections directly. Repeat the "
+"steps for the collection on the other side."
 msgstr ""
 "注意现在对于集合的get和set方法的访问级别是protected - 这允许在位于同一个包"
 "(package)中的类以及继承自这个类的子类可以访问这些方法,但禁止其他任何人的直"
@@ -2163,23 +2016,21 @@
 "protected。"
 
 #. Tag: para
-#: tutorial.xml:822
-#, no-c-format
+#: tutorial.xml:946
+#, fuzzy, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
 "for Java, a bi-directional link is simply a matter of setting the references "
-"on both sides correctly. Hibernate however doesn't have enough information "
-"to correctly arrange SQL <literal>INSERT</literal> and <literal>UPDATE</"
-"literal> statements (to avoid constraint violations), and needs some help to "
-"handle bi-directional associations properly. Making one side of the "
-"association <literal>inverse</literal> tells Hibernate to basically ignore "
-"it, to consider it a <emphasis>mirror</emphasis> of the other side. That's "
-"all that is necessary for Hibernate to work out all of the issues when "
-"transformation a directional navigation model to a SQL database schema. The "
-"rules you have to remember are straightforward: All bi-directional "
-"associations need one side as <literal>inverse</literal>. In a one-to-many "
-"association it has to be the many-side, in many-to-many association you can "
-"pick either side, there is no difference."
+"on both sides correctly. Hibernate, however, does not have enough "
+"information to correctly arrange SQL <literal>INSERT</literal> and "
+"<literal>UPDATE</literal> statements (to avoid constraint violations). "
+"Making one side of the association <literal>inverse</literal> tells "
+"Hibernate to consider it a <emphasis>mirror</emphasis> of the other side. "
+"That is all that is necessary for Hibernate to resolve any issues that arise "
+"when transforming a directional navigation model to a SQL database schema. "
+"The rules are straightforward: all bi-directional associations need one side "
+"as <literal>inverse</literal>. In a one-to-many association it has to be the "
+"many-side, and in many-to-many association you can select either side."
 msgstr ""
 "<literal>inverse</literal>映射属性究竟表示什么呢?对于你和Java来说,一个双向"
 "关联仅仅是在两端简单地正确设置引用。然而,Hibernate并没有足够的信息去正确地执"
@@ -2192,25 +2043,19 @@
 "literal>。在一对多关联中它必须是代表多(many)的那端。而在多对多(many-to-"
 "many)关联中,你可以任意选取一端,因为两端之间并没有差别。"
 
-#. Tag: para
-#: tutorial.xml:837
-#, no-c-format
-msgid "Let's turn this into a small web application."
-msgstr "让我们把进入一个小型的web应用程序。"
-
 #. Tag: title
-#: tutorial.xml:844
+#: tutorial.xml:962
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "第三部分 - EventManager web应用程序"
 
 #. Tag: para
-#: tutorial.xml:846
-#, no-c-format
+#: tutorial.xml:964
+#, fuzzy, no-c-format
 msgid ""
 "A Hibernate web application uses <literal>Session</literal> and "
 "<literal>Transaction</literal> almost like a standalone application. "
-"However, some common patterns are useful. We now write an "
+"However, some common patterns are useful. You can now write an "
 "<literal>EventManagerServlet</literal>. This servlet can list all events "
 "stored in the database, and it provides an HTML form to enter new events."
 msgstr ""
@@ -2220,90 +2065,90 @@
 "以列出数据库中保存的所有的events,还提供一个HTML表单来增加新的events。"
 
 #. Tag: title
-#: tutorial.xml:854
+#: tutorial.xml:972
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "编写基本的servlet"
 
 #. Tag: para
-#: tutorial.xml:856
-#, no-c-format
+#: tutorial.xml:974
+#, fuzzy, no-c-format
 msgid ""
-"Create a new class in your source directory, in the <literal>events</"
-"literal> package:"
-msgstr "在你的源代码目录的<literal>events</literal>包中创建一个新的类:"
+"First we need create our basic processing servlet. Since our servlet only "
+"handles HTTP <literal>GET</literal> requests, we will only implement the "
+"<literal>doGet()</literal> method:"
+msgstr ""
+"我们后面会用到<literal>dateFormatter</literal> 的工具, 它把<literal>Date</"
+"literal>对象转换为字符串。只要一个formatter作为servlet的成员就可以了。"
 
 #. Tag: programlisting
-#: tutorial.xml:861
+#: tutorial.xml:980
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.web;\n"
 "\n"
 "// Imports\n"
 "\n"
 "public class EventManagerServlet extends HttpServlet {\n"
 "\n"
-"    // Servlet code\n"
-"}]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:863
-#, no-c-format
-msgid ""
-"The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
-"method we implement is <literal>doGet()</literal>:"
-msgstr ""
-"我们后面会用到<literal>dateFormatter</literal> 的工具, 它把<literal>Date</"
-"literal>对象转换为字符串。只要一个formatter作为servlet的成员就可以了。"
-
-#. Tag: programlisting
-#: tutorial.xml:868
-#, no-c-format
-msgid ""
-"<![CDATA[protected void doGet(HttpServletRequest request,\n"
-"                     HttpServletResponse response)\n"
-"        throws ServletException, IOException {\n"
+"    protected void doGet(\n"
+"            HttpServletRequest request,\n"
+"            HttpServletResponse response) throws ServletException, "
+"IOException {\n"
 "\n"
-"    SimpleDateFormat dateFormatter = new SimpleDateFormat(\"dd.MM.yyyy\");\n"
+"        SimpleDateFormat dateFormatter = new SimpleDateFormat( \"dd.MM.yyyy"
+"\" );\n"
 "\n"
-"    try {\n"
-"        // Begin unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().beginTransaction();\n"
+"        try {\n"
+"            // Begin unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"beginTransaction();\n"
 "\n"
-"        // Process request and render page...\n"
+"            // Process request and render page...\n"
 "\n"
-"        // End unit of work\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().commit();\n"
-"\n"
-"    } catch (Exception ex) {\n"
-"        HibernateUtil.getSessionFactory()\n"
-"                .getCurrentSession().getTransaction().rollback();\n"
-"        throw new ServletException(ex);\n"
+"            // End unit of work\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().commit();\n"
+"        }\n"
+"        catch (Exception ex) {\n"
+"            HibernateUtil.getSessionFactory().getCurrentSession()."
+"getTransaction().rollback();\n"
+"            if ( ServletException.class.isInstance( ex ) ) {\n"
+"                throw ( ServletException ) ex;\n"
+"            }\n"
+"            else {\n"
+"                throw new ServletException( ex );\n"
+"            }\n"
+"        }\n"
 "    }\n"
 "\n"
 "}]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: tutorial.xml:982
+#, no-c-format
+msgid ""
+"Save this servlet as <filename>src/main/java/org/hibernate/tutorial/web/"
+"EventManagerServlet.java</filename>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
 #, fuzzy, no-c-format
 msgid ""
-"The pattern we are applying here is called <emphasis>session-per-request</"
-"emphasis>. When a request hits the servlet, a new Hibernate "
-"<literal>Session</literal> is opened through the first call to "
-"<literal>getCurrentSession()</literal> on the <literal>SessionFactory</"
-"literal>. Then a database transaction is started&mdash;all data access as to "
-"occur inside a transaction, no matter if data is read or written (we don't "
-"use the auto-commit mode in applications)."
+"The pattern applied here is called <emphasis>session-per-request</emphasis>. "
+"When a request hits the servlet, a new Hibernate <literal>Session</literal> "
+"is opened through the first call to <literal>getCurrentSession()</literal> "
+"on the <literal>SessionFactory</literal>. A database transaction is then "
+"started. All data access occurs inside a transaction irrespective of whether "
+"the data is read or written. Do not use the auto-commit mode in applications."
 msgstr ""
 "这个servlet只处理 HTTP <literal>GET</literal> 请求,因此,我们要实现的是"
 "<literal>doGet()</literal>方法:"
 
 #. Tag: para
-#: tutorial.xml:879
+#: tutorial.xml:996
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2318,11 +2163,11 @@
 "在应用程序中不使用auto-commit模式)。"
 
 #. Tag: para
-#: tutorial.xml:886
-#, no-c-format
+#: tutorial.xml:1003
+#, fuzzy, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
-"HTML is rendered. We'll get to that part soon."
+"HTML is rendered. We will get to that part soon."
 msgstr ""
 "<emphasis>不要</emphasis>为每次数据库操作都使用一个新的Hibernate "
 "<literal>Session</literal>。将Hibernate <literal>Session</literal>的范围设置"
@@ -2330,23 +2175,23 @@
 "前Java线程。"
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:1008
 #, fuzzy, no-c-format
 msgid ""
-"Finally, the unit of work ends when processing and rendering is complete. If "
-"any problem occured during processing or rendering, an exception will be "
-"thrown and the database transaction rolled back. This completes the "
+"Finally, the unit of work ends when processing and rendering are complete. "
+"If any problems occurred during processing or rendering, an exception will "
+"be thrown and the database transaction rolled back. This completes the "
 "<literal>session-per-request</literal> pattern. Instead of the transaction "
-"demarcation code in every servlet you could also write a servlet filter. See "
-"the Hibernate website and Wiki for more information about this pattern, "
-"called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as "
-"soon as you consider rendering your view in JSP, not in a servlet."
+"demarcation code in every servlet, you could also write a servlet filter. "
+"See the Hibernate website and Wiki for more information about this pattern "
+"called <emphasis>Open Session in View</emphasis>. You will need it as soon "
+"as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 "下一步,对请求的可能动作进行处理,渲染出反馈的HTML。我们很快就会涉及到那部"
 "分。"
 
 #. Tag: title
-#: tutorial.xml:905
+#: tutorial.xml:1022
 #, no-c-format
 msgid "Processing and rendering"
 msgstr ""
@@ -2359,73 +2204,80 @@
 "就会很快用到它。"
 
 #. Tag: para
-#: tutorial.xml:907
-#, no-c-format
+#: tutorial.xml:1024
+#, fuzzy, no-c-format
 msgid ""
-"Let's implement the processing of the request and rendering of the page."
+"Now you can implement the processing of the request and the rendering of the "
+"page."
 msgstr "处理与渲染"
 
 #. Tag: programlisting
-#: tutorial.xml:911
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
-"<![CDATA[// Write HTML header\n"
-"PrintWriter out = response.getWriter();\n"
-"out.println(\"<html><head><title>Event Manager</title></head><body>\");\n"
+"<![CDATA[        // Write HTML header\n"
+"        PrintWriter out = response.getWriter();\n"
+"        out.println(\"<html><head><title>Event Manager</title></head><body>"
+"\");\n"
 "\n"
-"// Handle actions\n"
-"if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+"        // Handle actions\n"
+"        if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
 "\n"
-"    String eventTitle = request.getParameter(\"eventTitle\");\n"
-"    String eventDate = request.getParameter(\"eventDate\");\n"
+"            String eventTitle = request.getParameter(\"eventTitle\");\n"
+"            String eventDate = request.getParameter(\"eventDate\");\n"
 "\n"
-"    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
-"        out.println(\"<b><i>Please enter event title and date.</i></b>\");\n"
-"    } else {\n"
-"        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDate));\n"
-"        out.println(\"<b><i>Added event.</i></b>\");\n"
-"    }\n"
-"}\n"
+"            if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+"                out.println(\"<b><i>Please enter event title and date.</i></"
+"b>\");\n"
+"            }\n"
+"            else {\n"
+"                createAndStoreEvent(eventTitle, dateFormatter.parse"
+"(eventDate));\n"
+"                out.println(\"<b><i>Added event.</i></b>\");\n"
+"            }\n"
+"        }\n"
 "\n"
-"// Print page\n"
-"printEventForm(out);\n"
-"listEvents(out, dateFormatter);\n"
+"        // Print page\n"
+"       printEventForm(out);\n"
+"       listEvents(out, dateFormatter);\n"
 "\n"
-"// Write HTML footer\n"
-"out.println(\"</body></html>\");\n"
-"out.flush();\n"
-"out.close();]]>"
+"       // Write HTML footer\n"
+"       out.println(\"</body></html>\");\n"
+"       out.flush();\n"
+"       out.close();]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:913
+#: tutorial.xml:1030
 #, fuzzy, no-c-format
 msgid ""
-"Granted, this coding style with a mix of Java and HTML would not scale in a "
-"more complex application&mdash;keep in mind that we are only illustrating "
-"basic Hibernate concepts in this tutorial. The code prints an HTML header "
-"and a footer. Inside this page, an HTML form for event entry and a list of "
-"all events in the database are printed. The first method is trivial and only "
+"This coding style, with a mix of Java and HTML, would not scale in a more "
+"complex application&mdash;keep in mind that we are only illustrating basic "
+"Hibernate concepts in this tutorial. The code prints an HTML header and a "
+"footer. Inside this page, an HTML form for event entry and a list of all "
+"events in the database are printed. The first method is trivial and only "
 "outputs HTML:"
 msgstr "我们来实现处理请求以及渲染页面的工作。"
 
 #. Tag: programlisting
-#: tutorial.xml:922
+#: tutorial.xml:1039
 #, no-c-format
 msgid ""
-"<![CDATA[private void printEventForm(PrintWriter out) {\n"
-"    out.println(\"<h2>Add new event:</h2>\");\n"
-"    out.println(\"<form>\");\n"
-"    out.println(\"Title: <input name='eventTitle' length='50'/><br/>\");\n"
-"    out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
+"<![CDATA[    private void printEventForm(PrintWriter out) {\n"
+"        out.println(\"<h2>Add new event:</h2>\");\n"
+"        out.println(\"<form>\");\n"
+"        out.println(\"Title: <input name='eventTitle' length='50'/><br/>"
+"\");\n"
+"        out.println(\"Date (e.g. 24.12.2009): <input name='eventDate' "
 "length='10'/><br/>\");\n"
-"    out.println(\"<input type='submit' name='action' value='store'/>\");\n"
-"    out.println(\"</form>\");\n"
-"}]]>"
+"        out.println(\"<input type='submit' name='action' value='store'/>"
+"\");\n"
+"        out.println(\"</form>\");\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:924
+#: tutorial.xml:1041
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2435,37 +2287,37 @@
 "<literal>Session</literal>来执行查询:"
 
 #. Tag: programlisting
-#: tutorial.xml:930
+#: tutorial.xml:1047
 #, no-c-format
 msgid ""
-"<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
+"<![CDATA[    private void listEvents(PrintWriter out, SimpleDateFormat "
 "dateFormatter) {\n"
 "\n"
-"    List result = HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().createCriteria(Event.class).list"
-"();\n"
-"    if (result.size() > 0) {\n"
-"        out.println(\"<h2>Events in database:</h2>\");\n"
-"        out.println(\"<table border='1'>\");\n"
-"        out.println(\"<tr>\");\n"
-"        out.println(\"<th>Event title</th>\");\n"
-"        out.println(\"<th>Event date</th>\");\n"
-"        out.println(\"</tr>\");\n"
-"        for (Iterator it = result.iterator(); it.hasNext();) {\n"
-"            Event event = (Event) it.next();\n"
+"        List result = HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().createCriteria(Event.class).list();\n"
+"        if (result.size() > 0) {\n"
+"            out.println(\"<h2>Events in database:</h2>\");\n"
+"            out.println(\"<table border='1'>\");\n"
 "            out.println(\"<tr>\");\n"
-"            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
-"            out.println(\"<td>\" + dateFormatter.format(event.getDate()) + "
-"\"</td>\");\n"
+"            out.println(\"<th>Event title</th>\");\n"
+"            out.println(\"<th>Event date</th>\");\n"
 "            out.println(\"</tr>\");\n"
+"            Iterator it = result.iterator();\n"
+"            while (it.hasNext()) {\n"
+"                Event event = (Event) it.next();\n"
+"                out.println(\"<tr>\");\n"
+"                out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+"                out.println(\"<td>\" + dateFormatter.format(event.getDate()) "
+"+ \"</td>\");\n"
+"                out.println(\"</tr>\");\n"
+"            }\n"
+"            out.println(\"</table>\");\n"
 "        }\n"
-"        out.println(\"</table>\");\n"
-"    }\n"
-"}]]>"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:932
+#: tutorial.xml:1049
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2476,31 +2328,32 @@
 "literal>方法,它也使用当前线程的<literal>Session</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:938
+#: tutorial.xml:1055
 #, no-c-format
 msgid ""
-"<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
-"    Event theEvent = new Event();\n"
-"    theEvent.setTitle(title);\n"
-"    theEvent.setDate(theDate);\n"
+"<![CDATA[    protected void createAndStoreEvent(String title, Date theDate) "
+"{\n"
+"        Event theEvent = new Event();\n"
+"        theEvent.setTitle(title);\n"
+"        theEvent.setDate(theDate);\n"
 "\n"
-"    HibernateUtil.getSessionFactory()\n"
-"                    .getCurrentSession().save(theEvent);\n"
-"}]]>"
+"        HibernateUtil.getSessionFactory()\n"
+"                .getCurrentSession().save(theEvent);\n"
+"    }]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
-#, no-c-format
+#: tutorial.xml:1057
+#, fuzzy, no-c-format
 msgid ""
-"That's it, the servlet is complete. A request to the servlet will be "
-"processed in a single <literal>Session</literal> and <literal>Transaction</"
-"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
-"gives you the freedom to layer your code and access the "
-"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
-"more sophisticated design and move the data access code into data access "
-"objects (the DAO pattern). See the Hibernate Wiki for more examples."
+"The servlet is now complete. A request to the servlet will be processed in a "
+"single <literal>Session</literal> and <literal>Transaction</literal>. As "
+"earlier in the standalone application, Hibernate can automatically bind "
+"these objects to the current thread of execution. This gives you the freedom "
+"to layer your code and access the <literal>SessionFactory</literal> in any "
+"way you like. Usually you would use a more sophisticated design and move the "
+"data access code into data access objects (the DAO pattern). See the "
+"Hibernate Wiki for more examples."
 msgstr ""
 "大功告成,这个servlet写完了。Hibernate会在单一的<literal>Session</literal> 和"
 "<literal>Transaction</literal>中处理到达的servlet请求。如同在前面的独立应用程"
@@ -2510,53 +2363,24 @@
 "Hibernate Wiki,那里有更多的例子。"
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1071
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "部署与测试"
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1073
 #, no-c-format
 msgid ""
-"To deploy this application you have to create a web archive, a WAR. Add the "
-"following Ant target to your <literal>build.xml</literal>:"
+"To deploy this application for testing we must create a Web ARchive (WAR). "
+"First we must define the WAR descriptor as <filename>src/main/webapp/WEB-INF/"
+"web.xml</filename>"
 msgstr ""
-"要发布这个程序,你得把它打成web发布包:WAR文件。把下面的脚本加入到你的"
-"<literal>build.xml</literal>中:"
 
 #. Tag: programlisting
-#: tutorial.xml:961
+#: tutorial.xml:1079
 #, no-c-format
 msgid ""
-"<![CDATA[<target name=\"war\" depends=\"compile\">\n"
-"    <war destfile=\"hibernate-tutorial.war\" webxml=\"web.xml\">\n"
-"        <lib dir=\"${librarydir}\">\n"
-"          <exclude name=\"jsdk*.jar\"/>\n"
-"        </lib>\n"
-"\n"
-"        <classes dir=\"${targetdir}\"/>\n"
-"    </war>\n"
-"</target>]]>"
-msgstr ""
-
-#. Tag: para
-#: tutorial.xml:963
-#, no-c-format
-msgid ""
-"This target creates a file called <literal>hibernate-tutorial.war</literal> "
-"in your project directory. It packages all libraries and the <literal>web."
-"xml</literal> descriptor, which is expected in the base directory of your "
-"project:"
-msgstr ""
-"这段代码在你的开发目录中创建一个<literal>hibernate-tutorial.war</literal>的文"
-"件。它把所有的类库和<literal>web.xml</literal>描述文件都打包进去,web.xml 文"
-"件应该位于你的开发根目录中:"
-
-#. Tag: programlisting
-#: tutorial.xml:969
-#, no-c-format
-msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<web-app version=\"2.4\"\n"
 "    xmlns=\"http://java.sun.com/xml/ns/j2ee\"\n"
@@ -2566,7 +2390,8 @@
 "\n"
 "    <servlet>\n"
 "        <servlet-name>Event Manager</servlet-name>\n"
-"        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+"        <servlet-class>org.hibernate.tutorial.web.EventManagerServlet</"
+"servlet-class>\n"
 "    </servlet>\n"
 "\n"
 "    <servlet-mapping>\n"
@@ -2577,36 +2402,29 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:971
-#, no-c-format
+#: tutorial.xml:1081
+#, fuzzy, no-c-format
 msgid ""
-"Before you compile and deploy the web application, note that an additional "
-"library is required: <literal>jsdk.jar</literal>. This is the Java servlet "
-"development kit, if you don't have this library already, get it from the Sun "
-"website and copy it to your library directory. However, it will be only used "
-"for compliation and excluded from the WAR package."
+"To build and deploy call <literal>mvn package</literal> in your project "
+"directory and copy the <filename>hibernate-tutorial.war</filename> file into "
+"your Tomcat <filename>webapps</filename> directory."
 msgstr ""
-"请注意在你编译和部署web应用程之前,需要一个附加的类库:<literal>jsdk.jar</"
-"literal>。这是Java Servlet开发包,假若你还没有,可以从Sun网站上下载,把它copy"
-"到你的lib目录。但是,它仅仅是在编译时需要,不会被打入WAR包。"
+"在你的开发目录中,调用<literal>ant war</literal>来构建、打包,然后把"
+"<literal>hibernate-tutorial.war</literal>文件拷贝到你的tomcat的"
+"<literal>webapps</literal>目录下。假若你还没安装Tomcat,就去下载一个,按照指"
+"南来安装。对此应用的发布,你不需要修改任何Tomcat的配置。"
 
 #. Tag: para
-#: tutorial.xml:979
+#: tutorial.xml:1088
 #, no-c-format
 msgid ""
-"To build and deploy call <literal>ant war</literal> in your project "
-"directory and copy the <literal>hibernate-tutorial.war</literal> file into "
-"your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat "
-"installed, download it and follow the installation instructions. You don't "
-"have to change any Tomcat configuration to deploy this application though."
+"If you do not have Tomcat installed, download it from <ulink url=\"http://"
+"tomcat.apache.org/\"></ulink> and follow the installation instructions. Our "
+"application requires no changes to the standard Tomcat configuration."
 msgstr ""
-"在你的开发目录中,调用<literal>ant war</literal>来构建、打包,然后把"
-"<literal>hibernate-tutorial.war</literal>文件拷贝到你的tomcat的"
-"<literal>webapps</literal>目录下。假若你还没安装Tomcat,就去下载一个,按照指"
-"南来安装。对此应用的发布,你不需要修改任何Tomcat的配置。"
 
 #. Tag: para
-#: tutorial.xml:987
+#: tutorial.xml:1096
 #, no-c-format
 msgid ""
 "Once deployed and Tomcat is running, access the application at "
@@ -2622,41 +2440,370 @@
 "literal>的静态初始化器被调用),假若有任何异常抛出,也可以看到详细的输出。"
 
 #. Tag: title
-#: tutorial.xml:1000
+#: tutorial.xml:1109
 #, no-c-format
 msgid "Summary"
 msgstr "总结"
 
 #. Tag: para
-#: tutorial.xml:1002
-#, no-c-format
+#: tutorial.xml:1111
+#, fuzzy, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
-"application and a small web application."
+"application and a small web application. More tutorials are available from "
+"the Hibernate <ulink url=\"http://hibernate.org\">website</ulink>."
 msgstr ""
 "本章覆盖了如何编写一个简单独立的Hibernate命令行应用程序及小型的Hibernate web"
 "应用程序的基本要素。"
 
-#. Tag: para
-#: tutorial.xml:1007
-#, no-c-format
-msgid ""
-"If you already feel confident with Hibernate, continue browsing through the "
-"reference documentation table of contents for topics you find interesting - "
-"most asked are transactional processing (<xref linkend=\"transactions\"/>), "
-"fetch performance (<xref linkend=\"performance\"/>), or the usage of the API "
-"(<xref linkend=\"objectstate\"/>) and the query features (<xref linkend="
-"\"objectstate-querying\"/>)."
-msgstr ""
-"如果你已经对Hibernate感到自信,通过开发指南目录,继续浏览你感兴趣的内容-那些"
-"会被问到的问题大多是事务处理 (<xref linkend=\"transactions\"/>),抓取"
-"(fetch)的效率 (<xref linkend=\"performance\"/>),或者API的使用 (<xref "
-"linkend=\"objectstate\"/>)和查询的特性(<xref linkend=\"objectstate-querying"
-"\"/>)。"
+#~ msgid "Introduction to Hibernate"
+#~ msgstr "Hibernate入门"
 
-#. Tag: para
-#: tutorial.xml:1015
-#, no-c-format
-msgid ""
-"Don't forget to check the Hibernate website for more (specialized) tutorials."
-msgstr "别忘了去Hibernate的网站查看更多(有针对性的)示例。"
+#~ msgid "Preface"
+#~ msgstr "前言"
+
+#~ msgid ""
+#~ "This chapter is an introductory tutorial for new users of Hibernate. We "
+#~ "start with a simple command line application using an in-memory database "
+#~ "and develop it in easy to understand steps."
+#~ msgstr ""
+#~ "本章是面向Hibernate初学者的一个入门教程。我们从一个使用驻留内存式(in-"
+#~ "memory)数据库的简单命令行应用程序开始, 用易于理解的方式逐步开发。"
+
+#~ msgid ""
+#~ "This tutorial is intended for new users of Hibernate but requires Java "
+#~ "and SQL knowledge. It is based on a tutorial by Michael Gloegl, the third-"
+#~ "party libraries we name are for JDK 1.4 and 5.0. You might need others "
+#~ "for JDK 1.3."
+#~ msgstr ""
+#~ "本章面向Hibernate初学者,但需要Java和SQL知识。它是在Michael Goegl所写的指"
+#~ "南的基础上完成的。在这里,我们称第三方库文件是指JDK 1.4和5.0。若使用"
+#~ "JDK1.3,你可能需要其它的库文件。"
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "本章的源代码已包含在发布包中,位于<literal>doc/reference/tutorial/</"
+#~ "literal>目录下。"
+
+#~ msgid ""
+#~ "First, we'll create a simple console-based Hibernate application. We use "
+#~ "an Java database (HSQL DB), so we do not have to install any database "
+#~ "server."
+#~ msgstr ""
+#~ "首先我们将创建一个简单的基于控制台的(console-based)Hibernate应用程序。由于"
+#~ "我们使用Java数据库(HSQL DB),所以不必安装任何数据库服务器。"
+
+#~ msgid ""
+#~ "The first thing we do, is set up our development directory and put all "
+#~ "the Java libraries we need into it. Download the Hibernate distribution "
+#~ "from the Hibernate website. Extract the package and place all required "
+#~ "libraries found in <literal>/lib</literal> into into the <literal>/lib</"
+#~ "literal> directory of your new development working directory. It should "
+#~ "look like this:"
+#~ msgstr ""
+#~ "我们所做的第一件事就是创建我们的开发目录,并且把所有需要用到的Java库文件放"
+#~ "进去。解压缩从Hibernate网站下载的Hibernate发布包,并把<literal>/lib</"
+#~ "literal>目录下所有需要的库文件拷到我们新建开发目录下的<literal>/lib</"
+#~ "literal>目录下。看起来就像这样:"
+
+#~ msgid ""
+#~ "This is the minimum set of required libraries (note that we also copied "
+#~ "hibernate3.jar, the main archive) for Hibernate <emphasis>at the time of "
+#~ "writing</emphasis>. The Hibernate release you are using might require "
+#~ "more or less libraries. See the <literal>README.txt</literal> file in the "
+#~ "<literal>lib/</literal> directory of the Hibernate distribution for more "
+#~ "information about required and optional third-party libraries. (Actually, "
+#~ "Log4j is not required but preferred by many developers.)"
+#~ msgstr ""
+#~ "<emphasis>到编写本文时为止</emphasis>,这些是Hibernate运行所需要的最小库文"
+#~ "件集合(注意我们也拷贝了 Hibernate3.jar,这个是最主要的文件)。你正使用的"
+#~ "Hibernate版本可能需要比这更多或少一些的库文件。请参见发布包中的"
+#~ "<literal>lib/</literal>目录下的<literal>README.txt</literal>,以获取更多关"
+#~ "于所需和可选的第三方库文件信息(事实上,Log4j并不是必须的库文件,但被许多"
+#~ "开发者所喜欢)。"
+
+#~ msgid ""
+#~ "Our first persistent class is a simple JavaBean class with some "
+#~ "properties:"
+#~ msgstr ""
+#~ "我们的第一个持久化类是一个带有一些属性(property)的简单JavaBean类:"
+
+#~ msgid ""
+#~ "Place this Java source file in a directory called <literal>src</literal> "
+#~ "in the development folder, and in its correct package. The directory "
+#~ "should now look like this:"
+#~ msgstr ""
+#~ "把这个Java源代码文件放到开发目录下的<literal>src</literal>目录里,注意包位"
+#~ "置要正确。 现在这个目录看起来应该像这样:"
+
+#~ msgid "In the next step, we tell Hibernate about this persistent class."
+#~ msgstr "下一步,我们把这个持久化类的信息告诉Hibernate。"
+
+#~ msgid ""
+#~ "The <literal>id</literal> element is the declaration of the identifer "
+#~ "property, <literal>name=\"id\"</literal> declares the name of the Java "
+#~ "property - Hibernate will use the getter and setter methods to access the "
+#~ "property. The column attribute tells Hibernate which column of the "
+#~ "<literal>EVENTS</literal> table we use for this primary key. The nested "
+#~ "<literal>generator</literal> element specifies the identifier generation "
+#~ "strategy, in this case we used <literal>native</literal>, which picks the "
+#~ "best strategy depending on the configured database (dialect). Hibernate "
+#~ "supports database generated, globally unique, as well as application "
+#~ "assigned identifiers (or any strategy you have written an extension for)."
+#~ msgstr ""
+#~ "<literal>id</literal>元素是标识符属性的声明,<literal>name=\"id\"</"
+#~ "literal> 声明了Java属性的名字 - Hibernate会使用<literal>getId()</literal>"
+#~ "和<literal>setId()</literal>来访问它。 <literal>column</literal>属性则告诉"
+#~ "Hibernate, 我们使用<literal>EVENTS</literal>表的哪个字段作为主键。嵌套的"
+#~ "<literal>generator</literal>元素指定了标识符生成策略,在这里我们指定"
+#~ "<literal>native</literal>,它根据已配置的数据库(方言)自动选择最佳的标识"
+#~ "符生成策略。Hibernate支持由数据库生成,全局唯一性(globally unique)和应用"
+#~ "程序指定(或者你自己为任何已有策略所写的扩展)这些策略来生成标识符。"
+
+#~ msgid ""
+#~ "This mapping file should be saved as <literal>Event.hbm.xml</literal>, "
+#~ "right in the directory next to the <literal>Event</literal> Java class "
+#~ "source file. The naming of mapping files can be arbitrary, however the "
+#~ "<literal>hbm.xml</literal> suffix is a convention in the Hibernate "
+#~ "developer community. The directory structure should now look like this:"
+#~ msgstr ""
+#~ "应该把这个映射文件保存为<literal>Event.hbm.xml</literal>,且就在"
+#~ "<literal>Event</literal>Java类的源文件目录下。映射文件可随意地命名,但"
+#~ "<literal>hbm.xml</literal>的后缀已成为Hibernate开发者社区的约定。现在目录"
+#~ "结构看起来应该像这样:"
+
+#~ msgid "We continue with the main configuration of Hibernate."
+#~ msgstr "我们继续进行Hibernate的主要配置。"
+
+#~ msgid ""
+#~ "We now have a persistent class and its mapping file in place. It is time "
+#~ "to configure Hibernate. Before we do this, we will need a database. HSQL "
+#~ "DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website"
+#~ "(http://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</"
+#~ "literal> from this download. Place this file in the <literal>lib/</"
+#~ "literal> directory of the development folder."
+#~ msgstr ""
+#~ "现在我们已经有了一个持久化类和它的映射文件,该是配置Hibernate的时候了。在"
+#~ "此之前,我们需要一个数据库。 HSQL DB是种基于Java 的SQL数据库管理系统"
+#~ "(DBMS),可以从HSQL DB的网站上下载。实际上,你只需下载的包中的"
+#~ "<literal>hsqldb.jar</literal>文件,并把这个文件放在开发文件夹的"
+#~ "<literal>lib/</literal>目录下即可。"
+
+#~ msgid ""
+#~ "Hibernate is the layer in your application which connects to this "
+#~ "database, so it needs connection information. The connections are made "
+#~ "through a JDBC connection pool, which we also have to configure. The "
+#~ "Hibernate distribution contains several open source JDBC connection "
+#~ "pooling tools, but will use the Hibernate built-in connection pool for "
+#~ "this tutorial. Note that you have to copy the required library into your "
+#~ "classpath and use different connection pooling settings if you want to "
+#~ "use a production-quality third party JDBC pooling software."
+#~ msgstr ""
+#~ "Hibernate是你的应用程序里连接数据库的那层,所以它需要连接用的信息。连接"
+#~ "(connection)是通过一个也由我们配置的JDBC连接池(connection pool)来完成"
+#~ "的。Hibernate的发布包里包含了许多开源的(open source)连接池,但在我们例子"
+#~ "中使用Hibernate内置的连接池。注意,如果你希望使用一个产品级(production-"
+#~ "quality)的第三方连接池软件,你必须拷贝所需的库文件到你的classpath下,并使"
+#~ "用不同的连接池设置。"
+
+#~ msgid ""
+#~ "Copy this file into the source directory, so it will end up in the root "
+#~ "of the classpath. Hibernate automatically looks for a file called "
+#~ "<literal>hibernate.cfg.xml</literal> in the root of the classpath, on "
+#~ "startup."
+#~ msgstr ""
+#~ "把这个文件拷贝到源代码目录下面,这样它就位于classpath的根目录的最后。"
+#~ "Hibernate在启动时会自动在classpath的根目录查找名为<literal>hibernate.cfg."
+#~ "xml</literal>的配置文件。"
+
+#~ msgid ""
+#~ "We'll now build the tutorial with Ant. You will need to have Ant "
+#~ "installed - get it from the <ulink url=\"http://ant.apache.org/"
+#~ "bindownload.cgi\">Ant download page</ulink>. How to install Ant will not "
+#~ "be covered here. Please refer to the <ulink url=\"http://ant.apache.org/"
+#~ "manual/index.html\">Ant manual</ulink>. After you have installed Ant, we "
+#~ "can start to create the buildfile. It will be called <literal>build.xml</"
+#~ "literal> and placed directly in the development directory."
+#~ msgstr ""
+#~ "现在我们用Ant来构建应用程序。你必须先安装Ant-可以从<ulink url=\"http://"
+#~ "ant.apache.org/bindownload.cgi\">Ant 下载页面</ulink>得到它。怎样安装Ant就"
+#~ "不在这里介绍了,请参考<ulink url=\"http://ant.apache.org/manual/index.html"
+#~ "\">Ant 用户手册</ulink>。当你安装完了Ant,就可以开始创建<literal>build."
+#~ "xml</literal>文件,把它直接放在开发目录下面。"
+
+#~ msgid "A basic build file looks like this:"
+#~ msgstr "一个简单的build文件看起来像这样:"
+
+#~ msgid ""
+#~ "This will tell Ant to add all files in the lib directory ending with "
+#~ "<literal>.jar</literal> to the classpath used for compilation. It will "
+#~ "also copy all non-Java source files to the target directory, e.g. "
+#~ "configuration and Hibernate mapping files. If you now run Ant, you should "
+#~ "get this output:"
+#~ msgstr ""
+#~ "这将告诉Ant把所有在lib目录下以<literal>.jar</literal>结尾的文件拷贝到"
+#~ "classpath中以供编译之用。它也把所有的非Java源代码文件,例如配置和Hibernate"
+#~ "映射文件,拷贝到目标目录。如果你现在运行Ant,会得到以下输出:"
+
+#~ msgid ""
+#~ "Place <literal>HibernateUtil.java</literal> in the development source "
+#~ "directory, in a package next to <literal>events</literal>:"
+#~ msgstr ""
+#~ "把<literal>HibernateUtil.java</literal>放在开发目录的源代码路径下,与放"
+#~ "<literal>events</literal>的包并列:"
+
+#~ msgid ""
+#~ "To run this first routine we have to add a callable target to the Ant "
+#~ "build file:"
+#~ msgstr ""
+#~ "为第一次运行我们的程序,我们得在Ant的build文件中增加一个可以调用得到的"
+#~ "target。"
+
+#~ msgid ""
+#~ "The value of the <literal>action</literal> argument is set on the command "
+#~ "line when calling the target:"
+#~ msgstr ""
+#~ "<literal>action</literal>参数(argument)的值是通过命令行调用这个target的"
+#~ "时候设置的:"
+
+#~ msgid ""
+#~ "This is the <literal>INSERT</literal> executed by Hibernate, the question "
+#~ "marks represent JDBC bind parameters. To see the values bound as "
+#~ "arguments, or to reduce the verbosity of the log, check your "
+#~ "<literal>log4j.properties</literal>."
+#~ msgstr ""
+#~ "这是Hibernate执行的<literal>INSERT</literal>命令,问号代表JDBC的绑定参数。"
+#~ "如果想要看到绑定参数的值或者减少日志的长度,就要调整你在<literal>log4j."
+#~ "properties</literal>文件里的设置。"
+
+#~ msgid "Now, to execute and test all of this, follow these steps:"
+#~ msgstr "现在,根据以下步骤来执行并测试以上各项:"
+
+#~ msgid ""
+#~ "Run <literal>ant run -Daction=store</literal> to store something into the "
+#~ "database and, of course, to generate the database schema before through "
+#~ "hbm2ddl."
+#~ msgstr ""
+#~ "运行<literal>ant run -Daction=store</literal>来保存一些内容到数据库。当"
+#~ "然,先得用hbm2ddl来生成数据库schema。"
+
+#~ msgid ""
+#~ "Now disable hbm2ddl by commenting out the property in your "
+#~ "<literal>hibernate.cfg.xml</literal> file. Usually you only leave it "
+#~ "turned on in continous unit testing, but another run of hbm2ddl would "
+#~ "<emphasis>drop</emphasis> everything you have stored - the "
+#~ "<literal>create</literal> configuration setting actually translates into "
+#~ "\"drop all tables from the schema, then re-create all tables, when the "
+#~ "SessionFactory is build\"."
+#~ msgstr ""
+#~ "现在把<literal>hibernate.cfg.xml</literal>文件中hbm2ddl属性注释掉,这样我"
+#~ "们就取消了在启动时用hbm2ddl来生成数据库schema。通常只有在不断重复进行单元"
+#~ "测试的时候才需要打开它,但再次运行hbm2ddl会把你保存的一切都删掉"
+#~ "(<emphasis>drop</emphasis>)——<literal>create</literal>配置的真实含义"
+#~ "是:“在创建SessionFactory的时候,从schema 中drop 掉所有的表,再重新创建它"
+#~ "们”。"
+
+#~ msgid ""
+#~ "If you now call Ant with <literal>-Daction=list</literal>, you should see "
+#~ "the events you have stored so far. You can of course also call the "
+#~ "<literal>store</literal> action a few times more."
+#~ msgstr ""
+#~ "如果你现在使用命令行参数<literal>-Daction=list</literal>运行Ant,你会看到"
+#~ "那些至今为止我们所储存的events。当然,你也可以多调用几次<literal>store</"
+#~ "literal>以保存更多的envents。"
+
+#~ msgid ""
+#~ "Note: Most new Hibernate users fail at this point and we see questions "
+#~ "about <emphasis>Table not found</emphasis> error messages regularly. "
+#~ "However, if you follow the steps outlined above you will not have this "
+#~ "problem, as hbm2ddl creates the database schema on the first run, and "
+#~ "subsequent application restarts will use this schema. If you change the "
+#~ "mapping and/or database schema, you have to re-enable hbm2ddl once again."
+#~ msgstr ""
+#~ "注意,很多Hibernate新手在这一步会失败,我们不时看到关于<emphasis>Table "
+#~ "not found</emphasis>错误信息的提问。但是,只要你根据上面描述的步骤来执行,"
+#~ "就不会有这个问题,因为hbm2ddl会在第一次运行的时候创建数据库schema,后继的"
+#~ "应用程序重起后还能继续使用这个schema。假若你修改了映射,或者修改了数据库"
+#~ "schema,你必须把hbm2ddl重新打开一次。"
+
+#~ msgid ""
+#~ "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
+#~ "forget the DTD reference at the top):"
+#~ msgstr ""
+#~ "创建一个名为<literal>Person.hbm.xml</literal>的新映射文件(别忘了最上面的"
+#~ "DTD引用):"
+
+#~ msgid ""
+#~ "We need a unidirectional, many-valued associations, implemented with a "
+#~ "<literal>Set</literal>. Let's write the code for this in the Java classes "
+#~ "and then map it:"
+#~ msgstr ""
+#~ "我们需要用set 实现一个单向多值关联。让我们在Java类里为这个关联编码,接着映"
+#~ "射它:"
+
+#~ msgid ""
+#~ "We add a collection of value typed objects to the <literal>Person</"
+#~ "literal> entity. We want to store email addresses, so the type we use is "
+#~ "<literal>String</literal>, and the collection is again a <literal>Set</"
+#~ "literal>:"
+#~ msgstr ""
+#~ "我们把一个值类型对象的集合加入<literal>Person</literal>实体中。我们希望保"
+#~ "存email地址,所以使用<literal>String</literal>类型,而且这次的集合类型又是"
+#~ "<literal>Set</literal>:"
+
+#~ msgid "Let's turn this into a small web application."
+#~ msgstr "让我们把进入一个小型的web应用程序。"
+
+#~ msgid ""
+#~ "Create a new class in your source directory, in the <literal>events</"
+#~ "literal> package:"
+#~ msgstr "在你的源代码目录的<literal>events</literal>包中创建一个新的类:"
+
+#~ msgid ""
+#~ "To deploy this application you have to create a web archive, a WAR. Add "
+#~ "the following Ant target to your <literal>build.xml</literal>:"
+#~ msgstr ""
+#~ "要发布这个程序,你得把它打成web发布包:WAR文件。把下面的脚本加入到你的"
+#~ "<literal>build.xml</literal>中:"
+
+#~ msgid ""
+#~ "This target creates a file called <literal>hibernate-tutorial.war</"
+#~ "literal> in your project directory. It packages all libraries and the "
+#~ "<literal>web.xml</literal> descriptor, which is expected in the base "
+#~ "directory of your project:"
+#~ msgstr ""
+#~ "这段代码在你的开发目录中创建一个<literal>hibernate-tutorial.war</literal>"
+#~ "的文件。它把所有的类库和<literal>web.xml</literal>描述文件都打包进去,web."
+#~ "xml 文件应该位于你的开发根目录中:"
+
+#~ msgid ""
+#~ "Before you compile and deploy the web application, note that an "
+#~ "additional library is required: <literal>jsdk.jar</literal>. This is the "
+#~ "Java servlet development kit, if you don't have this library already, get "
+#~ "it from the Sun website and copy it to your library directory. However, "
+#~ "it will be only used for compliation and excluded from the WAR package."
+#~ msgstr ""
+#~ "请注意在你编译和部署web应用程之前,需要一个附加的类库:<literal>jsdk.jar</"
+#~ "literal>。这是Java Servlet开发包,假若你还没有,可以从Sun网站上下载,把它"
+#~ "copy到你的lib目录。但是,它仅仅是在编译时需要,不会被打入WAR包。"
+
+#~ msgid ""
+#~ "If you already feel confident with Hibernate, continue browsing through "
+#~ "the reference documentation table of contents for topics you find "
+#~ "interesting - most asked are transactional processing (<xref linkend="
+#~ "\"transactions\"/>), fetch performance (<xref linkend=\"performance\"/>), "
+#~ "or the usage of the API (<xref linkend=\"objectstate\"/>) and the query "
+#~ "features (<xref linkend=\"objectstate-querying\"/>)."
+#~ msgstr ""
+#~ "如果你已经对Hibernate感到自信,通过开发指南目录,继续浏览你感兴趣的内容-"
+#~ "那些会被问到的问题大多是事务处理 (<xref linkend=\"transactions\"/>),抓取"
+#~ "(fetch)的效率 (<xref linkend=\"performance\"/>),或者API的使用 (<xref "
+#~ "linkend=\"objectstate\"/>)和查询的特性(<xref linkend=\"objectstate-"
+#~ "querying\"/>)。"
+
+#~ msgid ""
+#~ "Don't forget to check the Hibernate website for more (specialized) "
+#~ "tutorials."
+#~ msgstr "别忘了去Hibernate的网站查看更多(有针对性的)示例。"

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/xml.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/xml.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/xml.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2008-08-14 15:28+0000\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,10 +18,10 @@
 
 #. Tag: emphasis
 #: xml.xml:31
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Note that this is an experimental feature in Hibernate 3.0 and is under "
-"extremely active development."
+"XML Mapping is an experimental feature in Hibernate 3.0 and is currently "
+"under active development."
 msgstr "注意这是Hibernate 3.0的一个实验性的特性。这一特性仍在积极开发中。"
 
 #. Tag: title
@@ -32,12 +32,12 @@
 
 #. Tag: para
 #: xml.xml:39
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hibernate lets you work with persistent XML data in much the same way you "
-"work with persistent POJOs. A parsed XML tree can be thought of as just "
-"another way to represent the relational data at the object level, instead of "
-"POJOs."
+"Hibernate allows you to work with persistent XML data in much the same way "
+"you work with persistent POJOs. A parsed XML tree can be thought of as "
+"another way of representing the relational data at the object level, instead "
+"of POJOs."
 msgstr ""
 "Hibernate使得你可以用XML数据来进行工作,恰如你用持久化的POJO进行工作那样。解"
 "析过的XML树 可以被认为是代替POJO的另外一种在对象层面上表示关系型数据的途径."
@@ -72,11 +72,11 @@
 
 #. Tag: para
 #: xml.xml:61
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A single mapping may be used to simultaneously map properties of a class and "
+"A single mapping can be used to simultaneously map properties of a class and "
 "nodes of an XML document to the database, or, if there is no class to map, "
-"it may be used to map just the XML."
+"it can be used to map just the XML."
 msgstr ""
 "一个单一的映射就可以将类的属性和XML文档的节点同时映射到数据库。如果不需要映射"
 "类, 它也可以用来只映射XML文档。"
@@ -162,11 +162,11 @@
 
 #. Tag: para
 #: xml.xml:86
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
-"property name/value pairs (java <literal>Map</literal>s). The property names "
-"are purely logical constructs that may be referred to in HQL queries."
+"property name/value pairs or java <literal>Map</literal>s. The property "
+"names are purely logical constructs that can be referred to in HQL queries."
 msgstr ""
 "这个映射使得你既可以把数据作为一棵dom4j树那样访问,又可以作为由属性键值对"
 "(java <literal>Map</literal>s) 组成的图那样访问。属性名字纯粹是逻辑上的结构,"
@@ -180,10 +180,10 @@
 
 #. Tag: para
 #: xml.xml:99
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Many Hibernate mapping elements accept the <literal>node</literal> "
-"attribute. This let's you specify the name of an XML attribute or element "
+"A range of Hibernate mapping elements accept the <literal>node</literal> "
+"attribute. This lets you specify the name of an XML attribute or element "
 "that holds the property or entity data. The format of the <literal>node</"
 "literal> attribute must be one of the following:"
 msgstr ""
@@ -193,27 +193,27 @@
 
 #. Tag: para
 #: xml.xml:108
-#, no-c-format
-msgid "<literal>\"element-name\"</literal> - map to the named XML element"
+#, fuzzy, no-c-format
+msgid "<literal>\"element-name\"</literal>: map to the named XML element"
 msgstr "<literal>\"element-name\"</literal> - 映射为指定的XML元素"
 
 #. Tag: para
 #: xml.xml:111
-#, no-c-format
-msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attribute"
+#, fuzzy, no-c-format
+msgid "<literal>\"@attribute-name\"</literal>: map to the named XML attribute"
 msgstr "<literal>\"@attribute-name\"</literal> - 映射为指定的XML属性"
 
 #. Tag: para
 #: xml.xml:114
-#, no-c-format
-msgid "<literal>\".\"</literal> - map to the parent element"
+#, fuzzy, no-c-format
+msgid "<literal>\".\"</literal>: map to the parent element"
 msgstr "<literal>\".\"</literal> - 映射为父元素"
 
 #. Tag: para
 #: xml.xml:117
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<literal>\"element-name/@attribute-name\"</literal> - map to the named "
+"<literal>\"element-name/@attribute-name\"</literal>: map to the named "
 "attribute of the named element"
 msgstr ""
 "<literal>\"element-name/@attribute-name\"</literal> - 映射为指定元素的指定属"
@@ -221,7 +221,7 @@
 
 #. Tag: para
 #: xml.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
 "<literal>embed-xml</literal> attribute. If <literal>embed-xml=\"true\"</"
@@ -229,7 +229,7 @@
 "of value type) will be embedded directly in the XML tree for the entity that "
 "owns the association. Otherwise, if <literal>embed-xml=\"false\"</literal>, "
 "then only the referenced identifier value will appear in the XML for single "
-"point associations and collections will simply not appear at all."
+"point associations and collections will not appear at all."
 msgstr ""
 "对于集合和单值的关联,有一个额外的<literal>embed-xml</literal>属性可用。 这个"
 "属性的缺省值是真(<literal>embed-xml=\"true\"</literal>)。如果<literal>embed-"
@@ -240,10 +240,10 @@
 
 #. Tag: para
 #: xml.xml:134
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
-"too many associations, since XML does not deal well with circularity!"
+"Do not leave <literal>embed-xml=\"true\"</literal> for too many "
+"associations, since XML does not deal well with circularity."
 msgstr ""
 "你应该小心,不要让太多关联的embed-xml属性为真(<literal>embed-xml=\"true\"</"
 "literal>),因为XML不能很好地处理 循环引用!"
@@ -290,10 +290,10 @@
 
 #. Tag: para
 #: xml.xml:141
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"in this case, we have decided to embed the collection of account ids, but "
-"not the actual account data. The following HQL query:"
+"In this case, the collection of account ids is embedded, but not the actual "
+"account data. The following HQL query:"
 msgstr ""
 "在这个例子中,我们决定嵌入帐目号码(account id)的集合,但不嵌入实际的帐目数"
 "据。下面的HQL查询:"
@@ -308,8 +308,8 @@
 
 #. Tag: para
 #: xml.xml:148
-#, no-c-format
-msgid "Would return datasets such as this:"
+#, fuzzy, no-c-format
+msgid "would return datasets such as this:"
 msgstr "返回的数据集将是这样:"
 
 #. Tag: programlisting
@@ -368,10 +368,10 @@
 
 #. Tag: para
 #: xml.xml:167
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's rearead and update XML documents in the application. We do this by "
-"obtaining a dom4j session:"
+"You can also re-read and update XML documents in the application. You can do "
+"this by obtaining a dom4j session:"
 msgstr ""
 "让我们来读入和更新应用程序中的XML文档。通过获取一个dom4j会话可以做到这一点:"
 
@@ -423,11 +423,10 @@
 
 #. Tag: para
 #: xml.xml:176
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"It is extremely useful to combine this feature with Hibernate's "
-"<literal>replicate()</literal> operation to implement XML-based data import/"
-"export."
+"When implementing XML-based data import/export, it is useful to combine this "
+"feature with Hibernate's <literal>replicate()</literal> operation."
 msgstr ""
 "将这一特色与Hibernate的<literal>replicate()</literal>操作结合起来对于实现的基"
 "于XML的数据导入/导出将非常有用."

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po	2009-07-14 14:10:20 UTC (rev 17090)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po	2009-07-14 20:58:00 UTC (rev 17091)
@@ -1,40 +1,84 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2009-07-14 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Content-Type: text/plain; charset=utf-8\n"
-#: index.docbook:20
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr "Legal Notice"
 
-#: index.docbook:22
-msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
-msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
+msgstr ""
+"<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC</"
+"state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone: +1 "
+"919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 919 754 "
+"3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>, "
+"<state>NC</state><postcode>27709</postcode><country>USA</country>"
 
-#: index.docbook:31
-msgid "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
-msgstr "Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General Public License</ulink>, as published by the Free Software Foundation."
+#. Tag: para
+#: legal_notice.xml:39
+#, fuzzy, no-c-format
+msgid ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc. "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
+msgstr ""
+"Copyright <trademark class=\"copyright\"></trademark> 2007 by Red Hat, Inc.  "
+"This copyrighted material is made available to anyone wishing to use, "
+"modify, copy, or redistribute it subject to the terms and conditions of the "
+"GNU <ulink url=\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesser General "
+"Public License</ulink>, as published by the Free Software Foundation."
 
-#: index.docbook:40
-msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
-msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red Hat, Inc. in the United States and other countries."
+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
+msgid ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
+msgstr ""
+"Red Hat and the Red Hat \"Shadow Man\" logo are registered trademarks of Red "
+"Hat, Inc. in the United States and other countries."
 
-#: index.docbook:43
-msgid "All other trademarks referenced herein are the property of their respective owners."
-msgstr "All other trademarks referenced herein are the property of their respective owners."
+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
+msgid ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
+msgstr ""
+"All other trademarks referenced herein are the property of their respective "
+"owners."
 
-#: index.docbook:46
+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security at redhat.com key is:"
 msgstr "The GPG fingerprint of the security at redhat.com key is:"
 
-#: index.docbook:49
+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 
-msgid "ROLES_OF_TRANSLATORS"
-msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
+#~ msgid "ROLES_OF_TRANSLATORS"
+#~ msgstr "<!--TRANS:ROLES_OF_TRANSLATORS-->"
 
-msgid "CREDIT_FOR_TRANSLATORS"
-msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"
-
+#~ msgid "CREDIT_FOR_TRANSLATORS"
+#~ msgstr "<!--TRANS:CREDIT_FOR_TRANSLATORS-->"



More information about the hibernate-commits mailing list